From 70133cc2bbcf58ef760ee0c84f031dc66b7fb1c2 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 17 十二月 2024 21:36:21 +0800
Subject: [PATCH] 20241217

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index 6a6e5cc..11b12db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -12,6 +12,7 @@
 import com.ltkj.system.service.ISysConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -34,6 +35,7 @@
  */
 @Slf4j
 @Component
+@Profile("!dev")
 public class DefaultScheduled {
 
 
@@ -51,6 +53,9 @@
     private LtkjHysqdService ltkjHysqdService;
     @Resource
     private TestMapper testMapper;
+    @Resource
+    private TjAsyncService asyncService;
+
 
     private final ReentrantLock reentrantLock = new ReentrantLock();
 
@@ -104,18 +109,23 @@
                         extractedjiancha(s,order);
                     }
                 }
-
-                long end = System.currentTimeMillis();
-                log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000);
-                // 鍔ㄦ�佽幏鍙栦笅娆′换鍔$殑闂撮殧
-                int minute = Integer.parseInt(dsrwsjjg);
-                if (minute < 5) minute = 5;
-                if (minute > 59) minute = 59;
-                scheduleNextTask(minute);
+                Map<String,Object> map=new HashMap<>();
+                testMapper.tjplUpdateDetatilByVi(map);
+                Integer object = (Integer) map.get("total");
+                if(null !=object && object.equals(1)){
+                    long end = System.currentTimeMillis();
+                    log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000);
+                    // 鍔ㄦ�佽幏鍙栦笅娆′换鍔$殑闂撮殧
+                    int minute = Integer.parseInt(dsrwsjjg);
+                    if (minute < 5) minute = 5;
+                    if (minute > 59) minute = 59;
+                    scheduleNextTask(minute);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
+            scheduleNextTask(Long.parseLong(dsrwsjjg));
             reentrantLock.unlock();
         }
     }
@@ -139,10 +149,11 @@
 //        String tjNumber1 = order.getTjNumber();
 //        log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1);
 //        log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+ s);
-        Map<String,Object> map=new HashMap<>();
-        map.put("tjnum", s);
-        testMapper.tjUpdateDetatilByVi(map);
-        log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!");
+//        Map<String,Object> map=new HashMap<>();
+//        map.put("tjnum", s);
+//        testMapper.tjUpdateDetatilByVi(map);
+//        asyncService.tjUpdateDetatilByVi(s);
+//        log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!");
     }
 
 
@@ -160,9 +171,9 @@
 //        String tjNumber1 = order.getTjNumber();
 //        log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1);
 //        log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+ s);
-        Map<String,Object> map=new HashMap<>();
-        map.put("tjnum", s);
-        testMapper.tjUpdateDetatilByVi(map);
-        log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!");
+//        Map<String,Object> map=new HashMap<>();
+//        map.put("tjnum", s);
+//        testMapper.tjUpdateDetatilByVi(map);
+//        log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!");
     }
 }

--
Gitblit v1.8.0