1

doc/update.2.8.0.sql

@@ -28,4 +28,10 @@ CREATE TABLE `t_manage_agent_log` (
                                       `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
                                       `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                                       PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+
+ALTER TABLE `4dkankan_v4`.`t_manage_agent_log`
+    ADD COLUMN `down_add_num_total` varchar(255) NULL AFTER `high_add_num`,
+ADD COLUMN `major_add_num_total` varchar(255) NULL AFTER `down_add_num_total`,
+ADD COLUMN `high_add_num_total` varchar(255) NULL AFTER `major_add_num_total`;

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -112,6 +112,8 @@ public enum ResultCode  {
     INCREMENT_UNBIND_CAMERA_ERROR(50086, "相机未绑定权益！"),
     INCREMENT_BIND_ERROR(50087, "权益不存在或已过期！"),
     INCREMENT_BIND_ERROR2(50088, "权益已绑定相机！"),
+    CAMERA_USER_ERROR(50089, "该相机不属于当前用户！"),
+    CAMERA_TYPE_ERROR2(50090, "SN与类型不一致！"),
 
     ;
 

src/main/java/com/fdkankan/manage/entity/ManageAgentLog.java

@@ -50,5 +50,12 @@ public class ManageAgentLog implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField("down_add_num_total")
+    private Integer downAddNumTotal;
 
+    @TableField("major_add_num_total")
+    private Integer majorAddNumTotal;
+
+    @TableField("high_add_num_total")
+    private Integer highAddNumTotal;
 }

src/main/java/com/fdkankan/manage/entity/RtkDevice.java

@@ -48,25 +48,25 @@ public class RtkDevice implements Serializable {
     @TableField("camera_type")
     private Integer cameraType;
 
-    @TableField("user_name")
+    @TableField(value = "user_name",updateStrategy = FieldStrategy.IGNORED)
     private String userName;
 
-    @TableField("password")
+    @TableField(value = "password",updateStrategy = FieldStrategy.IGNORED)
     private String password;
 
-    @TableField("ip_addr")
+    @TableField(value = "ip_addr",updateStrategy = FieldStrategy.IGNORED)
     private String ipAddr;
 
-    @TableField("mount_point")
+    @TableField(value = "mount_point",updateStrategy = FieldStrategy.IGNORED)
     private String mountPoint;
 
-    @TableField("port")
+    @TableField(value = "port",updateStrategy = FieldStrategy.IGNORED)
     private String port;
 
     /**
      * 运营商
      */
-    @TableField("operator")
+    @TableField(value = "operator",updateStrategy = FieldStrategy.IGNORED)
     private String operator;
 
     @TableField("rec_status")

src/main/java/com/fdkankan/manage/service/impl/ManageAgentLogServiceImpl.java

@@ -15,6 +15,7 @@ import com.fdkankan.manage.vo.response.ManageAgentLogVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -35,21 +36,6 @@ public class ManageAgentLogServiceImpl extends ServiceImpl<IManageAgentLogMapper
 
         Page<ManageAgentLogVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
-        List<Integer> agentIds = page.getRecords().stream().map(ManageAgentLog::getAgentId).collect(Collectors.toList());
-        HashMap<Integer ,GroupManageAgentLog> map = new HashMap<>();
-        if(!agentIds.isEmpty()){
-            List<GroupManageAgentLog> list = this.getBaseMapper().groupByAgentId(agentIds);
-            list.forEach(e -> map.put(e.getAgentId(),e));
-        }
-        for (ManageAgentLogVo record : page.getRecords()) {
-            GroupManageAgentLog groupManageAgentLog = map.get(record.getAgentId());
-            if(groupManageAgentLog != null){
-                record.setDownAddNumTotal(groupManageAgentLog.getDownAddNumTotal());
-                record.setMajorAddNumTotal(groupManageAgentLog.getMajorAddNumTotal());
-                record.setHighAddNumTotal(groupManageAgentLog.getHighAddNumTotal());
-
-            }
-        }
         return PageInfo.PageInfo(page);
     }
 
@@ -60,6 +46,18 @@ public class ManageAgentLogServiceImpl extends ServiceImpl<IManageAgentLogMapper
         agentLog.setDownAddNum(param.getDownAddNum());
         agentLog.setMajorAddNum(param.getMajorAddNum());
         agentLog.setHighAddNum(param.getHighAddNum());
+
+        List<GroupManageAgentLog> list = this.getBaseMapper().groupByAgentId(Arrays.asList(param.getId()));
+        if(list.isEmpty()){
+            agentLog.setDownAddNumTotal(param.getDownAddNum());
+            agentLog.setMajorAddNumTotal(param.getMajorAddNum());
+            agentLog.setHighAddNumTotal(param.getHighAddNum());
+        }else {
+            GroupManageAgentLog groupManageAgentLog = list.get(0);
+            agentLog.setDownAddNumTotal(groupManageAgentLog.getDownAddNumTotal());
+            agentLog.setMajorAddNumTotal(groupManageAgentLog.getHighAddNumTotal());
+            agentLog.setHighAddNumTotal(groupManageAgentLog.getHighAddNumTotal());
+        }
         agentLog.setSysUserId(Long.valueOf(StpUtil.getLoginId().toString()));
         this.save(agentLog);
     }

src/main/java/com/fdkankan/manage/service/impl/RtkDeviceServiceImpl.java

@@ -11,11 +11,9 @@ import com.fdkankan.manage.constant.RtkTypeEnum;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IRtkDeviceMapper;
-import com.fdkankan.manage.service.ICameraService;
-import com.fdkankan.manage.service.IExcelService;
-import com.fdkankan.manage.service.IRtkDeviceService;
+import com.fdkankan.manage.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.service.ISysUserService;
+import com.fdkankan.manage.util.CameraUtils;
 import com.fdkankan.manage.vo.request.CameraInOutParam;
 import com.fdkankan.manage.vo.request.RtkDeviceInParam;
 import com.fdkankan.manage.vo.request.RtkInfoParam;
@@ -46,6 +44,8 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
     IExcelService excelService;
     @Autowired
     ICameraService cameraService;
+    @Autowired
+    ICameraDetailService cameraDetailService;
     @Override
     public RtkDevice getByRtkSnCode(String rtkSnCode) {
         LambdaQueryWrapper<RtkDevice> wrapper = new LambdaQueryWrapper<>();
@@ -122,6 +122,15 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
             if(camera == null){
                 throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
             }
+            CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
+            if(cameraDetail == null){
+                throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
+            }
+            Integer cameraType = CameraUtils.getCameraType2(param.getCameraType());
+            if(!cameraType.equals(cameraDetail.getType())){
+                throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR2);
+            }
+
             rtkDevice3 = this.getByCameraSn(param.getCameraSn());
         }
         if(rtkDevice3 != null && param.getId() == null){

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -52,6 +52,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     ISceneProService sceneProService;
     @Autowired
     IIncrementOrderMgService iIncrementOrderMgService;
+    @Autowired
+    ICameraDetailService cameraDetailService;
 
     @Override
     public Long getValidCountByUserId(Long userId) {
@@ -330,6 +332,13 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(userIncrement.getCameraId() != null){
             throw new BusinessException(ResultCode.INCREMENT_BIND_ERROR2);
         }
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
+        if(cameraDetail == null){
+            throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
+        }
+        if(cameraDetail.getUserId() != null && !cameraDetail.getUserId().equals(userIncrement.getUserId())){
+            throw new BusinessException(ResultCode.CAMERA_USER_ERROR);
+        }
 
         LambdaUpdateWrapper<UserIncrement> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(UserIncrement::getId,userParam.getIncrementId());

src/main/java/com/fdkankan/manage/util/CameraUtils.java

@@ -15,6 +15,15 @@ public class CameraUtils {
         }
         return type;
     }
+    public static  Integer getCameraType2(Integer type){
+        switch (type){
+            case 0 : return 1;
+            case 1 : return 9;
+            case 2 : return 10;
+            case 3 : return 11;
+        }
+        return type;
+    }
     public static  String getCameraTypeStr(Integer type){
         switch (type){
             case 1 : return "四维看看";