lyhzzz пре 1 година
родитељ
комит
14fe30fca0
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

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

@@ -767,7 +767,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             oldEditScene.setFloorPlanPng(oldEditScene.getFloorPlanPng() == null ? null : oldEditScene.getFloorPlanPng().replace(oldNum, scenePro.getNum()));
             oldEditScene.setFloorPlanPng(oldEditScene.getFloorPlanPng() == null ? null : oldEditScene.getFloorPlanPng().replace(oldNum, scenePro.getNum()));
             sceneProEditService.save(oldEditScene);
             sceneProEditService.save(oldEditScene);
 
 
-            if(scenePro.getSceneSource() == 4){  //深时复制
+            if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5) {  //深时复制
                 laserService.copy(oldNum,scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
                 laserService.copy(oldNum,scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
                         oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
                         oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
             }
             }
@@ -799,7 +799,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 String targetVoice = String.format(SceneResourcePath.voicePath, scenePro.getNum());
                 String targetVoice = String.format(SceneResourcePath.voicePath, scenePro.getNum());
                 this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVoice,targetVoice);
                 this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVoice,targetVoice);
 
 
-                if(scenePro.getSceneSource() == 4){  //深时复制
+                if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,scenePro.getDataSource());
                     String laserPath = laserService.copyDataSource(oldDataSource,scenePro.getDataSource());
                     laserService.copy(oldNum,scenePro.getCameraId(),scenePro.getCreateTime(),newNum,2,laserPath,
                     laserService.copy(oldNum,scenePro.getCameraId(),scenePro.getCreateTime(),newNum,2,laserPath,
                             oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
                             oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());