修改计算逻辑

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

@@ -257,14 +257,16 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
         }catch (Exception e){
             String errorMsg = "场景计算结果处理出错！";
+            String hostName = "计算控制服务";
             log.error(errorMsg);
             e.printStackTrace();
             if(!buildSuccess){
                 errorMsg = "场景构建失败！";
+                hostName = message.getHostName();
             }
             //发送钉钉
             String serverPath = message.getPath();
-            buildSceneDTService.handFail(errorMsg, serverPath, sceneCode, message.getHostName(), null);
+            buildSceneDTService.handFail(errorMsg, serverPath, sceneCode, hostName, null);
         }
     }
 

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

@@ -710,13 +710,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         //激光转台 八目相机占用 10 和 11
         log.info("发送mq，camType:{}", jsonObject.getJSONObject("cam").getIntValue("type"));
-        if(jsonObject.getJSONObject("cam").getIntValue("type") == 10){
-//            mqProducer.sendOneWay(topicLaserA, mqMessage);
-            // TODO: 2022/3/19 这里应该是发送激光的 ，目前还不清楚，先统一发送同一个mq
-            rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
-        }else if(scene != null){
-            rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
-        }
+        rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
     }