Merge branch 'release-swsx' into test

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

@@ -232,4 +232,10 @@ public class ScenePro implements Serializable {
      */
     @TableField("is_obj")
     private Integer isObj;
+
+    /**
+     * 场景名称
+     */
+    @TableField("laser_title")
+    private String laserTitle;
 }

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

@@ -62,6 +62,17 @@ public class GenerateObjFileServiceImpl implements IGenerateObjFileService {
             throw new BusinessException(ErrorCode.FAILURE_CODE_3037);
         }
 
+        LambdaUpdateWrapper<ScenePro> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper
+                .set(ScenePro::getStatus, 0)
+                .set(ScenePro::getIsObj, 1)
+                .set(ScenePro::getIsUpgrade, 2)   //   升级中
+                .eq(ScenePro::getNum, sceneProEntity.getNum());
+        if(Objects.nonNull(sceneProEntity.getLaserTitle())){
+            updateWrapper.set(ScenePro::getSceneName, sceneProEntity.getLaserTitle());
+        }
+        sceneProService.update(updateWrapper);
+
         // 获取最新的场景名称
         //同步到scenePlus、scenePlus
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
@@ -103,6 +114,15 @@ public class GenerateObjFileServiceImpl implements IGenerateObjFileService {
 
         }
 
+        LambdaUpdateWrapper<ScenePlus> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper
+                .set(ScenePlus::getSceneStatus, 0)
+                .eq(ScenePlus::getNum, num);
+        if(Objects.nonNull(scenePlus.getLaserTitle())){
+            updateWrapper.set(ScenePlus::getTitle, scenePlus.getLaserTitle());
+        }
+        scenePlusService.update(updateWrapper);
+
         LambdaUpdateWrapper<ScenePlusExt> plusExtUpdateWrapper = new LambdaUpdateWrapper<>();
         plusExtUpdateWrapper
                 .set(ScenePlusExt::getIsObj, 1)