Merge branch 'release-swsx' into test

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

@@ -239,6 +239,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
         }catch (Exception e){
             log.error("场景计算前置处理出错,num"+num, e);
+
+            //计算失败通知激光系统修改状态
+            fdkkLaserService.updateStatus(num, 1);
+
             buildSceneDTService.handBaseFail("场景计算资源准备异常！", message.getPath(), message.getSceneNum(), "计算控制服务器");
             throw e;
         }
@@ -280,6 +284,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
                 wbService.sendMq(sceneCode, CommonSuccessStatus.FAIL.code());
 
+                //计算失败通知激光系统修改状态
+                fdkkLaserService.updateStatus(sceneCode, 1);
+
                 // 发送钉钉消息，计算失败
                 buildSceneDTService.handModelFail("计算失败", message.getPath(), sceneCode, message.getHostName());
                 return;
@@ -449,6 +456,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
         }catch (Exception e){
             log.error("场景计算结果处理出错,num"+sceneCode, e);
+
+            //计算失败通知激光系统修改状态
+            fdkkLaserService.updateStatus(sceneCode, 1);
+
             buildSceneDTService.handBaseFail("场景计算结果处理出错！", message.getPath(), sceneCode, "计算控制服务器");
             throw e;
         } finally {

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

@@ -7,8 +7,6 @@ import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.entity.ScenePlusExt;
 import com.fdkankan.contro.entity.ScenePro;
 
-import java.util.Date;
-
 /**
  * <p>
  * TODO
@@ -34,4 +32,6 @@ public interface IFdkkLaserService {
 
     void sendRebuildE57ToLaser(ScenePlus scenePlus, ScenePlusExt scenePlusExt);
 
+    void updateStatus(String num, Integer status);
+
 }

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

@@ -1,6 +1,7 @@
 package com.fdkankan.contro.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.contro.service.IBuildService;
 import com.fdkankan.model.enums.ModelTypeEnums;
@@ -95,6 +96,9 @@ public class BuildServiceImpl implements IBuildService {
                     }
             }
         }
+        if(StrUtil.isNotEmpty(resolution) && "6k".equals(resolution)){
+            skyboxType = "SKYBOX_V16";
+        }
         map.put("splitType", splitType);
         map.put("skyboxType", skyboxType);
         return map;

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

@@ -57,11 +57,17 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
 
     @Value("${4dkk.laserService.cloud-point-fyun-path}")
     private String cloudPointFyunPath;
+    @Value("${queue.application.laser.update-laser-scene-status:update-laser-scene-status}")
+    private String updateLaserSceneStatus;
     @Autowired
     private IUserService userService;
 
     @Resource
     private FYunFileServiceInterface fYunFileService;
+    @Autowired
+    private ICameraTypeService cameraTypeService;
+    @Autowired
+    private ICameraDetailService cameraDetailService;
 
     public void syncBuildResult(SyncLaserResultBean laserResultBean) {
         log.info("激光转台相机构建结果 同步 请求 ");
@@ -249,6 +255,20 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         }
     }
 
+    @Override
+    public void updateStatus(String num, Integer status) {
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
+        boolean laser = cameraTypeService.isLaser(cameraDetail.getType());
+        if(!laser){
+            return;
+        }
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("sceneCodes", Arrays.asList(num));
+        jsonObject.put("status", status);
+        rabbitMqProducer.sendByWorkQueue(updateLaserSceneStatus, jsonObject);
+    }
+
     public void sendRebuildE57ToLaser(ScenePlus scenePlus, ScenePlusExt scenePlusExt) {
         User user = userService.getById(scenePlus.getUserId());
         Map<String, Object> params = new HashMap<>();