From ed83fdced0b1ce7a4476c32673b9349a2595d59b Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期三, 24 十二月 2025 18:47:14 +0800
Subject: [PATCH] 获取设备打卡数据
---
src/main/java/com/gs/dingtalk/controller/KMController.java | 30 ++++++++++++++++++++++++++++++
src/main/java/com/gs/dingtalk/task/ScheduledTasks.java | 28 ++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gs/dingtalk/controller/KMController.java b/src/main/java/com/gs/dingtalk/controller/KMController.java
index 9c28188..b0f7fe0 100644
--- a/src/main/java/com/gs/dingtalk/controller/KMController.java
+++ b/src/main/java/com/gs/dingtalk/controller/KMController.java
@@ -3,6 +3,7 @@
import com.gs.dingtalk.config.ResultMessage;
import com.gs.dingtalk.service.QwCheckinDayDataService;
+import com.gs.dingtalk.service.QwHardwareCheckinDataService;
import com.gs.dingtalk.service.SendDingtalkService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +22,8 @@
private final SendDingtalkService sendDingtalkService;
private final QwCheckinDayDataService qwCheckinDayDataService;
+
+ private final QwHardwareCheckinDataService qwHardwareCheckinDataService;
@PostMapping("/chatSendMessage")
public ResultMessage chatSendMessage() {
@@ -75,4 +78,31 @@
}
}
+ /**
+ * 鍚屾浼佷笟寰俊璁惧鎵撳崱鏁版嵁
+ * @param startDate 寮�濮嬫棩鏈燂紝鏍煎紡锛歽yyy-MM-dd
+ * @param endDate 缁撴潫鏃ユ湡锛屾牸寮忥細yyyy-MM-dd
+ * @return 鍚屾缁撴灉
+ */
+ @PostMapping("/syncHardwareCheckinData")
+ public ResultMessage syncHardwareCheckinData(@RequestParam String startDate, @RequestParam String endDate) {
+ try {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDate start = LocalDate.parse(startDate, formatter);
+ LocalDate end = LocalDate.parse(endDate, formatter);
+
+ // 杞崲涓篣nix鏃堕棿鎴�
+ ZoneId zoneId = ZoneId.of("Asia/Shanghai");
+ long startTime = start.atStartOfDay(zoneId).toEpochSecond();
+ // 缁撴潫鏃堕棿涓哄綋澶�23:59:59
+ long endTime = end.plusDays(1).atStartOfDay(zoneId).toEpochSecond() - 1;
+
+ int insertCount = qwHardwareCheckinDataService.syncHardwareData(startTime, endTime);
+
+ return ResultMessage.ok();
+ } catch (Exception e) {
+ return ResultMessage.error(e);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/gs/dingtalk/task/ScheduledTasks.java b/src/main/java/com/gs/dingtalk/task/ScheduledTasks.java
index 5f64f91..170e661 100644
--- a/src/main/java/com/gs/dingtalk/task/ScheduledTasks.java
+++ b/src/main/java/com/gs/dingtalk/task/ScheduledTasks.java
@@ -2,6 +2,7 @@
import com.gs.dingtalk.service.QwCheckinDayDataService;
+import com.gs.dingtalk.service.QwHardwareCheckinDataService;
import com.gs.dingtalk.service.SendDingtalkService;
import com.gs.dingtalk.service.VwCjScSjTsBbService;
import lombok.RequiredArgsConstructor;
@@ -23,9 +24,13 @@
private final QwCheckinDayDataService qwCheckinDayDataService;
+ private final QwHardwareCheckinDataService qwHardwareCheckinDataService;
+
private final AtomicBoolean exportTaskRunning = new AtomicBoolean(false);
private final AtomicBoolean checkinDayDataTaskRunning = new AtomicBoolean(false);
+
+ private final AtomicBoolean hardwareCheckinTaskRunning = new AtomicBoolean(false);
// /**
// * 姣忎袱鍒嗛挓鎵ц涓�娆�
@@ -116,4 +121,27 @@
checkinDayDataTaskRunning.set(false);
}
}
+
+ /**
+ * 姣忓ぉ鏃╀笂7:35鎵ц锛堢◢鏅氫簬鎵撳崱鏃ユ姤鍚屾浠诲姟锛�
+ * 鍚屾鍓嶄竴澶╃殑浼佷笟寰俊璁惧鎵撳崱鏁版嵁鍒版暟鎹簱
+ */
+ @Async("taskExecutor")
+ @Scheduled(cron = "0 35 7 * * ?")
+ public void syncHardwareCheckinDataTask() {
+ if (!hardwareCheckinTaskRunning.compareAndSet(false, true)) {
+ log.warn("璁惧鎵撳崱鏁版嵁鍚屾浠诲姟姝ｅ湪鎵ц涓紝璺宠繃鏈鎵ц");
+ return;
+ }
+
+ try {
+ log.info("寮�濮嬫墽琛岃澶囨墦鍗℃暟鎹悓姝ヤ换鍔★紙鍚屾鏄ㄥぉ鏁版嵁锛�");
+ int insertCount = qwHardwareCheckinDataService.syncYesterdayHardwareData();
+ log.info("璁惧鎵撳崱鏁版嵁鍚屾浠诲姟鎵ц鎴愬姛锛屾柊澧炶褰曟暟: {}", insertCount);
+ } catch (Exception e) {
+ log.error("璁惧鎵撳崱鏁版嵁鍚屾浠诲姟鎵ц寮傚父", e);
+ } finally {
+ hardwareCheckinTaskRunning.set(false);
+ }
+ }
}
--
Gitblit v1.9.3