From 2f6502b1ac9e1a979a8e01c9c9763d9c327e522b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 08:52:34 +0800
Subject: [PATCH] 切换环境至dev并优化单据处理逻辑
---
src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
index 139d6f1..58d15b1 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
@@ -76,19 +76,23 @@
mesPath = orderReportPath;
break;
}
- doHttpRequest(data.getReportJson(), mesTokenInfo, data.getMemo(), url, mesPath, null, "127.0.0.1");
- reportDataService.deleteById(data.getId());
ReportDataLog reportDataLog = new ReportDataLog();
+ String fail = null;
+ if (!doHttpRequest(data.getReportJson(), mesTokenInfo, data.getMemo(), url, mesPath, null, "127.0.0.1")) {
+ fail = "fail";
+ }
+ reportDataService.deleteById(data.getId());
BeanUtil.copyProperties(data, reportDataLog);
reportDataLog.setReportTime(new Date());
reportDataLog.setReportDataId(data.getId());
+ reportDataLog.setThreeCode(fail);
reportDataLogService.insert(reportDataLog);
}
return SUCCESS;
}
- private JSONObject doHttpRequest(String requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
+ private Boolean doHttpRequest(String requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
String response = "";
boolean success = false;
@@ -102,14 +106,14 @@
throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject);
}
success = true;
- return jsonObject;
+ return true;
} catch (Exception e) {
log.error(e.getMessage());
- throw new CoolException(e.getMessage());
+ //throw new CoolException(e.getMessage());
} finally {
apiLogService.save(namespace, url + path, appkey, ip, requestParam, response, success);
}
-
+ return false;
}
}
--
Gitblit v1.9.1