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 | 130 +++++++++++++++++++++++++++++++------------
1 files changed, 93 insertions(+), 37 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 326d4c9..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
@@ -1,19 +1,25 @@
package com.doumee.task;
+import com.doumee.config.DataSyncConfig;
+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.HkSyncOrgUserServiceImpl;
-import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl;
+import com.doumee.service.business.impl.hksync.*;
+import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+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;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
+
/**
- * 瀹氭椂浠诲姟
+ * 瀹氭椂浠诲姟锛堝簾寮冿級
* @author jiangping
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
@@ -23,94 +29,144 @@
public class ScheduleTool {
@Autowired
+ private HkSyncParkServiceImpl hkSyncParkService;
+ @Autowired
private HkSyncImgServiceImpl hkSyncImgService;
@Autowired
private HkSyncEmpowerServiceImpl hkSyncEmpowerService;
@Autowired
- private HkSyncOrgUserServiceImpl hkSyncOrgUserService;
+ private HkSyncOrgUserToHKServiceImpl hkSyncOrgUserService;
+ @Autowired
+ private HkSyncVisitFromHKServiceImpl hkSyncVisitFromHKService;
+ @Autowired
+ private HkSyncVehicleFromHKServiceImpl hkSyncVehicleFromHKService;
@Autowired
private HkSyncVisitServiceImpl hkSyncVisitService;
@Autowired
private MemberService memberService;
+ @Autowired
+ private InterfaceLogService interfaceLogService;
/**
* 鏄惁寮�鍙戣��
*/
- @Value("${timing}")
- private Boolean timing;
-
+ @Autowired
+ private DataSyncConfig dataSyncConfig;
/**
- * 缂撳瓨鐪佸競鍖�
+ * 姣忓垎閽熸媺鍙栦竴娆′粖鏃ョ殑璁垮棰勭害鏁版嵁
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(cron= "0 0 23 * * ?")
+ public void syncVehicleUpdateData() throws Exception {
+ hkSyncVehicleFromHKService.syncVehicleUpdateData(new Date(System.currentTimeMillis()-24*60*60*1000));
+ }
+ /**
+ * 姣忓垎閽熸媺鍙栦竴娆′粖鏃ョ殑璁垮棰勭害鏁版嵁
+ * @throws Exception
+ */
+ @Scheduled(fixedRate= 3*60*1000)
+ public void syncVistAppointData() throws Exception {
+ if(Constants.DEALING_FROM_HK_VISIT){
+ return ;
+ }
+ try {
+ Constants.DEALING_FROM_HK_VISIT =true;
+ hkSyncVisitFromHKService.syncVistAppointData(new Date());
+ Constants.DEALING_FROM_HK_VISIT =false;
+ }catch (Exception e){
+// 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(fixedRate= 60*1000)
public void downloadHkImg() throws Exception {
- hkSyncImgService.downHKImgs(0);
+ if(dataSyncConfig.getNeedDealImg()!=null && dataSyncConfig.getNeedDealImg()){
+ hkSyncImgService.downHKImgs(0);
+ }
}
/**
* 瀹氭椂鍚屾缁勭粐淇℃伅鍒版捣搴风郴缁�
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void syncOrgData() {
- hkSyncOrgUserService.syncOrgData();
+ if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
+ //濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
+ hkSyncOrgUserService.syncOrgData();
+ }
}
/**
* 瀹氭椂鍚屾鐢ㄦ埛淇℃伅鍒版捣搴风郴缁�
* @throws Exception
*/
- @Scheduled(fixedDelay= 60*1000)
+ @Scheduled(fixedRate= 60*1000)
public void syncUserData() {
- hkSyncOrgUserService.syncUserData();
+ if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp) {
+ //濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂
+ hkSyncOrgUserService.syncUserData();
+ }
}
/**
* 瀹氭椂鍚屾鐢宠閫氳繃鐨勮瀹㈡暟鎹埌娴峰悍绯荤粺
* @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() {
- hkSyncImgService.syncParkBookData();
- }
+ }*/
/**
* 瀹氭椂鍐荤粨鍐呴儴浜哄憳
*/
- @Scheduled(fixedDelay= 60*1000)
+// @Scheduled(fixedRate= 60*1000)
public void memberFreeze() {
memberService.memberFreeze();
}
-
+ /**
+ * 姣忓ぉ娓呯悊瓒呰繃涓�鍛ㄧ殑鎺ュ彛鏃ュ織鏁版嵁锛堟竻闄ゅ拰瀹夐槻骞冲彴瀵规帴鐨勬帴鍙ｆ暟鎹級
+ * @throws Exception
+ */
+ @Scheduled(cron= "0 0 23 * * ?")
+ public void clearThreeMonthLog() throws Exception {
+ interfaceLogService.clearThreeMonthLog();
+ }
}
--
Gitblit v1.9.3