|
@@ -554,10 +554,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
public void deleteByNum(String num) {
|
|
|
Integer sceneSource = null;
|
|
|
Long cameraId = null;
|
|
|
+ Long space = null;
|
|
|
ScenePro scenePro = this.getByNum(num);
|
|
|
if(scenePro!=null){
|
|
|
cameraId = scenePro.getCameraId();
|
|
|
sceneSource = scenePro.getSceneSource();
|
|
|
+ space = scenePro.getSpace();
|
|
|
this.removeById(scenePro.getId());
|
|
|
}
|
|
|
Scene scene = sceneService.getByNum(num);
|
|
@@ -568,13 +570,18 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
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());
|
|
|
- scenePlusExtService.delByPlus(scenePlus.getId());
|
|
|
}
|
|
|
if(sceneSource != null && sceneSource == 4){
|
|
|
laserService.delete(num);
|
|
|
}else if(cameraId != null){
|
|
|
- lockOrUnLockBySpace(null,cameraId,1);
|
|
|
+ cameraDetailService.addUsedSpace(cameraId,space);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|