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

src/main/java/com/fdkankan/contro/bean/SceneJsonBean.java

@@ -227,5 +227,7 @@ public class SceneJsonBean implements Serializable {
 
     private Integer hasFloorplanAi;
 
+    private Integer floorLogoType;
+
 
 }

src/main/java/com/fdkankan/contro/entity/SceneEditInfoExt.java

@@ -108,6 +108,9 @@ public class SceneEditInfoExt {
     @TableField("started")
     private String started;
 
+    @TableField("floor_logo_type")
+    private Integer floorLogoType;
+
     /**
      * 是否有空间绘制
      */

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

@@ -500,12 +500,16 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                         .payStatus(scenePlus.getPayStatus())
                         .mixture(scenePlusExt.getMixture())
                         .version(SceneVersionType.V4.code()).build());
-                Integer mapStatus = rtkService.getMapStatus(scenePlusExt.getDataSource());
                 sceneEditControls.setShowMap(0);
-                if(mapStatus == 1){
-                    sceneEditControls.setShowMap(3);
-                    sceneEditControls.setUpdateTime(null);
+                if(message.getRebuild().equals("0")){//场景第一次计算，需要判断是否有地理位置信息，如果有，则需要默认勾选上迷你地图,地面logo设置默认为指南针
+                    Integer mapStatus = rtkService.getMapStatus(scenePlusExt.getDataSource());
+                    if(mapStatus == 1){
+                        sceneEditControls.setShowMap(3);
+                        sceneEditControls.setUpdateTime(null);
+                        sceneEditInfoExt.setFloorLogoType(0);
+                    }
                 }
+                sceneEditInfoExtService.updateById(sceneEditInfoExt);
                 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/SceneFileBuildServiceImpl.java

@@ -1450,9 +1450,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(deleteExtras){
             message.getExt().put("deleteExtras",deleteExtras);
         }
-        if (force) {
-            message.setRebuild("1");
+        if(force){
+            message.getExt().put("forceRebuild", force);
         }
+        message.setRebuild("1");
 
         if(Objects.nonNull(scenePlusExt.getLocation()) && scenePlusExt.getLocation() == 7){
             //发送到全景看看进行初始化
@@ -1739,14 +1740,13 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlusExtService.updateById(scenePlusExt);
 
         BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject, buildType, scenePlusVO.getDataSource());
-
         if (cameraDetail.getCompanyId() != null) {
             Company company = companyService.getById(cameraDetail.getCompanyId());
             if (company != null && !ObjectUtils.isEmpty(company.getCalculateFlexibility()) && !company.getCalculateFlexibility()) {
                 mqMessage.setFlexibility(-1);
             }
         }
-
+        mqMessage.setRebuild(String.valueOf(rebuild));
         mqMessage.getExt().put("deleteExtras", true);
         mqMessage.getExt().put("customUserId", customUserId);
         mqMessage.getExt().put("gps", jsonObject.getString("gps"));