Pārlūkot izejas kodu

激光场景设置showMap为0

tianboguang 2 gadi atpakaļ
vecāks
revīzija
5b709ee261

+ 29 - 12
src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -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);

+ 2 - 0
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -274,6 +274,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 });
                 //计算成功  激光转台相机 同步 请求
                 fdkkLaserService.syncBuildResult(scenePlus.getNum(), scenePlusExt.getDataSource(),scenePlus.getCreateTime());
+                sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
+                        .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
             }
 
             CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/") + "/capture");

+ 7 - 4
src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -14,10 +14,7 @@ import com.fdkankan.common.constant.ExpiredStatus;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.contro.entity.CameraDetail;
-import com.fdkankan.contro.entity.IncrementType;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.entity.UserIncrement;
+import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.mq.service.IBuildSceneService;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.service.impl.FdkkV4Service;
@@ -98,6 +95,9 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
     @Autowired
     private IBuildSceneDTService buildSceneDTService;
 
+    @Autowired
+    private ISceneProEditService sceneProEditService;
+
     @Override
     public void buildScenePre(BuildSceneCallMessage message) {
         boolean success = false;
@@ -236,6 +236,9 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
             if (cameraType == 14) {
                 //计算成功  激光转台相机 同步 请求
                 fdkkLaserService.syncBuildResult(scenePro.getNum(), scenePro.getDataSource(),scenePro.getCreateTime());
+
+                sceneProEditService.update(new LambdaUpdateWrapper<SceneProEdit>().set(SceneProEdit::getMapVisi,0)
+                        .eq(SceneProEdit::getProId,scenePro.getId()));
             }
 
             CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/") + "/capture");