激光复制修改为队列通知

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

@@ -163,6 +163,15 @@ public class LaserService {
         rabbitMqProducer.sendByWorkQueue("laser-update-scene",params);
     }
 
+    public void copy(String oldNum , String newNum, String  path,Boolean flag){
+        Map<String,Object> params = new HashMap<>();
+        params.put("sceneCode", newNum);
+        params.put("oldSceneCode", oldNum);
+        params.put("path",path);
+        params.put("init",flag);
+        rabbitMqProducer.sendByWorkQueue("laser-copy-scene",params);
+    }
+
 
     public String copyDataSource( String oldDataSource,String dataSource) {
         //计算成功  激光转台相机推送

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

@@ -270,9 +270,7 @@ public class SceneCommonService {
             }
 
             if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
-                laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
-                        sceneEditInfo.getScenePassword(),scenePlus.getUserId(),"V4",
-                        oldNum,plusExt.getAlgorithmTime(),scenePlus.getSceneSource(),plusExt.getShootCount(),plusExt.getLocation(),plusExt.getIsObj());
+                laserService.copy(oldNum,newNum,newDataSource,true);
             }else {
                 laserService.cloudPointBuild(oldNum,newNum);
             }
@@ -291,10 +289,7 @@ public class SceneCommonService {
 
 
             if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
-                String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
-                laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
-                        sceneEditInfo.getScenePassword(),scenePlus.getUserId(),"V4",
-                        oldNum,plusExt.getAlgorithmTime(),scenePlus.getSceneSource(),plusExt.getShootCount(),plusExt.getLocation(),plusExt.getIsObj());
+                laserService.copy(oldNum,newNum,newDataSource,false);
             }
             String redisKey = RedisKeyUtil.laserCopyLock + newNum;
             long startTime = new Date().getTime();
@@ -370,10 +365,8 @@ public class SceneCommonService {
             oldEditScene.setFloorPlanPng(oldEditScene.getFloorPlanPng() == null ? null : oldEditScene.getFloorPlanPng().replace(oldNum, scenePro.getNum()));
             sceneProEditService.save(oldEditScene);
 
-            if(scenePro.getSceneSource() == 4){  //深时复制
-                laserService.copy(scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
-                        oldEditScene.getSceneKey(),scenePro.getUserId(),"V3",
-                        oldNum,scenePro.getCreateTime(),scenePro.getSceneSource(),scenePro.getShootCount(),null,scenePro.getIsObj());
+            if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){  //深时复制
+                laserService.copy(oldNum,newNum,newDataSource,false);
             }
             /*
              *cp oss nas
@@ -406,12 +399,8 @@ public class SceneCommonService {
             String targetVoice = String.format(SceneResourcePath.voicePath, scenePro.getNum());
             this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVoice,targetVoice);
 
-            if(scenePro.getSceneSource() == 4){  //深时复制
-                String laserPath = laserService.copyDataSource(oldDataSource,scenePro.getDataSource());
-                laserService.copy(scenePro.getCameraId(),scenePro.getCreateTime(),newNum,2,laserPath,
-                        oldEditScene.getSceneKey(),scenePro.getUserId(),"V3",
-                        oldNum,scenePro.getCreateTime(),scenePro.getSceneSource(),scenePro.getShootCount(),null,scenePro.getIsObj());
-
+            if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){  //深时复制
+                laserService.copy(oldNum,newNum,newDataSource,true);
             }
             scenePro.setStatus(-2);
             sceneProService.updateById(scenePro);