Merge branch 'feature-v4.7.0.2-20230404' into test

src/main/java/com/fdkankan/contro/enums/CameraTypeEnum.java

@@ -10,7 +10,7 @@ public enum CameraTypeEnum {
     ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
     DOUBLE_EYE_TURN(9,"KJ-","4DKKLITE_","双目转台"),
     LASER_TURN(10,"SS-","4DKKLA_","激光转台"),
-    LASER_SG(13,"SG-","4DSG_","深光");
+    LASER_SG(11,"SG-","4DSG_","深光");
 
 
     private int type;

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

@@ -5,6 +5,7 @@ import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.contro.entity.Camera;
 import com.fdkankan.contro.entity.ScenePlus;
+import com.fdkankan.contro.entity.ScenePlusExt;
 import com.fdkankan.contro.entity.ScenePro;
 import com.fdkankan.contro.service.IFdkkLaserService;
 import com.fdkankan.contro.service.IScenePlusService;
@@ -127,6 +128,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         params.put("version",getSceneVersion(scenePlus.getNum()));
         params.put("title", scenePlus.getTitle());
         params.put("userId", scenePlus.getUserId());
+        params.put("sceneSource", scenePlus.getSceneSource());
         rabbitMqProducer.sendByWorkQueue(updateScene, params);
     }
 

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

@@ -765,7 +765,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             }
             //判断 是否为激光相机
             Camera camera = cameraService.getByChildName(mac);
-            if(!ObjectUtils.isEmpty(scenePlus)){
+            if(Objects.nonNull(scenePlus)){
                 fdkkLaserService.saveScene(scenePlus,fdageJson.getString("pwd"),camera,userName,false);
             }else{
                 fdkkLaserService.saveScene(scenePro,fdageJson.getString("pwd"),camera,userName,false);