From e377f0ffba61c38f4f171d99e9ab6c3591f1d1b7 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 13:50:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   69 ++++++++++++++++------------------
 1 files changed, 33 insertions(+), 36 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..dc30951 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,17 +1,14 @@
 package com.zy.asrs.task;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.exception.CoolException;
+import com.zy.asrs.domain.dto.NotifyCustomDataDto;
+import com.zy.asrs.domain.enums.NotifyMsgType;
 import com.zy.asrs.domain.enums.TaskStatusType;
 import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
 import com.zy.asrs.service.*;
 import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
-import com.zy.asrs.utils.PostMesDataUtils;
-import com.zy.common.utils.HttpHandler;
+import com.zy.asrs.utils.NotifyUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,10 +16,7 @@
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -34,46 +28,49 @@
     @Autowired
     private TaskWrkService taskWrkService;
     @Autowired
-    private CommandInfoService commandInfoService;
-    @Autowired
-    private ApiLogService apiLogService;
-    @Autowired
-    private BasDevpService basDevpService;
-
-    @Autowired
-    private StaDescService staDescService;
-    @Autowired
-    private LocMastService locMastService;
-    @Autowired
     private TaskWrkLogServiceImpl wrkLogService;
 
     @Value("${wms.url}")
     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;
+    @Autowired
+    private NotifyUtils notifyUtils;
 
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute() throws IOException {
         for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
-            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus()==7) {//瀹屾垚
-                //鍖哄垎鍏ュ嚭搴�
-                TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
-                if (!wrkLogService.insert(taskWrkLog)) {
-                    throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
-                }
-                if (!taskWrkService.deleteById(taskWrk)) {
-                    throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
-                }
+            HashMap<String, Object> headParam = new HashMap<>();
+            headParam.put("TaskNo", taskWrk.getTaskNo());
+
+            NotifyMsgType notifyMsgType = null;
+            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚
+                headParam.put("Result", 1);//瀹屾垚
+                notifyMsgType = NotifyMsgType.TASK_COMPLETE;
             } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
-                TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
-                if(!wrkLogService.insert(taskWrkLog)){
-                    throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
-                }
-                if(!taskWrkService.deleteById(taskWrk)){
-                    throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�"+taskWrkLog);
-                }
+                headParam.put("Result", 2);//鍙栨秷
+                notifyMsgType = NotifyMsgType.TASK_CANCEL;
             }
 
+            NotifyCustomDataDto customDataDto = new NotifyCustomDataDto();
+            customDataDto.setUri(wmsUrl);
+            customDataDto.setPath(TaskExecCallback);
+            customDataDto.setData(JSON.toJSONString(headParam));
+            notifyUtils.notify("task", 1, String.valueOf(taskWrk.getWrkNo()), taskWrk.getTaskNo(), notifyMsgType, JSON.toJSONString(taskWrk), true, customDataDto);
+
+            TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+            if (!wrkLogService.insert(taskWrkLog)) {
+                throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+            }
+            if (!taskWrkService.deleteById(taskWrk)) {
+                throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+            }
         }
     }
 

--
Gitblit v1.9.1