From 12d4bcc3e31ee19ba0aea18fcd874a291072ddf0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:06 +0800
Subject: [PATCH] 优化AGV告警字段及添加备注信息
---
src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 58d15b1..0dd0a41 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
@@ -57,6 +57,9 @@
@Value("${mes.pakoutReportPath}")
private String pakoutReportPath;
+ @Value("${mes.stock}")
+ private String stock;
+
@Transactional
public ReturnT<String> start(ReportData data, Map<String, Object> mesTokenInfo) {
@@ -77,23 +80,20 @@
break;
}
ReportDataLog reportDataLog = new ReportDataLog();
- String fail = null;
- if (!doHttpRequest(data.getReportJson(), mesTokenInfo, data.getMemo(), url, mesPath, null, "127.0.0.1")) {
- fail = "fail";
- }
+ String result = doHttpRequest(data.getReportJson(), mesTokenInfo, data.getMemo(), url, mesPath, null, "127.0.0.1");
reportDataService.deleteById(data.getId());
BeanUtil.copyProperties(data, reportDataLog);
reportDataLog.setReportTime(new Date());
reportDataLog.setReportDataId(data.getId());
- reportDataLog.setThreeCode(fail);
+ reportDataLog.setThreeCode(result);
reportDataLogService.insert(reportDataLog);
}
return SUCCESS;
}
- private Boolean doHttpRequest(String requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
- String response = "";
+ private String doHttpRequest(String requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
+ String response = "fail";
boolean success = false;
try {
@@ -106,14 +106,22 @@
throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject);
}
success = true;
- return true;
+ return null;
} catch (Exception e) {
- log.error(e.getMessage());
+ log.error("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細{}", e.getMessage());
//throw new CoolException(e.getMessage());
} finally {
apiLogService.save(namespace, url + path, appkey, ip, requestParam, response, success);
}
- return false;
+ return response;
+ }
+
+
+ @Transactional
+ public ReturnT<String> stock(Map<String, Object> mesTokenInfo) {
+ String result = doHttpRequest("{}", mesTokenInfo, "鍚屾MES搴撳瓨", url, stock, null, "127.0.0.1");
+
+ return SUCCESS;
}
}
--
Gitblit v1.9.1