激光删除场景

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

@@ -3,6 +3,7 @@ package com.fdkankan.ucenter.httpClient.service;
 import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.http.client.NacosAsyncRestTemplate;
+import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
@@ -279,10 +280,11 @@ public class LaserService {
             params.put("status", -1);
             Result result = laserClient.saveOrEdit(num, params);
             if(result.getCode() != HttpStatus.OK.value()){
-                log.error("激光场景状态同步失败!");
+                throw new BusinessException(-1,"激光场景状态同步失败");
             }
         }catch (Exception e){
             log.error("激光场景状态同步失败!",e);
+            throw new BusinessException(-1,e.getMessage());
         }
 
     }

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

@@ -862,6 +862,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             for (ScenePro scenePro : proList) {
                 cameraMap.merge(scenePro.getCameraId(), scenePro.getSpace(), Long::sum);
                 sceneDelLogService.saveLog(scenePro.getNum(),userId);
+                if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){
+                    laserService.delete(scenePro.getNum());
+                }
             }
             List<Long> proIds = proList.parallelStream().map(ScenePro::getId).collect(Collectors.toList());
             this.removeByIds(proIds);
@@ -875,13 +878,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 if(scenePlus.getCameraId()!= null && plusMap.get(scenePlus.getId())!=null){
                     Long space = plusMap.get(scenePlus.getId()).getSpace() == null ? 0 :plusMap.get(scenePlus.getId()).getSpace();
                     cameraMap.merge(scenePlus.getCameraId(), space, Long::sum);
+
                 }
                 sceneDelLogService.saveLog(scenePlus.getNum(),userId);
+                if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){
+                    laserService.delete(scenePlus.getNum());
+                }
             }
             scenePlusService.removeByIds(plusIds);
             scenePlusExtService.removeByPlusIds(plusIds);
             folderSceneService.delBySceneId(plusIds);
-
         }
         //恢复相机使用容量
         if(cameraMap.size() >0){