Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -165,6 +165,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     private IAiService aiService;
     @Autowired
     private IHaixinService haixinService;
+    @Autowired
+    private IRtkService rtkService;
 
     @Override
     public void buildScenePre(BuildSceneCallMessage message) throws Exception{
@@ -498,9 +500,13 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                         .payStatus(scenePlus.getPayStatus())
                         .mixture(scenePlusExt.getMixture())
                         .version(SceneVersionType.V4.code()).build());
-                sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
-                        .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
+                Integer mapStatus = rtkService.getMapStatus(scenePlusExt.getDataSource());
                 sceneEditControls.setShowMap(0);
+                if(mapStatus == 1){
+                    sceneEditControls.setShowMap(3);
+                    sceneEditControls.setUpdateTime(null);
+                }
+                sceneEditControlsService.updateById(sceneEditControls);
             } else if (new File(path + "/results/laserData/vision_edit.txt").exists()) {
                 fdkkLaserService.cloudPointBuild(sceneCode,path);
             }

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -437,14 +437,8 @@ public class CommonServiceImpl implements ICommonService {
         if(sceneEditControls == null){
             sceneEditControls = new SceneEditControls();
             sceneEditControls.setEditInfoId(sceneEditInfo.getId());
+            sceneEditControlsService.save(sceneEditControls);
         }
-        Integer mapStatus = rtkService.getMapStatus(scenePlusExt.getDataSource());
-        if(mapStatus == 1){
-            sceneEditControls.setShowMap(3);
-            sceneEditControls.setUpdateTime(null);
-        }
-        sceneEditControlsService.saveOrUpdate(sceneEditControls);
-
         if(sceneEditInfoExt == null){
             sceneEditInfoExt = new SceneEditInfoExt();
             sceneEditInfoExt.setScenePlusId(scenePlus.getId());