|
@@ -270,7 +270,7 @@ public class SceneCommonService {
|
|
|
if(scenePlus.getSceneSource() == 4){ //深时复制
|
|
|
laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
|
|
|
sceneEditInfo.getScenePassword(),scenePlus.getUserId(),"V4",
|
|
|
- oldNum,plusExt.getAlgorithm(),scenePlus.getSceneSource(),plusExt.getShootCount(),plusExt.getLocation(),plusExt.getIsObj());
|
|
|
+ oldNum,plusExt.getAlgorithmTime(),scenePlus.getSceneSource(),plusExt.getShootCount(),plusExt.getLocation(),plusExt.getIsObj());
|
|
|
}else {
|
|
|
laserService.cloudPointBuild(oldNum,newNum);
|
|
|
}
|
|
@@ -292,7 +292,7 @@ public class SceneCommonService {
|
|
|
String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
|
|
|
laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
|
|
|
sceneEditInfo.getScenePassword(),scenePlus.getUserId(),"V4",
|
|
|
- oldNum,plusExt.getAlgorithm(),scenePlus.getSceneSource(),plusExt.getShootCount(),plusExt.getLocation(),plusExt.getIsObj());
|
|
|
+ oldNum,plusExt.getAlgorithmTime(),scenePlus.getSceneSource(),plusExt.getShootCount(),plusExt.getLocation(),plusExt.getIsObj());
|
|
|
}
|
|
|
scenePlus.setSceneStatus(-2);
|
|
|
scenePlusService.updateById(scenePlus);
|
|
@@ -360,7 +360,7 @@ public class SceneCommonService {
|
|
|
if(scenePro.getSceneSource() == 4){ //深时复制
|
|
|
laserService.copy(scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
|
|
|
oldEditScene.getSceneKey(),scenePro.getUserId(),"V3",
|
|
|
- oldNum,scenePro.getAlgorithm(),scenePro.getSceneSource(),scenePro.getShootCount(),null,scenePro.getIsObj());
|
|
|
+ oldNum,scenePro.getCreateTime(),scenePro.getSceneSource(),scenePro.getShootCount(),null,scenePro.getIsObj());
|
|
|
}
|
|
|
/*
|
|
|
*cp oss nas
|
|
@@ -397,7 +397,7 @@ public class SceneCommonService {
|
|
|
String laserPath = laserService.copyDataSource(oldDataSource,scenePro.getDataSource());
|
|
|
laserService.copy(scenePro.getCameraId(),scenePro.getCreateTime(),newNum,2,laserPath,
|
|
|
oldEditScene.getSceneKey(),scenePro.getUserId(),"V3",
|
|
|
- oldNum,scenePro.getAlgorithm(),scenePro.getSceneSource(),scenePro.getShootCount(),null,scenePro.getIsObj());
|
|
|
+ oldNum,scenePro.getCreateTime(),scenePro.getSceneSource(),scenePro.getShootCount(),null,scenePro.getIsObj());
|
|
|
|
|
|
}
|
|
|
scenePro.setStatus(-2);
|