|
@@ -436,8 +436,14 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void deleteByNum(String num) {
|
|
public void deleteByNum(String num) {
|
|
|
|
+ Integer sceneSource = null;
|
|
|
|
+ Long cameraId = null;
|
|
|
|
+ Long space = null;
|
|
ScenePro scenePro = this.getByNum(num);
|
|
ScenePro scenePro = this.getByNum(num);
|
|
if(scenePro!=null){
|
|
if(scenePro!=null){
|
|
|
|
+ cameraId = scenePro.getCameraId();
|
|
|
|
+ sceneSource = scenePro.getSceneSource();
|
|
|
|
+ space = scenePro.getSpace();
|
|
this.removeById(scenePro.getId());
|
|
this.removeById(scenePro.getId());
|
|
}
|
|
}
|
|
Scene scene = sceneService.getByNum(num);
|
|
Scene scene = sceneService.getByNum(num);
|
|
@@ -446,12 +452,23 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
}
|
|
}
|
|
ScenePlus scenePlus = scenePlusService.getByNum(num);
|
|
ScenePlus scenePlus = scenePlusService.getByNum(num);
|
|
if(scenePlus!=null){
|
|
if(scenePlus!=null){
|
|
|
|
+ cameraId = scenePlus.getCameraId();
|
|
|
|
+ sceneSource = scenePlus.getSceneSource();
|
|
|
|
+ ScenePlusExt plusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
|
|
|
|
+ if(plusExt != null){
|
|
|
|
+ space = plusExt.getSpace();
|
|
|
|
+ scenePlusExtService.delByPlus(scenePlus.getId());
|
|
|
|
+ }
|
|
scenePlusService.removeById(scenePlus.getId());
|
|
scenePlusService.removeById(scenePlus.getId());
|
|
scenePlusExtService.delByPlus(scenePlus.getId());
|
|
scenePlusExtService.delByPlus(scenePlus.getId());
|
|
}
|
|
}
|
|
- if(num.contains("SS")){
|
|
|
|
|
|
+ if(sceneSource != null && (sceneSource == 4 || sceneSource == 5)){
|
|
laserService.delete(num);
|
|
laserService.delete(num);
|
|
}
|
|
}
|
|
|
|
+ if(cameraId != null){
|
|
|
|
+ cameraDetailService.addUsedSpace(cameraId,space);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|