|
@@ -250,7 +250,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
|
|
|
|
|
|
if(scenePlus.getSceneSource() == 4){ //深时复制
|
|
if(scenePlus.getSceneSource() == 4){ //深时复制
|
|
laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
|
|
laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
|
|
- sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
|
|
|
|
|
|
+ sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj());
|
|
}
|
|
}
|
|
|
|
|
|
List<Surveillance> list = surveillanceService.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
|
|
List<Surveillance> list = surveillanceService.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
|
|
@@ -311,7 +311,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
|
|
if(scenePlus.getSceneSource() == 4){ //深时复制
|
|
if(scenePlus.getSceneSource() == 4){ //深时复制
|
|
String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
|
|
String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
|
|
laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
|
|
laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
|
|
- sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
|
|
|
|
|
|
+ sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj());
|
|
} else if(!"aws".equals(NacosProperty.uploadType)){
|
|
} else if(!"aws".equals(NacosProperty.uploadType)){
|
|
laserService.cloudPointBuild(num,newNum);
|
|
laserService.cloudPointBuild(num,newNum);
|
|
}
|
|
}
|