|
@@ -3,13 +3,9 @@ package com.fdkankan.contro.mq.service.impl;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.fdkankan.common.util.FileUtils;
|
|
|
-import com.fdkankan.contro.entity.ScenePlus;
|
|
|
-import com.fdkankan.contro.entity.ScenePro;
|
|
|
+import com.fdkankan.contro.entity.*;
|
|
|
import com.fdkankan.contro.mq.service.IBuildSceneService;
|
|
|
-import com.fdkankan.contro.service.IBuildSceneDTService;
|
|
|
-import com.fdkankan.contro.service.IFdkkLaserService;
|
|
|
-import com.fdkankan.contro.service.IScenePlusService;
|
|
|
-import com.fdkankan.contro.service.ISceneProService;
|
|
|
+import com.fdkankan.contro.service.*;
|
|
|
import com.fdkankan.contro.service.impl.FdkkV4Service;
|
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
|
import com.fdkankan.model.constants.ConstantFileName;
|
|
@@ -66,6 +62,15 @@ public class BuildObjServiceImpl implements IBuildSceneService {
|
|
|
@Autowired
|
|
|
private IScenePlusService scenePlusService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISceneEditControlsService sceneEditControlsService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ISceneEditInfoService sceneEditInfoService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ISceneProEditService sceneProEditService;
|
|
|
+
|
|
|
@Override
|
|
|
public void buildScenePre(BuildSceneCallMessage message) {
|
|
|
boolean success = false;
|
|
@@ -190,13 +195,25 @@ public class BuildObjServiceImpl implements IBuildSceneService {
|
|
|
|
|
|
fdkkLaserService.pushBuildStatusToLaserSystem(projectNum, laserObjFilePath + "/laserData/mesh");
|
|
|
|
|
|
- LambdaUpdateWrapper<ScenePro> updateWrapper = new LambdaUpdateWrapper<ScenePro>()
|
|
|
- .set(ScenePro::getStatus, -2).eq(ScenePro::getNum, projectNum);
|
|
|
- sceneProService.update(updateWrapper);
|
|
|
|
|
|
- LambdaUpdateWrapper<ScenePlus> plusUpdateWrapper = new LambdaUpdateWrapper<ScenePlus>()
|
|
|
- .set(ScenePlus::getSceneStatus, -2).eq(ScenePlus::getNum, projectNum);
|
|
|
- scenePlusService.update(plusUpdateWrapper);
|
|
|
+ ScenePro scenePro = sceneProService.getByNum(projectNum);
|
|
|
+ if(!ObjectUtils.isEmpty(scenePro)){
|
|
|
+ LambdaUpdateWrapper<ScenePro> updateWrapper = new LambdaUpdateWrapper<ScenePro>()
|
|
|
+ .set(ScenePro::getStatus, -2).eq(ScenePro::getNum, projectNum);
|
|
|
+ sceneProService.update(updateWrapper);
|
|
|
+ sceneProEditService.update(new LambdaUpdateWrapper<SceneProEdit>().set(SceneProEdit::getMapVisi,0)
|
|
|
+ .eq(SceneProEdit::getProId,scenePro.getId()));
|
|
|
+ }
|
|
|
+
|
|
|
+ ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
|
|
|
+ if(!ObjectUtils.isEmpty(scenePlus)){
|
|
|
+ LambdaUpdateWrapper<ScenePlus> plusUpdateWrapper = new LambdaUpdateWrapper<ScenePlus>()
|
|
|
+ .set(ScenePlus::getSceneStatus, -2).eq(ScenePlus::getNum, projectNum);
|
|
|
+ scenePlusService.update(plusUpdateWrapper);
|
|
|
+ SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
|
|
|
+ sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
|
|
|
+ .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
|
|
|
+ }
|
|
|
|
|
|
// 如果未升级V4,则升级V4
|
|
|
fdkkV4Service.upgradeToV4(projectNum);
|