Merge branch 'release-知象光电' into test

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

@@ -90,7 +90,10 @@ public class BuildZXGDSceneServiceImpl implements IBuildSceneService {
         }catch (Exception e){
             log.error("知象光电计算前置处理出错,num"+num, e);
             this.updateStatus(fileId, unicode, CommonSuccessStatus.FAIL.code());
-            buildSceneDTService.handBaseFail("知象光电计算资源准备异常！", message.getPath(), num, "计算控制服务器");
+            SceneZxgd sceneZxgd = sceneZxgdService.getOne(new LambdaQueryWrapper<SceneZxgd>()
+                    .eq(SceneZxgd::getFileId, fileId)
+                    .eq(SceneZxgd::getUnicode, unicode));
+            buildSceneDTService.handBaseFail("知象光电计算资源准备异常！", message.getPath(), sceneZxgd.getTitle(), "计算控制服务器");
             throw e;
         }
     }
@@ -128,7 +131,10 @@ public class BuildZXGDSceneServiceImpl implements IBuildSceneService {
                 // 发送钉钉消息，计算失败
                 String logUrl = String.format(logUrlFormat,fYunFileConfig.getHost(),unicode,fYunFileConfig.getHost(),unicode);
                 this.updateStatus(fileId, unicode, CommonSuccessStatus.FAIL.code());
-                buildSceneDTService.handModelFail("计算知象光电", message.getPath(), unicode, message.getHostName(), logUrl);
+                SceneZxgd sceneZxgd = sceneZxgdService.getOne(new LambdaQueryWrapper<SceneZxgd>()
+                        .eq(SceneZxgd::getFileId, fileId)
+                        .eq(SceneZxgd::getUnicode, unicode));
+                buildSceneDTService.handModelFail("知象光电计算算法失败", message.getPath(), sceneZxgd.getTitle(), message.getHostName(), logUrl);
                 return;
             }
 
@@ -145,7 +151,10 @@ public class BuildZXGDSceneServiceImpl implements IBuildSceneService {
         }catch (Exception e){
             log.error("知象光电计算结果处理出错,unicode"+unicode, e);
             this.updateStatus(fileId, unicode, CommonSuccessStatus.FAIL.code());
-            buildSceneDTService.handBaseFail("知象光电计算结果处理出错！", message.getPath(), unicode, "计算控制服务器");
+            SceneZxgd sceneZxgd = sceneZxgdService.getOne(new LambdaQueryWrapper<SceneZxgd>()
+                    .eq(SceneZxgd::getFileId, fileId)
+                    .eq(SceneZxgd::getUnicode, unicode));
+            buildSceneDTService.handBaseFail("知象光电计算结果处理出错！", message.getPath(), sceneZxgd.getTitle(), "计算控制服务器");
             throw e;
         }
     }