Merge branch 'release-jg-v2.11.0' into release

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

@@ -56,6 +56,12 @@ public class ScenePlus implements Serializable {
     private String title;
 
     /**
+     * 场景名称
+     */
+    @TableField("laser_title")
+    private String laserTitle;
+
+    /**
      * 场景描述
      */
     @TableField("description")
@@ -123,4 +129,5 @@ public class ScenePlus implements Serializable {
     private Long sourceId;
 
 
+
 }

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

@@ -149,7 +149,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
             params.put("status", 4);
         }
         params.put("version",getSceneVersion(scenePlus.getNum()));
-        params.put("title", scenePlus.getTitle());
+        params.put("title", scenePlus.getLaserTitle());
         params.put("userId", scenePlus.getUserId());
         params.put("sceneSource", scenePlus.getSceneSource());
         if(Objects.nonNull(fdageJson)){

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

@@ -465,6 +465,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             }
         }
         mqMessage.getExt().put("deleteExtras", true);
+        mqMessage.getExt().put("keepTitle", 0);
         if(jsonObject.getIntValue("location") == 7){
             //发送到全景看看进行初始化
             intermitSceneService.sendMq(scenePlusVO.getNum(), jsonObject, CommonSuccessStatus.WAITING.code());
@@ -474,8 +475,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             if(cameraType == 13 && Objects.nonNull(cameraDetail.getCompanyId()) && cameraDetail.getCompanyId() == 26){
                 wbService.sendMq(sceneNum, CommonSuccessStatus.WAITING.code());
             }
-//            String test = null;
-//            test.equals("123");
             rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
         }
 
@@ -958,6 +957,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlus.setSceneSource(SceneSource.BM.code());
         scenePlusExt.setDataSource(dataSource);
         scenePlusExt.setLocation(location);
+        if (sceneName != null) {
+            scenePlus.setTitle(sceneName);
+            scenePlus.setLaserTitle(sceneName);
+        }
 
         if(resolution == null || resolution.intValue() == 0){
             scenePlusExt.setSceneScheme(cameraType.intValue());
@@ -1007,9 +1010,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         } else {
             scenePlusExt.setShootCount(sceneShootCount);
         }
-        if (sceneName != null) {
-            scenePlus.setTitle(sceneName);
-        }
         if (sceneDec != null) {
             scenePlus.setDescription("<p>" + new String(sceneDec.getBytes("UTF-8")) + "</p>");
         }
@@ -1086,9 +1086,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             scenePlusExt.setSpace(oldSceneExt.getSpace());
             scenePlusExt.setEcs(oldSceneExt.getEcs());
             scenePlusExt.setViewCount(oldSceneExt.getViewCount());
-            if(sceneName!=null) {
-                scenePlus.setTitle(sceneName);
-            }
             if(sceneType!=null) {
                 scenePlus.setSceneType(sceneType);
             }
@@ -1388,6 +1385,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if (force) {
             message.setRebuild("1");
         }
+        message.getExt().put("keepTitle", 1);
 
         String ossOrignPath = commonService.getOssOrignPath(path);
         String ossPath = fYunFileService.getFileContent(ossOrignPath + "custom.txt");