From 0bdf2da5b1407d7d0dbb90ba11a6ba0f18856ac0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 09 五月 2025 16:55:17 +0800
Subject: [PATCH] 单机调试完成

---
 src/main/java/com/zy/asrs/task/TaskReportScheduler.java |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
index 4e81506..4be7aab 100644
--- a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.TaskWrkReport;
@@ -17,6 +18,7 @@
 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;
@@ -46,15 +48,15 @@
     private String TaskExecCallback;
 
 
-    //@Scheduled(cron = "0/3 * * * * ? ")
-    public void execute() throws IOException {
+    @Scheduled(cron = "0/5 * * * * ? ")
+    public synchronized void execute() throws IOException {
         Page<TaskWrkReport> taskWrkReportPage = taskWrkReportService.selectPage(new Page<>(0, 100), new EntityWrapper<TaskWrkReport>().orderBy("create_time", true));
         if (taskWrkReportPage.getRecords() != null) {
             //鏂板涓�涓繃婊ゆ満鍒�
             for (TaskWrkReport taskWrk : taskWrkReportPage.getRecords()) {
                 WmsFeedback wmsFeedback = getWmsFeedback(taskWrk);
                 String response = "";
-                Boolean bool = false;
+                boolean bool = false;
                 try {
                     log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
                     response = new HttpHandler.Builder()
@@ -64,17 +66,22 @@
                             .setJson(JSON.toJSONString(wmsFeedback))
                             .build()
                             .doPost();
-                    JSONObject jsonObject = JSON.parseObject(response);
-                    TaskWrkReportLog taskWrkLog = new TaskWrkReportLog();
-                    Synchro.Copy(taskWrk, taskWrkLog);
-                    taskWrkLog.setId(null);
-                    if (!taskWrkReportLogService.insert(taskWrkLog)) {
-                        throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+                    if (!Cools.isEmpty(response)) {
+                        JSONObject jsonObject = JSON.parseObject(response);
+                        if (Integer.parseInt(String.valueOf(jsonObject.get("code"))) == 200) {
+                            TaskWrkReportLog taskWrkLog = new TaskWrkReportLog();
+                            Synchro.Copy(taskWrk, taskWrkLog);
+                            taskWrkLog.setId(null);
+                            if (!taskWrkReportLogService.insert(taskWrkLog)) {
+                                throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+                            }
+                            if (!taskWrkReportService.deleteById(taskWrk)) {
+                                throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
+                            }
+                            bool = true;
+                        }
                     }
-                    if (!taskWrkReportService.deleteById(taskWrk)) {
-                        throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
-                    }
-                    bool = true;
+
                 } catch (Exception e) {
                     log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
                 } finally {

--
Gitblit v1.9.1