From f76c68a87261cf2396a64c7125324c24483d4623 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 09 六月 2026 09:46:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java
index d3f8a87..ea964fd 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java
@@ -1,29 +1,31 @@
package com.doumee.api;
-import com.doumee.api.BaseController;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.utils.Constants;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.VisitsService;
-import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncVisitServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncVisitFromHKServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
*/
@Api(tags = "璁垮瀹氭椂鍣ㄦ帴鍙�")
+@Slf4j
@RestController
@RequestMapping("/timer/visit")
public class HkVisitTimerController extends BaseController {
+
+ private final AtomicBoolean dealingFromHkVisit = new AtomicBoolean(false);
@Autowired
private HkSyncVisitServiceImpl hkSyncVisitService;
@@ -33,39 +35,48 @@
private VisitsService visitsService;
@ApiOperation("寮�鍚畾鏃朵笅鍙戣瀹㈤绾︾敵璇�")
- @GetMapping("/syncVisitData")
+ @PostMapping("/syncVisitData")
public ApiResponse syncVisitData() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細syncVisitData-涓嬪彂璁垮棰勭害鐢宠");
hkSyncVisitService.syncVisitData();
return ApiResponse.success("寮�鍚畾鏃朵笅鍙戣瀹㈤绾︾敵璇锋垚鍔�");
}
@ApiOperation("寮�鍚畾鏃舵煡璇㈣瀹㈤绾︾姸鎬�")
- @GetMapping("/getOutTimeVisitRecord")
+ @PostMapping("/getOutTimeVisitRecord")
public ApiResponse getOutTimeVisitRecord() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細getOutTimeVisitRecord-鏌ヨ璁垮棰勭害鐘舵��");
hkSyncVisitService.getOutTimeVisitRecordIccm();
return ApiResponse.success("寮�鍚畾鏃舵煡璇㈣瀹㈤绾︾姸鎬佹垚鍔�");
}
@ApiOperation("寮�鍚畾鏃朵粖鏃ョ殑璁垮棰勭害鏁版嵁")
- @GetMapping("/syncVistAppointData")
+ @PostMapping("/syncVistAppointData")
public ApiResponse syncVistAppointData() {
- if(!Constants.DEALING_FROM_HK_VISIT){
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細syncVistAppointData-浠婃棩璁垮棰勭害鏁版嵁");
+ if(dealingFromHkVisit.compareAndSet(false, true)){
try {
- Constants.DEALING_FROM_HK_VISIT =true;
hkSyncVisitFromHKService.syncVistAppointData(new Date());
- Constants.DEALING_FROM_HK_VISIT =false;
}catch (Exception e){
-
+ log.error("syncVistAppointData寮傚父", e);
}finally {
- Constants.DEALING_FROM_HK_VISIT =false;
+ dealingFromHkVisit.set(false);
}
}
return ApiResponse.success("寮�鍚畾鏃朵粖鏃ョ殑璁垮棰勭害鏁版嵁鎴愬姛");
}
@ApiOperation("璁垮鍗冲皢瓒呮椂棰勮")
- @GetMapping("/visitTimeOut")
+ @PostMapping("/visitTimeOut")
public ApiResponse visitTimeOut() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細visitTimeOut-璁垮瓒呮椂棰勮");
visitsService.syncTimeOutData();
return ApiResponse.success("璁垮鍗冲皢瓒呮椂棰勮");
}
+ @ApiOperation("寰呭鎵硅褰曡秴鏃惰嚜鍔ㄥ彇娑堥绾�")
+ @PostMapping("/visitNoCheckCancel")
+ public ApiResponse visitNoCheckCancel() {
+ log.info("瀹氭椂浠诲姟鎵ц寮�濮嬶細visitNoCheckCancel-瓒呮椂鑷姩鍙栨秷棰勭害");
+ visitsService.visitNoCheckCancel();
+ return ApiResponse.success("寰呭鎵硅褰曡秴鏃惰嚜鍔ㄥ彇娑堥绾�");
+ }
}
--
Gitblit v1.9.3