深时查询

src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

@@ -126,13 +126,11 @@ public class LaserService {
         if(StringUtils.isNotBlank(param.getChildName())){
             List<Camera> cameraList = cameraService.getLikeChildName(param.getChildName());
             List<String> snCodes = cameraList.stream().map(Camera::getSnCode).collect(Collectors.toList());
-            if(snCodes.size() >0){
-                if(param.getSnCodes() != null && param.getSnCodes().size() >0){
-                    List<String> list3 = param.getSnCodes().stream().filter(snCodes::contains).collect(Collectors.toList());
-                    param.setSnCodes(list3);
-                }else {
-                    param.setSnCodes(snCodes);
-                }
+            if(param.getSnCodes() != null && param.getSnCodes().size() >0){
+                List<String> list3 = param.getSnCodes().stream().filter(snCodes::contains).collect(Collectors.toList());
+                param.setSnCodes(list3);
+            }else {
+                param.setSnCodes(snCodes);
             }
         }
         BeanUtils.copyProperties(param,newParam);

src/main/java/com/fdkankan/manage_jp/service/IScenePlusService.java

@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IScenePlusService extends IService<ScenePlus> {
 
     ScenePlus getByNum(String sceneNum);
+
+    void unbind(Long cameraId);
 }

src/main/java/com/fdkankan/manage_jp/service/ISceneProService.java

@@ -27,4 +27,6 @@ public interface ISceneProService extends IService<ScenePro> {
     void addDownloadNum(String sceneNum);
 
     void deleteByNum(String sceneNum);
+
+    void unbind(Long cameraId);
 }

src/main/java/com/fdkankan/manage_jp/service/impl/CameraServiceImpl.java

@@ -49,6 +49,10 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
     IUserService userService;
     @Autowired
     IUserRoleService userRoleService;
+    @Autowired
+    ISceneProService sceneProService;
+    @Autowired
+    IScenePlusService scenePlusService;
 
     @Override
     public Camera findByChildName(String childName) {
@@ -133,6 +137,8 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         this.update(wrapper);
 
         cameraDetailService.unbind(camera.getId());
+        sceneProService.unbind(camera.getId());
+        scenePlusService.unbind(camera.getId());
     }
 
     @Override

src/main/java/com/fdkankan/manage_jp/service/impl/ScenePlusServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage_jp.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.manage_jp.entity.ScenePlus;
 import com.fdkankan.manage_jp.mapper.IScenePlusMapper;
 import com.fdkankan.manage_jp.service.IScenePlusService;
@@ -30,4 +31,12 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         }
         return null;
     }
+
+    @Override
+    public void unbind(Long cameraId) {
+        LambdaUpdateWrapper<ScenePlus> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(ScenePlus::getCameraId,cameraId);
+        wrapper.set(ScenePlus::getUserId,null);
+        this.update(wrapper);
+    }
 }

src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -173,4 +173,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             FileUtil.del(OssPath.localStatusPath);
         }
     }
+
+    @Override
+    public void unbind(Long cameraId) {
+        LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(ScenePro::getCameraId,cameraId);
+        wrapper.eq(ScenePro::getIsUpgrade,0);
+        wrapper.set(ScenePro::getUserId,null);
+        this.update(wrapper);
+    }
 }