|
@@ -11,6 +11,7 @@ import com.fdkankan.redis.util.RedisUtil;
|
|
import com.fdkankan.ucenter.common.OssPath;
|
|
import com.fdkankan.ucenter.common.OssPath;
|
|
import com.fdkankan.ucenter.constant.LoginConstant;
|
|
import com.fdkankan.ucenter.constant.LoginConstant;
|
|
import com.fdkankan.ucenter.entity.*;
|
|
import com.fdkankan.ucenter.entity.*;
|
|
|
|
+import com.fdkankan.ucenter.httpClient.service.LaserService;
|
|
import com.fdkankan.ucenter.mapper.IScenePlusMapper;
|
|
import com.fdkankan.ucenter.mapper.IScenePlusMapper;
|
|
import com.fdkankan.ucenter.service.*;
|
|
import com.fdkankan.ucenter.service.*;
|
|
import com.fdkankan.ucenter.vo.request.AppSceneParam;
|
|
import com.fdkankan.ucenter.vo.request.AppSceneParam;
|
|
@@ -52,10 +53,13 @@ public class AppSceneService {
|
|
RedisUtil redisUtil;
|
|
RedisUtil redisUtil;
|
|
@Autowired
|
|
@Autowired
|
|
ISceneCooperationService sceneCooperationService;
|
|
ISceneCooperationService sceneCooperationService;
|
|
|
|
+ @Autowired
|
|
|
|
+ LaserService laserService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
IScenePlusMapper scenePlusMapper;
|
|
IScenePlusMapper scenePlusMapper;
|
|
|
|
|
|
|
|
+
|
|
@Value("${fyun.host}")
|
|
@Value("${fyun.host}")
|
|
private String ossHost;
|
|
private String ossHost;
|
|
|
|
|
|
@@ -258,15 +262,22 @@ public class AppSceneService {
|
|
if(scenePlus!=null && !scenePlus.getCameraId().equals(cameraId)){
|
|
if(scenePlus!=null && !scenePlus.getCameraId().equals(cameraId)){
|
|
throw new BusinessException(SceneConstant.FAILURE_CODE_5010, SceneConstant.FAILURE_MSG_5010);
|
|
throw new BusinessException(SceneConstant.FAILURE_CODE_5010, SceneConstant.FAILURE_MSG_5010);
|
|
}
|
|
}
|
|
|
|
+ Integer sceneSource = null;
|
|
List<ScenePro> proList = new ArrayList<>();
|
|
List<ScenePro> proList = new ArrayList<>();
|
|
if(scenePro!=null){
|
|
if(scenePro!=null){
|
|
proList.add(scenePro);
|
|
proList.add(scenePro);
|
|
|
|
+ sceneSource = scenePro.getSceneSource();
|
|
}
|
|
}
|
|
List<ScenePlus> plusList = new ArrayList<>();
|
|
List<ScenePlus> plusList = new ArrayList<>();
|
|
if(scenePlus!=null){
|
|
if(scenePlus!=null){
|
|
plusList.add(scenePlus);
|
|
plusList.add(scenePlus);
|
|
|
|
+ sceneSource = scenePlus.getSceneSource();
|
|
}
|
|
}
|
|
sceneProService.deleteByList(proList,plusList);
|
|
sceneProService.deleteByList(proList,plusList);
|
|
|
|
+
|
|
|
|
+ if(sceneSource != null && sceneSource == 4){
|
|
|
|
+ laserService.delete(sceneNum);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
public void deleteScene(String sceneNum) {
|
|
public void deleteScene(String sceneNum) {
|