|
@@ -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());
|