Explorar o código

支持深光复制场景

lyhzzz %!s(int64=2) %!d(string=hai) anos
pai
achega
09886ca6ee

+ 2 - 2
src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -260,7 +260,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                     sceneEditControls.setEditInfoId(sceneEditInfo.getId());
                     sceneEditControlsService.save(sceneEditControls);
 
-                    if(scenePlus.getSceneSource() == 4){  //深时复制
+                    if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
                         laserService.copy(num,scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
                                 sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj());
                     }
@@ -320,7 +320,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                     sceneProService.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),-2);
                 }
 
-                    if(scenePlus.getSceneSource() == 4){  //深时复制
+                    if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
                         String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
                         laserService.copy(num,scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
                                 sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj());

+ 3 - 3
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -755,7 +755,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         oldScene.setDataSource(newDataSource);
 
         this.save(oldScene);
-        if(oldScene.getSceneSource() == 4){  //深时复制
+        if(oldScene.getSceneSource() == 4 || oldScene.getSceneSource() == 5){
             laserService.copy(oldNum,oldScene.getCameraId(),oldScene.getCreateTime(),newNum,0,null,
                     oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3",oldScene.getIsObj());
         }
@@ -799,7 +799,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 try {
                     log.info("开始复制场景-{}", new Date());
                     String buildModelPath = ConstantFilePath.BUILD_MODEL_PATH;
-                    if(oldScene.getSceneSource().equals(4)){
+                    if(oldScene.getSceneSource() == 4 || oldScene.getSceneSource() == 5){
                         buildModelPath = ConstantFilePath.BUILD_MODEL_LASER_PATH;
                     }
                     this.copyFdage(preDataSource,newDataSource,buildModelPath,time);
@@ -831,7 +831,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     if(oldScene.getPayStatus() == -2){
                         this.updateOssStatus(String.format(OssPath.v3_statusPath,oldScene.getNum()),-2);
                     }
-                    if(oldScene.getSceneSource() == 4){  //深时复制
+                    if(oldScene.getSceneSource() == 4 || oldScene.getSceneSource() == 5){
                         String laserPath = laserService.copyDataSource(preDataSource,oldScene.getDataSource());
                         laserService.copy(oldNum,oldScene.getCameraId(),oldScene.getCreateTime(),newNum,2,laserPath,
                                 oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3",oldScene.getIsObj());