From bd3f996ee1b8274c0baa099719ea7b2b988dc5f3 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 12 十二月 2024 21:59:02 +0800
Subject: [PATCH] zjh202412012

---
 ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java       |   37 +++++++++++++++++++++----------------
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   11 ++++-------
 ltkj-hosp/src/main/resources/mapper/TestMapper.xml                             |    5 +++++
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java                   |    3 +++
 4 files changed, 33 insertions(+), 23 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 60d1ec7..fc23f29 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
@@ -107,18 +107,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();
         }
     }
@@ -142,11 +147,11 @@
 //        String tjNumber1 = order.getTjNumber();
 //        log.info("鏌ヨ鍑烘潵鐨勪綋妫�鍙锋槸: " + tjNumber1);
 //        log.info("浼犺繃鏉ョ殑鐨勪綋妫�鍙锋槸: "+ s);
-        Map<String,Object> map=new HashMap<>();
-        map.put("tjnum", s);
-        testMapper.tjUpdateDetatilByVi(map);
+//        Map<String,Object> map=new HashMap<>();
+//        map.put("tjnum", s);
+//        testMapper.tjUpdateDetatilByVi(map);
 //        asyncService.tjUpdateDetatilByVi(s);
-        log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!");
+//        log.info("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!");
     }
 
 
@@ -164,9 +169,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("瀹氭椂浠诲姟瀛樺偍杩囩▼宸叉墽琛�!!!");
     }
 }
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 10cb722..5f7eb80 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -130,14 +130,11 @@
 //    @Transactional
     public AjaxResult ceshicc(String s) {
 
-        long start = System.currentTimeMillis();
         Map<String,Object> map=new HashMap<>();
-        map.put("tjnum", s);
-        testMapper.tjUpdateDetatilByVi(map);
-
-        long end = System.currentTimeMillis();
-        log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000);
-        return AjaxResult.success((end - start) / 1000);
+        List<List<?>> tjpled = testMapper.tjplUpdateDetatilByVi(map);
+        log.info(tjpled.toString());
+        Integer object = (Integer) map.get("total");
+        return AjaxResult.success(object);
     }
 
 
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index 4150ea3..d6f599f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -331,4 +331,7 @@
             "FROM\n" +
             "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE a.HIS_ID=#{tjNum}")
     List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(String tjNum);
+
+
+    List<List<?>> tjplUpdateDetatilByVi(Map<String,Object> map);
 }
diff --git a/ltkj-hosp/src/main/resources/mapper/TestMapper.xml b/ltkj-hosp/src/main/resources/mapper/TestMapper.xml
index 7b3acd9..d94f0d2 100644
--- a/ltkj-hosp/src/main/resources/mapper/TestMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TestMapper.xml
@@ -11,5 +11,10 @@
                 #{tjnum,mode=IN,jdbcType=VARCHAR}
               )}
     </select>
+    <select id="tjplUpdateDetatilByVi" parameterType="java.util.Map"  statementType="CALLABLE">
+        {call tj_pl_update_detatil_by_vi(
+                #{total,mode=OUT,jdbcType=INTEGER}
+         )}
+    </select>
 
 </mapper>

--
Gitblit v1.8.0