|
|
@@ -61,8 +61,8 @@ public class BuildE57Listener{
|
|
|
String msg = new String(message.getBody(), StandardCharsets.UTF_8);
|
|
|
HashMap<String, Object> map = JSON.parseObject(msg, HashMap.class);
|
|
|
String num = (String) map.get("num");
|
|
|
- map.put("bizType", "e57");
|
|
|
-
|
|
|
+ String bizType = "e57_" + map.get("splitType");
|
|
|
+ map.put("bizType", bizType);
|
|
|
log.info("开始准备e57计算资源,队列名:{},id:{},消息体:{}", queueModelingPre, messageId, msg);
|
|
|
BuildSceneCallMessage buildSceneMessage = new BuildSceneCallMessage();
|
|
|
buildSceneMessage.setSceneNum(num);
|
|
|
@@ -76,14 +76,14 @@ public class BuildE57Listener{
|
|
|
buildSceneMessage.getBuildContext().put("sceneNum",buildSceneMessage.getSceneNum());
|
|
|
}
|
|
|
//记录日志
|
|
|
- sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, "e57");
|
|
|
- sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.WAITING.code(), null, "e57");
|
|
|
+ sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, bizType);
|
|
|
+ sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.WAITING.code(), null, bizType);
|
|
|
buildSceneService.buildScenePre(buildSceneMessage);
|
|
|
commonService.saveMqSendLog(num, buildSceneMessage, 0);
|
|
|
- sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.SUCCESS.code(), null,"e57");
|
|
|
+ sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.SUCCESS.code(), null,bizType);
|
|
|
}catch (Exception e){
|
|
|
log.error("e57计算前置处理出错,num=" + num, e);
|
|
|
- sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.FAILD.code(), ExceptionUtil.stacktraceToString(e, 3000), "e57");
|
|
|
+ sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.FAILD.code(), ExceptionUtil.stacktraceToString(e, 3000), bizType);
|
|
|
}
|
|
|
log.info("准备e57计算资源完成,队列名:{},id:{},消息体:{}", queueModelingPre, messageId, msg);
|
|
|
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|
|
|
@@ -105,14 +105,15 @@ public class BuildE57Listener{
|
|
|
log.info("场景计算完成,开始处理e57计算结果,队列名:{},id:{},消息体:{}", queueModelingPost, messageId, msg);
|
|
|
BuildSceneResultMqMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneResultMqMessage.class);
|
|
|
String num = buildSceneMessage.getBuildContext().get("sceneNum").toString();
|
|
|
+ String bizType = "e57_" + buildSceneMessage.getExt().get("splitType");
|
|
|
try {
|
|
|
- sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.POST.code(), queueModelingPost, "e57");
|
|
|
- sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.POST.code(), queueModelingPost, CommonOperStatus.WAITING.code(), null, "e57");
|
|
|
+ sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.POST.code(), queueModelingPost, bizType);
|
|
|
+ sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.POST.code(), queueModelingPost, CommonOperStatus.WAITING.code(), null, bizType);
|
|
|
buildSceneService.buildScenePost(buildSceneMessage);
|
|
|
- sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.POST.code(), queueModelingPost, CommonOperStatus.SUCCESS.code(), null, "e57");
|
|
|
+ sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.POST.code(), queueModelingPost, CommonOperStatus.SUCCESS.code(), null, bizType);
|
|
|
}catch (Exception e){
|
|
|
log.error("场景计算结果处理出错,num=" + num, e);
|
|
|
- sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.POST.code(), queueModelingPost, CommonOperStatus.FAILD.code(), ExceptionUtil.stacktraceToString(e, 3000), "e57");
|
|
|
+ sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.POST.code(), queueModelingPost, CommonOperStatus.FAILD.code(), ExceptionUtil.stacktraceToString(e, 3000), bizType);
|
|
|
}
|
|
|
log.info("场景计算结果处理完成,队列名:{},id:{},消息体:{}", queueModelingPost, messageId, msg);
|
|
|
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|