From 2f8b8fd30d982aa524f21a2d0d3cfbfc19eddbf9 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sat, 6 Dec 2025 09:51:35 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=2017track=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=97=A5=E5=BF=97=EF=BC=8C=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E6=89=AB=E6=8F=8F=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/web/emis/EmisCommonController.java    | 57 ++++++++++---------
 .../xdadan/erp/emis/utils/Q17trackHelper.java |  3 +
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 3931021f1..845c6428a 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -951,34 +951,35 @@ public class EmisCommonController extends EmisBaseController
      */
     @GetMapping("/autoScanSiteBatch")
     public AjaxResult autoScanSiteBatch(String lineCode) {
-        String statusKey = "autoScanSiteBatch_status";
-        log.info("autoScanSiteBatch start");
-
-        // 检查任务是否正在执行
-        String currentStatus = redissonService.getStr(statusKey);
-        if ("RUNNING".equals(currentStatus)) {
-            log.warn("autoScanSiteBatch is already running, request rejected");
-            return AjaxResult.error("任务正在执行中，请稍后再试");
-        }
-
-        try {
-            // 设置任务状态为运行中，设置较长的过期时间（30分钟）
-            // 这样即使异步任务没有正确清除状态，也会在30分钟后自动过期
-            redissonService.setStr(statusKey, "RUNNING", 1800);
-
-            // 异步执行任务
-            emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode);
-            log.info("autoScanSiteBatch async task started");
-
-            return AjaxResult.success("异步任务已启动，请稍后查看执行结果");
-
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            log.error("autoScanSiteBatch exception:" + ex.getMessage());
-            // 如果启动失败，清除状态
-            redissonService.setStr(statusKey, "", 0);
-            return AjaxResult.error("任务启动失败：" + ex.getMessage());
-        }
+        return AjaxResult.success("定时任务已关闭");
+//        String statusKey = "autoScanSiteBatch_status";
+//        log.info("autoScanSiteBatch start");
+//
+//        // 检查任务是否正在执行
+//        String currentStatus = redissonService.getStr(statusKey);
+//        if ("RUNNING".equals(currentStatus)) {
+//            log.warn("autoScanSiteBatch is already running, request rejected");
+//            return AjaxResult.error("任务正在执行中，请稍后再试");
+//        }
+//
+//        try {
+//            // 设置任务状态为运行中，设置较长的过期时间（30分钟）
+//            // 这样即使异步任务没有正确清除状态，也会在30分钟后自动过期
+//            redissonService.setStr(statusKey, "RUNNING", 1800);
+//
+//            // 异步执行任务
+//            emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode);
+//            log.info("autoScanSiteBatch async task started");
+//
+//            return AjaxResult.success("异步任务已启动，请稍后查看执行结果");
+//
+//        } catch (Exception ex) {
+//            ex.printStackTrace();
+//            log.error("autoScanSiteBatch exception:" + ex.getMessage());
+//            // 如果启动失败，清除状态
+//            redissonService.setStr(statusKey, "", 0);
+//            return AjaxResult.error("任务启动失败：" + ex.getMessage());
+//        }
     }
 
     /**
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Q17trackHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Q17trackHelper.java
index 091d2ff4a..b9aaee2ab 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Q17trackHelper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Q17trackHelper.java
@@ -183,6 +183,9 @@ public class Q17trackHelper {
             }
 
         } catch (Exception e) {
+            log.error("17track查询异常, transferBillCode: {}, comId: {}, phone: {}, rstStr: {}", 
+                    emisTmsTransferTrace != null ? emisTmsTransferTrace.getTransferBillCode() : null, 
+                    comId, phone, rstStr, e);
             e.printStackTrace();
         }