Merge branch 'test'

src/main/java/com/fdkankan/ucenter/controller/SceneApplyController.java

@@ -2,6 +2,7 @@ package com.fdkankan.ucenter.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
@@ -49,7 +50,10 @@ public class SceneApplyController {
     public ResultData pageList(@RequestBody JSONObject param){
         Integer page =param.get("pageNum") == null ? 1 : param.getInteger("pageNum");
         Integer pageSize =param.get("pageSize") == null ? 10 : param.getInteger("pageSize");
-        return ResultData.ok(sceneApplyService.page(new Page<>(page,pageSize)));
+        Integer cameraType =param.get("cameraType") == null ? 10 : param.getInteger("cameraType");
+        LambdaQueryWrapper<SceneApply> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SceneApply::getCameraType,cameraType);
+        return ResultData.ok(sceneApplyService.page(new Page<>(page,pageSize),wrapper));
     }
 
     @PostMapping("/delete")

src/main/java/com/fdkankan/ucenter/entity/SceneApply.java

@@ -86,5 +86,6 @@ public class SceneApply implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
-
+    @TableField("camera_type")
+    private Integer cameraType;
 }

src/main/java/com/fdkankan/ucenter/service/impl/CameraDetailServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.Constant;
+import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.ucenter.common.CameraTypeEnum;
 import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.entity.*;
@@ -55,6 +56,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     IFolderSceneService folderSceneService;
     @Autowired
     ICameraTypeService cameraTypeService;
+    @Autowired
+    RabbitMqProducer rabbitMqProducer;
 
     @Override
     public CameraDetail getByCameraId(Long cameraId) {
@@ -120,6 +123,10 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             this.update(wrapper);
             CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
 
+            HashMap<String,Object> map = new HashMap<>();
+            map.put("snCode",cameraMap.get(cameraDetail.getCameraId()).getSnCode());
+            rabbitMqProducer.sendByWorkQueue("camera-unbind-fusion",map);
+
             //国内服解绑
             if(!"aws".equals(NacosProperty.uploadType) && !"local".equals(NacosProperty.uploadType) && cameraType.getIsLaser() ==0){
                 sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId());     //封存场景