update

src/main/java/com/zhiqiyun/open/core/mapper/bz/PassengerEquipmentMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.bz;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipment;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface PassengerEquipmentMapper extends BaseMapper<PassengerEquipment> {
-}

src/main/java/com/zhiqiyun/open/core/mapper/bz/PassengerEquipmentPeopleMapper.java

@@ -1,9 +0,0 @@
-package com.zhiqiyun.open.core.mapper.bz;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipmentPeople;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface PassengerEquipmentPeopleMapper extends BaseMapper<PassengerEquipmentPeople> {
-}

src/main/java/com/zhiqiyun/open/core/mapper/equipment/EquipmentPassengerMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.equipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassenger;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EquipmentPassengerMapper extends BaseMapper<EquipmentPassenger> {
+}

src/main/java/com/zhiqiyun/open/core/mapper/equipment/EquipmentPassengerPeopleMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.equipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassengerPeople;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EquipmentPassengerPeopleMapper extends BaseMapper<EquipmentPassengerPeople> {
+}

src/main/java/com/zhiqiyun/open/core/mapper/base/PlaceBaseInfoExtendMapper.java → src/main/java/com/zhiqiyun/open/core/mapper/place/PlaceBaseInfoExtendMapper.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.mapper.base;
+package com.zhiqiyun.open.core.mapper.place;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhiqiyun.open.core.models.place.PlaceBaseInfoExtend;

src/main/java/com/zhiqiyun/open/core/mapper/base/PlaceBaseInfoMapper.java → src/main/java/com/zhiqiyun/open/core/mapper/place/PlaceBaseInfoMapper.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.mapper.base;
+package com.zhiqiyun.open.core.mapper.place;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhiqiyun.open.core.models.place.PlaceBaseInfo;

src/main/java/com/zhiqiyun/open/core/mapper/base/PlaceCategoryExtendColumnMapper.java → src/main/java/com/zhiqiyun/open/core/mapper/place/PlaceCategoryExtendColumnMapper.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.mapper.base;
+package com.zhiqiyun.open.core.mapper.place;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhiqiyun.open.core.models.place.PlaceCategoryExtendColumn;

src/main/java/com/zhiqiyun/open/core/mapper/base/PlaceCategoryMapper.java → src/main/java/com/zhiqiyun/open/core/mapper/place/PlaceCategoryMapper.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.mapper.base;
+package com.zhiqiyun.open.core.mapper.place;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhiqiyun.open.core.models.place.PlaceCategory;

src/main/java/com/zhiqiyun/open/core/models/bz/PassengerEquipment.java → src/main/java/com/zhiqiyun/open/core/models/equipment/EquipmentPassenger.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models.bz;
+package com.zhiqiyun.open.core.models.equipment;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.zhiqiyun.open.core.models.place.PlaceCategory;
@@ -6,18 +6,21 @@ import com.zhiqiyun.open.core.typeHandler.FastjsonTypeHandler;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
 @Data
-@TableName(value = "passenger_equipment", autoResultMap = true)
-public class PassengerEquipment {
+@TableName(value = "equipment_passenger", autoResultMap = true)
+public class EquipmentPassenger {
 	@TableId(type = IdType.INPUT)
 	private Long id;
-	private Long bzId;
+	private Long placeBaseInfoId;
 	private String brief;
 	@TableField(typeHandler = FastjsonTypeHandler.class)
 	private List<String> litpics;
+	private BigDecimal lng;
+	private BigDecimal lat;
 
 	@TableField(updateStrategy = FieldStrategy.NEVER)
 	private Date createdTime;

src/main/java/com/zhiqiyun/open/core/models/bz/PassengerEquipmentPeople.java → src/main/java/com/zhiqiyun/open/core/models/equipment/EquipmentPassengerPeople.java

@@ -1,4 +1,4 @@
-package com.zhiqiyun.open.core.models.bz;
+package com.zhiqiyun.open.core.models.equipment;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.zhiqiyun.open.core.enmus.Gender;
@@ -7,8 +7,8 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("passenger_equipment_people")
-public class PassengerEquipmentPeople {
+@TableName("equipment_passenger_people")
+public class EquipmentPassengerPeople {
 	private Long id;
 	private Long equipmentId;
 	private String faceId;

src/main/java/com/zhiqiyun/open/core/schedule/EquipmentPeople.java

@@ -1,46 +1,44 @@
 package com.zhiqiyun.open.core.schedule;
 
 import com.zhiqiyun.open.core.enmus.Gender;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipment;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipmentPeople;
-import com.zhiqiyun.open.core.service.PassengerEquipmentPeopleService;
-import com.zhiqiyun.open.core.service.PassengerEquipmentService;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassenger;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassengerPeople;
+import com.zhiqiyun.open.core.service.EquipmentPassengerPeopleService;
+import com.zhiqiyun.open.core.service.EquipmentPassengerService;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.utils.DateUtil;
 import com.zhiqiyun.open.utils.RandomUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.util.List;
 
 @Slf4j
 @Component
 public class EquipmentPeople {
 	@Autowired
-	private PassengerEquipmentService passengerEquipmentService;
+	private EquipmentPassengerService equipmentPassengerService;
 
 	@Autowired
-	private PassengerEquipmentPeopleService passengerEquipmentPeopleService;
+	private EquipmentPassengerPeopleService equipmentPassengerPeopleService;
 
 	@Autowired
 	private SequenceService sequenceService;
 
 	@Scheduled(cron = "0/10 * * * * ?")
 	public void createPeople() {
-		List<PassengerEquipment> listData = this.passengerEquipmentService.list();
-		for (PassengerEquipment equipment : listData) {
+		List<EquipmentPassenger> listData = this.equipmentPassengerService.list();
+		for (EquipmentPassenger equipment : listData) {
 			int r = RandomUtil.getInt(0, 5);
 			if (r == 0 || r == 1) {
 
 				Long id = this.sequenceService.nextId();
 				int retentionTime = RandomUtil.getInt(10, 10000);
 
-				PassengerEquipmentPeople people = new PassengerEquipmentPeople();
+				EquipmentPassengerPeople people = new EquipmentPassengerPeople();
 				people.setId(id);
 				people.setEquipmentId(equipment.getId());
 				people.setFaceId(RandomUtil.getuuid());
@@ -53,7 +51,7 @@ public class EquipmentPeople {
 					people.setOutTime(DateUtils.addSeconds(people.getInTime(), retentionTime));
 				}
 				people.setRetentionTime(retentionTime);
-				this.passengerEquipmentPeopleService.save(people);
+				this.equipmentPassengerPeopleService.save(people);
 			}
 		}
 	}

src/main/java/com/zhiqiyun/open/core/service/EquipmentPassengerPeopleService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassengerPeople;
+
+public interface EquipmentPassengerPeopleService extends IService<EquipmentPassengerPeople> {
+}

src/main/java/com/zhiqiyun/open/core/service/EquipmentPassengerService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassenger;
+
+public interface EquipmentPassengerService extends IService<EquipmentPassenger> {
+}

src/main/java/com/zhiqiyun/open/core/service/PassengerEquipmentPeopleService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipmentPeople;
-
-public interface PassengerEquipmentPeopleService extends IService<PassengerEquipmentPeople> {
-}

src/main/java/com/zhiqiyun/open/core/service/PassengerEquipmentService.java

@@ -1,7 +0,0 @@
-package com.zhiqiyun.open.core.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipment;
-
-public interface PassengerEquipmentService extends IService<PassengerEquipment> {
-}

src/main/java/com/zhiqiyun/open/core/service/impl/EquipmentPassengerPeopleServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.equipment.EquipmentPassengerPeopleMapper;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassengerPeople;
+import com.zhiqiyun.open.core.service.EquipmentPassengerPeopleService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipmentPassengerPeopleServiceImpl extends ServiceImpl<EquipmentPassengerPeopleMapper, EquipmentPassengerPeople> implements EquipmentPassengerPeopleService {
+}

src/main/java/com/zhiqiyun/open/core/service/impl/EquipmentPassengerServiceImpl.java

@@ -0,0 +1,30 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.equipment.EquipmentPassengerMapper;
+import com.zhiqiyun.open.core.mapper.equipment.EquipmentPassengerPeopleMapper;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassenger;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassengerPeople;
+import com.zhiqiyun.open.core.service.EquipmentPassengerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+@Service
+public class EquipmentPassengerServiceImpl extends ServiceImpl<EquipmentPassengerMapper, EquipmentPassenger> implements EquipmentPassengerService {
+	@Autowired
+	private EquipmentPassengerPeopleMapper equipmentPassengerPeopleMapper;
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean removeByIds(Collection<? extends Serializable> idList) {
+		QueryWrapper<EquipmentPassengerPeople> wrapper = new QueryWrapper<>();
+		wrapper.in("equipment_id", idList);
+		this.equipmentPassengerPeopleMapper.delete(wrapper);
+		return super.removeByIds(idList);
+	}
+}

src/main/java/com/zhiqiyun/open/core/service/impl/PassengerEquipmentPeopleServiceImpl.java

@@ -1,11 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.bz.PassengerEquipmentPeopleMapper;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipmentPeople;
-import com.zhiqiyun.open.core.service.PassengerEquipmentPeopleService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class PassengerEquipmentPeopleServiceImpl extends ServiceImpl<PassengerEquipmentPeopleMapper, PassengerEquipmentPeople> implements PassengerEquipmentPeopleService {
-}

src/main/java/com/zhiqiyun/open/core/service/impl/PassengerEquipmentServiceImpl.java

@@ -1,31 +0,0 @@
-package com.zhiqiyun.open.core.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.bz.PassengerEquipmentMapper;
-import com.zhiqiyun.open.core.mapper.bz.PassengerEquipmentPeopleMapper;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipment;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipmentPeople;
-import com.zhiqiyun.open.core.service.PassengerEquipmentPeopleService;
-import com.zhiqiyun.open.core.service.PassengerEquipmentService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-@Service
-public class PassengerEquipmentServiceImpl extends ServiceImpl<PassengerEquipmentMapper, PassengerEquipment> implements PassengerEquipmentService {
-	@Autowired
-	private PassengerEquipmentPeopleMapper passengerEquipmentPeopleMapper;
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public boolean removeByIds(Collection<? extends Serializable> idList) {
-		QueryWrapper<PassengerEquipmentPeople> wrapper = new QueryWrapper<>();
-		wrapper.in("equipment_id", idList);
-		this.passengerEquipmentPeopleMapper.delete(wrapper);
-		return super.removeByIds(idList);
-	}
-}

src/main/java/com/zhiqiyun/open/core/service/impl/PlaceBaseInfoExtendServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.base.PlaceBaseInfoExtendMapper;
+import com.zhiqiyun.open.core.mapper.place.PlaceBaseInfoExtendMapper;
 import com.zhiqiyun.open.core.models.place.PlaceBaseInfoExtend;
 import com.zhiqiyun.open.core.service.PlaceBaseInfoExtendService;
 import org.springframework.stereotype.Service;

src/main/java/com/zhiqiyun/open/core/service/impl/PlaceBaseInfoServiceImpl.java

@@ -2,8 +2,8 @@ package com.zhiqiyun.open.core.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.base.PlaceBaseInfoExtendMapper;
-import com.zhiqiyun.open.core.mapper.base.PlaceBaseInfoMapper;
+import com.zhiqiyun.open.core.mapper.place.PlaceBaseInfoExtendMapper;
+import com.zhiqiyun.open.core.mapper.place.PlaceBaseInfoMapper;
 import com.zhiqiyun.open.core.models.place.PlaceBaseInfo;
 import com.zhiqiyun.open.core.models.place.PlaceBaseInfoExtend;
 import com.zhiqiyun.open.core.service.PlaceBaseInfoService;

src/main/java/com/zhiqiyun/open/core/service/impl/PlaceCategoryExtendColumnServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.base.PlaceCategoryExtendColumnMapper;
+import com.zhiqiyun.open.core.mapper.place.PlaceCategoryExtendColumnMapper;
 import com.zhiqiyun.open.core.models.place.PlaceCategoryExtendColumn;
 import com.zhiqiyun.open.core.service.PlaceCategoryExtendColumnService;
 import org.springframework.stereotype.Service;

src/main/java/com/zhiqiyun/open/core/service/impl/PlaceCategoryServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zhiqiyun.open.core.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhiqiyun.open.core.mapper.base.PlaceCategoryMapper;
+import com.zhiqiyun.open.core.mapper.place.PlaceCategoryMapper;
 import com.zhiqiyun.open.core.models.place.PlaceCategory;
 import com.zhiqiyun.open.core.service.PlaceCategoryService;
 import org.springframework.stereotype.Service;

src/main/java/com/zhiqiyun/open/mvc/controller/EquipmentPassengerController.java

@@ -0,0 +1,125 @@
+package com.zhiqiyun.open.mvc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhiqiyun.open.annotation.Permission;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassenger;
+import com.zhiqiyun.open.core.models.equipment.EquipmentPassengerPeople;
+import com.zhiqiyun.open.core.models.user.OauthInfo;
+import com.zhiqiyun.open.core.service.EquipmentPassengerPeopleService;
+import com.zhiqiyun.open.core.service.EquipmentPassengerService;
+import com.zhiqiyun.open.core.service.OauthService;
+import com.zhiqiyun.open.core.service.SequenceService;
+import com.zhiqiyun.open.mvc.Result;
+import com.zhiqiyun.open.mvc.params.equipment.QueryEquipmentPassengerParams;
+import com.zhiqiyun.open.mvc.params.equipment.SaveEquipmentPassengerParams;
+import com.zhiqiyun.open.utils.DateUtil;
+import com.zhiqiyun.open.utils.ServletContext;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/equipment/passenger")
+public class EquipmentPassengerController {
+
+    @Autowired
+    private EquipmentPassengerService equipmentPassengerService;
+
+    @Autowired
+    private EquipmentPassengerPeopleService equipmentPassengerPeopleService;
+
+    @Autowired
+    private SequenceService sequenceService;
+
+    @Autowired
+    private OauthService oauthService;
+
+    @Permission(value = "equipment.passenger.find", tags = "查询人流采集设备")
+    @PostMapping("/findPage")
+    public Result findPage(@RequestBody QueryEquipmentPassengerParams params) {
+
+        QueryWrapper<EquipmentPassenger> queryWrapper = new QueryWrapper<>();
+
+        if (StringUtils.isNotBlank(params.getBrief())) {
+            queryWrapper.like("brief", params.getBrief());
+        }
+        if (params.getPlaceBaseInfoId() != null) {
+            queryWrapper.eq("place_base_info_id", params.getPlaceBaseInfoId());
+        }
+
+        Page<EquipmentPassenger> page = params.getPage();
+        page.addOrder(OrderItem.desc("id"));
+
+        Page<EquipmentPassenger> resultData = this.equipmentPassengerService.page(page, queryWrapper);
+        for (EquipmentPassenger equipment : resultData.getRecords()) {
+            QueryWrapper<EquipmentPassengerPeople> wrapper = new QueryWrapper<>();
+            wrapper.eq("equipment_id", equipment.getId());
+            if (params.getRangeDate() != null) {
+                queryWrapper.between("in_time", params.getRangeDate().getStatDate(), params.getRangeDate().getEndDate());
+            }
+            Long inPeopleCount = this.equipmentPassengerPeopleService.count(wrapper);
+
+            wrapper.isNotNull("out_time");
+            Long outPeopleCount = this.equipmentPassengerPeopleService.count(wrapper);
+
+            equipment.setInPeopleCount(inPeopleCount);
+            equipment.setOutPeopleCount(outPeopleCount);
+        }
+
+        return Result.instance(Result.Code.SUCCESS).setData(resultData);
+    }
+
+    @Permission(value = "equipment.passenger.add", tags = "保存人流采集设备")
+    @PostMapping("/save")
+    public Result save(@Valid @RequestBody SaveEquipmentPassengerParams params) {
+
+        this.equipmentPassengerService.save(this.buildEntity(this.sequenceService.nextId(), params));
+
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+
+    @Permission(value = "equipment.passenger.edit", tags = "编辑人流采集设备")
+    @PostMapping("/updateById")
+    public Result updateById(Long id, @Valid @RequestBody SaveEquipmentPassengerParams params) {
+
+        this.equipmentPassengerService.updateById(this.buildEntity(id, params));
+
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+
+
+    private EquipmentPassenger buildEntity(Long id, @Valid SaveEquipmentPassengerParams params) {
+
+        EquipmentPassenger entity = new EquipmentPassenger();
+
+        BeanUtils.copyProperties(params, entity);
+
+        OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
+
+        entity.setCreatedTime(DateUtil.current());
+        entity.setUpdatedTime(DateUtil.current());
+        entity.setCreatedBy(oauthInfo.getId());
+        entity.setUpdatedBy(oauthInfo.getId());
+
+        entity.setId(id);
+        return entity;
+    }
+
+    @Permission(value = "equipment.passenger.delete", tags = "删除人流采集设备")
+    @PostMapping("/deleteByIds")
+    public Result deleteByIds(@RequestBody List<Long> ids) {
+        this.equipmentPassengerService.removeByIds(ids);
+        return Result.instance(Result.Code.MESSAGE_SUCCESS);
+    }
+}

src/main/java/com/zhiqiyun/open/mvc/controller/PassengerEquipmentController.java

@@ -1,121 +0,0 @@
-package com.zhiqiyun.open.mvc.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhiqiyun.open.annotation.Permission;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipment;
-import com.zhiqiyun.open.core.models.bz.PassengerEquipmentPeople;
-import com.zhiqiyun.open.core.models.user.OauthInfo;
-import com.zhiqiyun.open.core.service.OauthService;
-import com.zhiqiyun.open.core.service.PassengerEquipmentPeopleService;
-import com.zhiqiyun.open.core.service.PassengerEquipmentService;
-import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.bz.QueryPassengerEquipmentParams;
-import com.zhiqiyun.open.mvc.params.bz.SavePassengerEquipmentParams;
-import com.zhiqiyun.open.utils.DateUtil;
-import com.zhiqiyun.open.utils.ServletContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-@Slf4j
-@RestController
-@RequestMapping("/bz/passenger/equipment")
-public class PassengerEquipmentController {
-
-	@Autowired
-	private PassengerEquipmentService passengerEquipmentService;
-
-	@Autowired
-	private PassengerEquipmentPeopleService passengerEquipmentPeopleService;
-
-	@Autowired
-	private SequenceService sequenceService;
-
-	@Autowired
-	private OauthService oauthService;
-
-	@Permission(value = "bz.passenger.equipment.find", tags = "查询人流采集设备")
-	@PostMapping("/findPage")
-	public Result findPage(@RequestBody QueryPassengerEquipmentParams params) {
-
-		QueryWrapper<PassengerEquipment> queryWrapper = new QueryWrapper<>();
-
-		if (params.getDataType() != null) {
-			queryWrapper.eq("data_type", params.getDataType());
-		}
-		if (params.getBzId() != null) {
-			queryWrapper.eq("bz_id", params.getBzId());
-		}
-
-		Page<PassengerEquipment> page = params.getPage();
-		page.addOrder(OrderItem.desc("id"));
-
-		Page<PassengerEquipment> resultData = this.passengerEquipmentService.page(page, queryWrapper);
-		for (PassengerEquipment equipment : resultData.getRecords()) {
-			QueryWrapper<PassengerEquipmentPeople> wrapper = new QueryWrapper<>();
-			wrapper.eq("equipment_id", equipment.getId());
-			Long inPeopleCount = this.passengerEquipmentPeopleService.count(wrapper);
-
-			wrapper.isNotNull("out_time");
-			Long outPeopleCount = this.passengerEquipmentPeopleService.count(wrapper);
-
-			equipment.setInPeopleCount(inPeopleCount);
-			equipment.setOutPeopleCount(outPeopleCount);
-		}
-
-		return Result.instance(Result.Code.SUCCESS).setData(resultData);
-	}
-
-	@Permission(value = "bz.passenger.equipment.add", tags = "保存人流采集设备")
-	@PostMapping("/save")
-	public Result save(@Valid @RequestBody SavePassengerEquipmentParams params) {
-
-		this.passengerEquipmentService.save(this.buildEntity(this.sequenceService.nextId(), params));
-
-		return Result.instance(Result.Code.MESSAGE_SUCCESS);
-	}
-
-	@Permission(value = "bz.passenger.equipment.edit", tags = "编辑人流采集设备")
-	@PostMapping("/updateById")
-	public Result updateById(Long id, @Valid @RequestBody SavePassengerEquipmentParams params) {
-
-		this.passengerEquipmentService.updateById(this.buildEntity(id, params));
-
-		return Result.instance(Result.Code.MESSAGE_SUCCESS);
-	}
-
-
-	private PassengerEquipment buildEntity(Long id, @Valid SavePassengerEquipmentParams params) {
-
-		PassengerEquipment entity = new PassengerEquipment();
-
-		BeanUtils.copyProperties(params, entity);
-
-		OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
-
-		entity.setCreatedTime(DateUtil.current());
-		entity.setUpdatedTime(DateUtil.current());
-		entity.setCreatedBy(oauthInfo.getId());
-		entity.setUpdatedBy(oauthInfo.getId());
-
-		entity.setId(id);
-		return entity;
-	}
-
-	@Permission(value = "bz.passenger.equipment.delete", tags = "删除人流采集设备")
-	@PostMapping("/deleteByIds")
-	public Result deleteByIds(@RequestBody List<Long> ids) {
-		this.passengerEquipmentService.removeByIds(ids);
-		return Result.instance(Result.Code.MESSAGE_SUCCESS);
-	}
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/BaseDataInfoParam.java

@@ -1,19 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-public class BaseDataInfoParam {
-    private String name;
-    private List<String> litpics;
-    private String describe;
-    private String brief;
-    private String address;
-    private String contacts;
-    private String contactNumber;
-    private BigDecimal lng;
-    private BigDecimal lat;
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/QueryPassengerEquipmentParams.java

@@ -1,13 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import com.zhiqiyun.open.core.models.place.PlaceCategory;
-import com.zhiqiyun.open.mvc.params.QueryPageParams;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class QueryPassengerEquipmentParams extends QueryPageParams {
-    private Long bzId;
-    private PlaceCategory dataType;
-}

src/main/java/com/zhiqiyun/open/mvc/params/bz/SavePassengerEquipmentParams.java

@@ -1,16 +0,0 @@
-package com.zhiqiyun.open.mvc.params.bz;
-
-import com.zhiqiyun.open.core.models.place.PlaceCategory;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class SavePassengerEquipmentParams {
-
-	private PlaceCategory dataType;
-	private Long bzId;
-	private String brief;
-	private List<String> litpics;
-
-}

src/main/java/com/zhiqiyun/open/mvc/params/equipment/QueryEquipmentPassengerParams.java

@@ -0,0 +1,20 @@
+package com.zhiqiyun.open.mvc.params.equipment;
+
+import com.zhiqiyun.open.core.models.RangeDate;
+import com.zhiqiyun.open.mvc.params.QueryPageParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class QueryEquipmentPassengerParams extends QueryPageParams {
+    private Long placeBaseInfoId;
+    private String brief;
+    private RangeDate rangeDate;
+
+    public void setRangeDate(List<String> rangeDate) {
+        this.rangeDate = RangeDate.build(rangeDate);
+    }
+}

src/main/java/com/zhiqiyun/open/mvc/params/equipment/SaveEquipmentPassengerParams.java

@@ -0,0 +1,16 @@
+package com.zhiqiyun.open.mvc.params.equipment;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class SaveEquipmentPassengerParams {
+
+    private Long placeBaseInfoId;
+    private String brief;
+    private List<String> litpics;
+    private BigDecimal lng;
+    private BigDecimal lat;
+}

src/main/resources/db/migration/V1.0.4__passenger_equipment.sql

@@ -1,20 +1,23 @@
 DROP TABLE IF EXISTS `passenger_equipment`;
-CREATE TABLE `passenger_equipment`
+DROP TABLE IF EXISTS `passenger_equipment_people`;
+DROP TABLE IF EXISTS `equipment_passenger`;
+CREATE TABLE `equipment_passenger`
 (
-    `id`           BIGINT(20) NOT NULL COMMENT 'ID',
-    `data_type`    INT(11) NULL DEFAULT NULL COMMENT '点位类型',
-    `bz_id`        BIGINT(20) NULL DEFAULT NULL COMMENT '点位分布',
-    `brief`        VARCHAR(500) NULL DEFAULT NULL COMMENT '说明',
-    `litpics`      VARCHAR(500) NULL DEFAULT NULL COMMENT '图片',
-    `created_time` DATETIME NULL DEFAULT NULL COMMENT '创建时间',
-    `created_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '创建人',
-    `updated_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间',
-    `updated_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '修改人',
+    `id`                 BIGINT(20) NOT NULL COMMENT 'ID',
+    `place_base_info_id` BIGINT(20) NULL DEFAULT NULL COMMENT '点位类型',
+    `brief`              VARCHAR(500) NULL DEFAULT NULL COMMENT '说明',
+    `litpics`            VARCHAR(500) NULL DEFAULT NULL COMMENT '图片',
+    `lng`                DECIMAL(20, 12) NOT NULL DEFAULT '0.000000000000' COMMENT '经度（坐标）',
+    `lat`                DECIMAL(20, 12) NOT NULL DEFAULT '0.000000000000' COMMENT '纬度（坐标）',
+    `created_time`       DATETIME NULL DEFAULT NULL COMMENT '创建时间',
+    `created_by`         BIGINT(20) NULL DEFAULT NULL COMMENT '创建人',
+    `updated_time`       DATETIME NULL DEFAULT NULL COMMENT '修改时间',
+    `updated_by`         BIGINT(20) NULL DEFAULT NULL COMMENT '修改人',
     PRIMARY KEY (`id`)
 ) COMMENT ='人流设备点位分布信息' ENGINE = InnoDB;
 
-DROP TABLE IF EXISTS `passenger_equipment_people`;
-CREATE TABLE `passenger_equipment_people`
+DROP TABLE IF EXISTS `equipment_passenger_people`;
+CREATE TABLE `equipment_passenger_people`
 (
     `id`             BIGINT(20) NOT NULL COMMENT 'ID',
     `equipment_id`   BIGINT(20) NULL DEFAULT NULL COMMENT '设备ID',
@@ -30,8 +33,8 @@ CREATE TABLE `passenger_equipment_people`
 
 REPLACE
 INTO `authority_info` (`id`, `parent_id`, `name`, `remark`)
-VALUES (1700, 0, 'bz.passenger.equipment', '客户监控设备管理'),
-       (1701, 1700, 'bz.passenger.equipment.find', '查询'),
-       (1702, 1700, 'bz.passenger.equipment.add', '添加'),
-       (1703, 1700, 'bz.passenger.equipment.edit', '修改'),
-       (1704, 1700, 'bz.passenger.equipment.delete', '删除');
+VALUES (1700, 0, 'equipment.passenger', '客户监控设备管理'),
+       (1701, 1700, 'equipment.passenger.find', '查询'),
+       (1702, 1700, 'equipment.passenger.add', '添加'),
+       (1703, 1700, 'equipment.passenger.edit', '修改'),
+       (1704, 1700, 'equipment.passenger.delete', '删除');