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

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());
         params.put("payStatus", scenePlus.getPayStatus());

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

@@ -956,6 +956,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());
@@ -1029,9 +1033,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         SceneEditInfoExt sceneEditInfoExt = new SceneEditInfoExt();
         SceneEditControls sceneEditControls = new SceneEditControls();
         if(type == 0){
-            if (sceneName != null) {
-                scenePlus.setTitle(sceneName);
-            }
             scenePlus.setSceneStatus(SceneStatus.wait.code());
             scenePlusService.save(scenePlus);
             scenePlusExt.setPlusId(scenePlus.getId());
@@ -1084,9 +1085,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);
             }