Merge branch 'feature-sg-20230615-dsx' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

src/main/java/com/fdkankan/contro/service/IFdkkLaserService.java

@@ -1,5 +1,6 @@
 package com.fdkankan.contro.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.contro.entity.Camera;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.entity.ScenePlusExt;
@@ -20,7 +21,7 @@ public interface IFdkkLaserService {
 
     void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath, Integer buildObjStatus);
 
-    void saveScene(ScenePlus scenePlus, String scenePassword, Camera cameraEntity, String userName, boolean b);
+    void saveScene(ScenePlus scenePlus, JSONObject jsonObject, Camera cameraEntity, String userName, boolean b);
 
     void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild);
 

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

@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 @Slf4j
@@ -113,7 +114,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
     }
 
 
-    public void saveScene(ScenePlus scenePlus, String scenePassword, Camera cameraEntity, String phone, boolean rebuild) {
+    public void saveScene(ScenePlus scenePlus, JSONObject fdageJson, Camera cameraEntity, String phone, boolean rebuild) {
         Map<String, Object> params = new HashMap<>();
         params.put("childName", cameraEntity.getChildName());
         params.put("createTime", DateUtil.date2String(scenePlus.getCreateTime(), null));
@@ -122,7 +123,9 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         params.put("snCode", cameraEntity.getSnCode());
         params.put("status", scenePlus.getSceneStatus());
         if (!rebuild) {
-            params.put("password", scenePassword);
+            if(Objects.nonNull(fdageJson)){
+                params.put("password", fdageJson.getString("pwd"));
+            }
         } else {
             params.put("status", 4);
         }
@@ -130,6 +133,9 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         params.put("title", scenePlus.getTitle());
         params.put("userId", scenePlus.getUserId());
         params.put("sceneSource", scenePlus.getSceneSource());
+        if(Objects.nonNull(fdageJson)){
+            params.put("location", fdageJson.getInteger("localtion"));
+        }
         rabbitMqProducer.sendByWorkQueue(updateScene, params);
     }
 

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

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