|
@@ -62,6 +62,8 @@ public class SceneCommonService {
|
|
RedisUtil redisUtil;
|
|
RedisUtil redisUtil;
|
|
@Autowired
|
|
@Autowired
|
|
ICameraDetailService cameraDetailService;
|
|
ICameraDetailService cameraDetailService;
|
|
|
|
+ @Autowired
|
|
|
|
+ ISceneCopyLogService sceneCopyLogService;
|
|
|
|
|
|
public String getNewNum(String oldNum ){
|
|
public String getNewNum(String oldNum ){
|
|
String newNum = scene3dNumService.generateNum();
|
|
String newNum = scene3dNumService.generateNum();
|
|
@@ -459,17 +461,35 @@ public class SceneCommonService {
|
|
}
|
|
}
|
|
Long cameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
|
|
Long cameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
|
|
CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
|
|
CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
|
|
-
|
|
|
|
|
|
+ String laserTitle = null;
|
|
if((cameraDetail.getType() == 10 || cameraDetail.getType() == 11) && scenePlus != null){
|
|
if((cameraDetail.getType() == 10 || cameraDetail.getType() == 11) && scenePlus != null){
|
|
|
|
+ List<SceneCopyLog> sceneCopyLogs = sceneCopyLogService.getByNewNum(newNum);
|
|
|
|
+ if(!sceneCopyLogs.isEmpty()){
|
|
|
|
+ SceneCopyLog sceneCopyLog = sceneCopyLogs.get(0);
|
|
|
|
+ ScenePlus scenePlus1 = scenePlusService.getByNum(sceneCopyLog.getOldNum());
|
|
|
|
+ laserTitle = scenePlus1.getLaserTitle();
|
|
|
|
+ }
|
|
LambdaUpdateWrapper<ScenePlus> wrapper = new LambdaUpdateWrapper<>();
|
|
LambdaUpdateWrapper<ScenePlus> wrapper = new LambdaUpdateWrapper<>();
|
|
wrapper.eq(ScenePlus::getId,scenePlus.getId());
|
|
wrapper.eq(ScenePlus::getId,scenePlus.getId());
|
|
wrapper.set(ScenePlus::getSceneStatus,-2);
|
|
wrapper.set(ScenePlus::getSceneStatus,-2);
|
|
|
|
+ if(StringUtils.isNotBlank(laserTitle)){
|
|
|
|
+ wrapper.set(ScenePlus::getLaserTitle,laserTitle);
|
|
|
|
+ }
|
|
scenePlusService.update(wrapper);
|
|
scenePlusService.update(wrapper);
|
|
}
|
|
}
|
|
if((cameraDetail.getType() == 10 || cameraDetail.getType() == 11) && scenePro != null){
|
|
if((cameraDetail.getType() == 10 || cameraDetail.getType() == 11) && scenePro != null){
|
|
|
|
+ List<SceneCopyLog> sceneCopyLogs = sceneCopyLogService.getByNewNum(newNum);
|
|
|
|
+ if(!sceneCopyLogs.isEmpty()){
|
|
|
|
+ SceneCopyLog sceneCopyLog = sceneCopyLogs.get(0);
|
|
|
|
+ ScenePro scenePro1 = sceneProService.getByNum(sceneCopyLog.getOldNum());
|
|
|
|
+ laserTitle = scenePro1.getLaserTitle();
|
|
|
|
+ }
|
|
LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
|
|
LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
|
|
wrapper.eq(ScenePro::getId,scenePro.getId());
|
|
wrapper.eq(ScenePro::getId,scenePro.getId());
|
|
wrapper.set(ScenePro::getStatus,-2);
|
|
wrapper.set(ScenePro::getStatus,-2);
|
|
|
|
+ if(StringUtils.isNotBlank(laserTitle)){
|
|
|
|
+ wrapper.set(ScenePro::getLaserTitle,laserTitle);
|
|
|
|
+ }
|
|
sceneProService.update(wrapper);
|
|
sceneProService.update(wrapper);
|
|
}
|
|
}
|
|
}
|
|
}
|