From bfc2fee36897a0e6ca4d77701cf4d8f6a7281aec Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 04 九月 2024 08:07:30 +0800
Subject: [PATCH] 对程序进行优化
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 8463ff2..3e48136 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -51,10 +51,18 @@
private String wmsUrl;
@Value("${wms.movePath}")
private String movePath;
+ @Value("${wms.inboundTaskApplyPath}")
+ private String inboundTaskApplyPath;
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
+ @Value("${wms.taskStatusFeedbackPath}")
+ private String taskStatusFeedbackPath;
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() throws IOException {
+
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
+ HashMap<String, Object> headParam = new HashMap<>();
if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus()==7) {//瀹屾垚
//鍖哄垎鍏ュ嚭搴�
TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
@@ -64,6 +72,7 @@
if (!taskWrkService.deleteById(taskWrk)) {
throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
}
+ headParam.put("Result", 1);
} else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
if(!wrkLogService.insert(taskWrkLog)){
@@ -72,6 +81,34 @@
if(!taskWrkService.deleteById(taskWrk)){
throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�"+taskWrkLog);
}
+ headParam.put("Result", 2);
+ }
+ String response = "";
+ try {
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(TaskExecCallback)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Boolean bool = false;
+ if(jsonObject.get("ReturnStatus").equals(0)){
+ bool = true;
+ }
+ apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
+ } catch (Exception e) {
+ log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
}
}
--
Gitblit v1.9.1