From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001 From: ynhfasrs <ynhfasrs@qq.com> Date: 星期五, 27 六月 2025 14:23:37 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java index 0cbe8a0..0480b0f 100644 --- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java +++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Component; import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -47,12 +48,16 @@ @Scheduled(cron = "0/3 * * * * ? ") public void execute() throws IOException { for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm"); HashMap<String, Object> headParam = new HashMap<>(); - headParam.put("TaskNo", taskWrk.getTaskNo()); + headParam.put("taskNo", taskWrk.getTaskNo()); + headParam.put("barcode", taskWrk.getBarcode()); + headParam.put("reportTime", format.format(new Date())); NotifyMsgType notifyMsgType = null; if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus().equals(TaskStatusType.MANUAL_OVER.id)) {//瀹屾垚 - headParam.put("Result", 1);//瀹屾垚 + headParam.put("status", TaskStatusType.OVER.id); + headParam.put("ioType", taskWrk.getIoType()); notifyMsgType = NotifyMsgType.TASK_COMPLETE; if (taskWrk.getIoType() == 1) {//鍏ュ簱浠诲姟瀹屾垚搴撲綅涓篎 @@ -114,7 +119,8 @@ } } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) { - headParam.put("Result", 2);//鍙栨秷 + headParam.put("status", TaskStatusType.CANCEL.id); + headParam.put("ioType", taskWrk.getIoType()); notifyMsgType = NotifyMsgType.TASK_CANCEL; if (taskWrk.getIoType() == 1) {//鍏ュ簱浠诲姟 -- Gitblit v1.9.1