diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java index f3928b5..5cc558a 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/AttTasks.java @@ -55,7 +55,7 @@ public class AttTasks { private AttGroupDao attGroupDao; // @Scheduled(cron = "0 0/10 * * * ?") -// @Scheduled(fixedDelay = 60000 * 10) + @Scheduled(fixedDelay = 60000 * 10) @Async public void getAttTasks() { log.info("--------考勤定时器开启------"); @@ -70,7 +70,7 @@ public class AttTasks { /** * 历史考勤数据 */ -// @Scheduled(fixedDelay = 60000 * 30) + @Scheduled(fixedDelay = 60000 * 30) @Async public void getHisAttTasks() { log.info("--------考勤定时器开启------"); @@ -78,8 +78,8 @@ public class AttTasks { return; // 如果任务已经执行过,直接返回 } executed = true; // 设置标志位,表示任务已经执行过 - String startDate = "2024-11-01"; - String endDate = "2024-11-26"; + String startDate = "2024-11-30"; + String endDate = "2024-12-01"; List dateList = getStrDateListBetween(startDate, endDate); // 创建固定大小的线程池 ExecutorService executorService = Executors.newFixedThreadPool(THREAD_POOL_SIZE); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java index 0709f67..539fc22 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java @@ -208,7 +208,6 @@ public class WechatTasks { dao.updateWebFace(user); } } - } private void syncListsToDatabase(List list, List wechatList) { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/utils/IpAndPathConfig.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/utils/IpAndPathConfig.java index c2fcbf6..cacfb8d 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/utils/IpAndPathConfig.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/utils/IpAndPathConfig.java @@ -14,14 +14,14 @@ public class IpAndPathConfig { */ // @Value("${environment}") // public static String environment; - public static String environment = "location"; + public static String environment = "test"; /** * 小程序相关 */ public static String wechatDevUrl = "http://127.0.0.1:1907/gz_att_wechat/wechatData"; - public static String wechatTestUrl = "http://192.168.0.14:21880/wcd/getWorkerCard"; + public static String wechatTestUrl = "http://192.168.0.14:1907/gz_att_wechat/wechatData"; public static String wechatProdUrl = "http://112.29.103.165:21880/wcd/getWorkerCard";