From b0ea50dd24a7ed5ada38dc6c8209f78fc09f0441 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 六月 2024 17:45:33 +0800
Subject: [PATCH] 修复bug

---
 server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java |   69 +++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index f0fb7eb..5cc9bcd 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -5,12 +5,10 @@
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.utils.Constants;
+import com.doumee.service.business.InterfaceLogService;
 import com.doumee.service.business.MemberService;
-import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
-import com.doumee.service.business.impl.hksync.HkSyncImgServiceImpl;
-import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
+import com.doumee.service.business.impl.hksync.*;
 import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
-import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl;
 import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
 import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +19,7 @@
 import java.util.Date;
 
 /**
- * 瀹氭椂浠诲姟
+ * 瀹氭椂浠诲姟锛堝簾寮冿級
  * @author jiangping
  * @date 2021-10-10 14:40:35
  * https://www.bejson.com/othertools/cron/  cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
@@ -46,6 +44,8 @@
     private HkSyncVisitServiceImpl hkSyncVisitService;
     @Autowired
     private MemberService memberService;
+    @Autowired
+    private InterfaceLogService interfaceLogService;
     /**
      * 鏄惁寮�鍙戣��
      */
@@ -64,7 +64,7 @@
      * 姣忓垎閽熸媺鍙栦竴娆′粖鏃ョ殑璁垮棰勭害鏁版嵁
      * @throws Exception
      */
-    @Scheduled(fixedDelay= 60*1000)
+    @Scheduled(fixedRate= 3*60*1000)
     public void syncVistAppointData() throws Exception {
         if(Constants.DEALING_FROM_HK_VISIT){
             return ;
@@ -74,16 +74,24 @@
             hkSyncVisitFromHKService.syncVistAppointData(new Date());
             Constants.DEALING_FROM_HK_VISIT =false;
         }catch (Exception e){
-            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+//            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
         }finally {
             Constants.DEALING_FROM_HK_VISIT =false;
         }
     }
     /**
+     * 姣�10鍒嗛挓鎷夊彇涓�娆℃渶鏂拌瀹㈢櫥璁扮姸鎬侊紙棰勭害鎴愬姛鍜屽凡鐧昏锛�
+     * @throws Exception
+     */
+    @Scheduled(fixedRate= 10*60*1000)
+    public void syncVisitOuttimeStatus() throws Exception {
+        hkSyncVisitService.getOutTimeVisitRecord();
+    }
+    /**
      * 涓嬭浇娴峰悍绯荤粺鍥剧墖鏁版嵁
      * @throws Exception
      */
-    @Scheduled(fixedDelay= 60*1000)
+    @Scheduled(fixedRate= 60*1000)
     public void downloadHkImg() throws Exception {
         if(dataSyncConfig.getNeedDealImg()!=null && dataSyncConfig.getNeedDealImg()){
             hkSyncImgService.downHKImgs(0);
@@ -93,7 +101,7 @@
      * 瀹氭椂鍚屾缁勭粐淇℃伅鍒版捣搴风郴缁�
      * @throws Exception
      */
-    @Scheduled(fixedDelay= 60*1000)
+    @Scheduled(fixedRate= 60*1000)
     public void syncOrgData() {
         if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
             //濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
@@ -104,7 +112,7 @@
      * 瀹氭椂鍚屾鐢ㄦ埛淇℃伅鍒版捣搴风郴缁�
      * @throws Exception
      */
-    @Scheduled(fixedDelay= 60*1000)
+    @Scheduled(fixedRate= 60*1000)
     public void syncUserData()  {
         if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp) {
             //濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
@@ -115,51 +123,50 @@
      * 瀹氭椂鍚屾鐢宠閫氳繃鐨勮瀹㈡暟鎹埌娴峰悍绯荤粺
      * @throws Exception
      */
-    @Scheduled(fixedDelay= 60*1000)
+    @Scheduled(fixedRate= 60*1000)
     public void syncVisitData()  {
         hkSyncVisitService.syncVisitData();
     }
-    /**
+ /*   *//**
      * 瀹氭椂鍚屾鍐呴儴浜哄憳鎺堟潈鍒版捣搴风郴缁�
      * @throws Exception
-     */
-    @Scheduled(fixedDelay= 60*1000)
+     *//*
+    @Scheduled(fixedRate= 3*1000)
     public void syncEmpowerData()  {
-
         hkSyncEmpowerService.syncEmpowerData();
     }
-    /**
+    *//**
      * 瀹氭椂鏌ヨ浜哄憳涓嬪彂娴峰悍缁撴灉锛堜换鍔℃槸鍚﹀凡涓嬭浇缁撴潫锛�
      * @throws Exception
-     */
-    @Scheduled(fixedDelay= 60*1000)
+     *//*
+    @Scheduled(fixedRate= 60*1000)
     public void syncEmpowerResultData()  {
         hkSyncEmpowerService.syncEmpowerResultData();
     }
+    */
     /**
      * 瀹氭椂鏌ヨ浜哄憳瀹為檯涓嬪彂鏉冮檺缁撴灉锛屾槸鍚﹀凡缁忎笅杞芥垚鍔�
      * @throws Exception
-     */
-    @Scheduled(fixedDelay= 60*1000)
+     *//*
+    @Scheduled(fixedRate= 60*1000)
     public void syncEmpowerDetailData()  {
         hkSyncEmpowerService.syncEmpowerDetailData();
-    }
-    /**
-     * 瀹氭椂鍚屾杞﹁締鍖呮湡鍒版捣搴风郴缁�
-     * @throws Exception
-     */
-    @Scheduled(fixedDelay= 60*1000)
-    public void syncParkBookData()  {
-        hkSyncParkService.syncParkBookData();
-    }
+    }*/
 
 
     /**
      * 瀹氭椂鍐荤粨鍐呴儴浜哄憳
      */
-    @Scheduled(fixedDelay= 60*1000)
+//    @Scheduled(fixedRate= 60*1000)
     public void memberFreeze()  {
         memberService.memberFreeze();
     }
-
+    /**
+     * 姣忓ぉ娓呯悊瓒呰繃涓�鍛ㄧ殑鎺ュ彛鏃ュ織鏁版嵁锛堟竻闄ゅ拰瀹夐槻骞冲彴瀵规帴鐨勬帴鍙f暟鎹級
+     * @throws Exception
+     */
+    @Scheduled(cron= "0 0 23 * * ?")
+    public void clearThreeMonthLog() throws Exception {
+        interfaceLogService.clearThreeMonthLog();
+    }
 }

--
Gitblit v1.9.3