From c7bcef9d03f58c984d475932710c247ee778d95b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期二, 09 四月 2024 23:31:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   71 ++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index d467c61..8463ff2 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,20 +1,28 @@
 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.enums.TaskStatusType;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.TaskOverToWms;
 import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
-import com.zy.asrs.service.CommandInfoService;
-import com.zy.asrs.service.TaskWrkService;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 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;
 
 /**
  * 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -27,6 +35,17 @@
     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;
@@ -34,38 +53,28 @@
     private String movePath;
 
     @Scheduled(cron = "0/3 * * * * ? ")
-    public void execute() {
+    public void execute() throws IOException {
         for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
-            TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
-            if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {//瀹屾垚
-                taskStatusFeedbackParam.setTaskStatus("done");
-                new PostMesDataUtils().postMesData("瀹屾垚涓婃姤",wmsUrl,movePath,taskWrk);
+            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);
+                }
             } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
-                taskStatusFeedbackParam.setTaskStatus("cancelled");
-                new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk);
+                TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
+                if(!wrkLogService.insert(taskWrkLog)){
+                    throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
+                }
+                if(!taskWrkService.deleteById(taskWrk)){
+                    throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�"+taskWrkLog);
+                }
             }
 
-            if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
-                //浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
-                commandInfoService.saveToHistory(taskWrk.getTaskNo());
-
-                //鍒犻櫎浠诲姟
-                taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
-                //鍒犻櫎鎸囦护
-                commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo()));
-            }
         }
-    }
-
-    //娓呯悊鎵嬪姩鍛戒护
-    @Scheduled(cron = "0/3 * * * * ? ")
-    public void ManualCommandClean() {
-        List<CommandInfo> commandInfos = commandInfoService.selectCompleteManualCommand();
-        for (CommandInfo commandInfo : commandInfos) {
-            //鎸囦护杞棩蹇�
-            commandInfoService.saveToHistory(commandInfo.getId());
-        }
-
     }
 
 }

--
Gitblit v1.9.1