Merge branch 'feature-slimming-nas-20220130-dsx' into test

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

src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -99,8 +99,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
         String num = message.getSceneNum();
         try {
             String path = message.getPath();
-            //根据相机类型，组装资源路径
             String laserObjFilePath = path + "_laser_obj";
+            //根据相机类型，组装资源路径
             log.info("开始准备生成OBJ场景资源,路径：{}", laserObjFilePath);
 
             FileUtils.delAllFile(laserObjFilePath);
@@ -183,6 +183,7 @@ public class BuildObjServiceImpl implements IBuildSceneService {
 
         String path = message.getPath();
         String projectNum = message.getBuildContext().get("sceneNum").toString();
+        String laserObjFilePath = path;
         boolean success = false;
         try {
             if (!message.getBuildSuccess()) {
@@ -192,7 +193,6 @@ public class BuildObjServiceImpl implements IBuildSceneService {
                 return;
             }
 
-            String laserObjFilePath = path;
             ScenePro scenePro = sceneProService.getByNum(projectNum);
             String version = "v4";
             String ossImagePath = String.format(UploadFilePath.IMG_VIEW_PATH,  projectNum);
@@ -250,10 +250,9 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             //上传mesh文件
             fYunFileService.uploadFileByCommand(laserObjFilePath + "/results/mesh", String.format(UploadFilePath.DATA_VIEW_PATH,  projectNum) + "mesh");
 
-            fdkkLaserService.pushBuildStatusToLaserSystem(projectNum, laserObjFilePath + "/laserData/mesh");
 
-        //生成floorplan.json
-        commonService.uploadFloorplanJson(projectNum, laserObjFilePath);
+            //生成floorplan.json
+            commonService.uploadFloorplanJson(projectNum, laserObjFilePath);
 
             if(!ObjectUtils.isEmpty(scenePro)){
                 LambdaUpdateWrapper<ScenePro> updateWrapper = new LambdaUpdateWrapper<ScenePro>()
@@ -284,6 +283,7 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             if(!success){
                 buildSceneDTService.handBaseFail("生成OBJ场景计算结果处理异常", message.getPath(), projectNum, "计算控制服务器");
             }
+            fdkkLaserService.pushBuildStatusToLaserSystem(projectNum, laserObjFilePath + "/laserData/mesh", success ? CommonOperStatus.SUCCESS.code() : CommonOperStatus.FAILD.code());
         }
     }
 

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

@@ -18,7 +18,7 @@ import java.util.Date;
 public interface IFdkkLaserService {
     void syncBuildResult(String sceneNum, String dataSource, Date createTime);
 
-    void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath);
+    void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath, int buildObjStatus);
 
     void saveScene(ScenePlus scenePlus, String scenePassword, Camera cameraEntity, String userName, boolean b);
 

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

@@ -102,10 +102,11 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
     }
 
     @Override
-    public void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath) {
+    public void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath, int buildObjStatus) {
         Map<String, String> params = new HashMap<>();
         params.put("sceneCode", projectNum);
         params.put("objPath", laserObjFilePath);
+        params.put("buildObjStatus", buildObjStatus);
         rabbitMqProducer.sendByWorkQueue(updateBuildStatus, params);
     }