Merge remote-tracking branch 'origin/master'

src/main/java/com/mokamrp/privates/task/pangu/CheckFosterwxTaskExpire.java

@@ -32,35 +32,35 @@ public class CheckFosterwxTaskExpire {
     @Autowired
     public StringRedisTemplate stringRedisTemplate;
 
-    @Scheduled(cron = "0 1 0 * * ?")
-    @SchedulerLock(name = "pangu:CheckFosterwxTaskExpire", lockAtLeastForString = "PT5S", lockAtMostForString = "PT15M")
-    public void execute() {
-        System.out.println("[cronjob]:检测微信养号任务过期");
-        LocalDate lastDay = LocalDate.now().plusDays(-1);
-        List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
-        for (FosterwxStation fosterwxStation : fosterwxStationList) {
-            List<Integer> tasks = new ArrayList<>();
-            Integer stationId = fosterwxStation.getId();
-            FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
-            fosterwxTaskScheduleHandle.setStationId(stationId);
-            fosterwxTaskScheduleHandle.setSendDate(lastDay);
-            fosterwxTaskScheduleHandle.setPage(1);
-            fosterwxTaskScheduleHandle.setPagesize(99999);
-            ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
-            List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
-            Map<String, List<FosterwxTaskSchedule>> saveRedis = new HashMap<>();
-            for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
-                tasks.add(fosterwxTaskSchedule.getTaskId());
-                //.昨日数据直接设置为过期任务
-                FosterwxTaskSchedule save = new FosterwxTaskSchedule();
-                save.setTaskStatus(2);
-                fosterwxTaskScheduleService.update(save, new QueryWrapper<FosterwxTaskSchedule>()
-                        .eq("station_id", fosterwxStation.getId())
-                        .in("task_id", tasks)
-                        .eq("send_date", lastDay)
-                );
-
-            }
-        }
-    }
+//    @Scheduled(cron = "0 1 0 * * ?")
+//    @SchedulerLock(name = "pangu:CheckFosterwxTaskExpire", lockAtLeastForString = "PT5S", lockAtMostForString = "PT15M")
+//    public void execute() {
+//        System.out.println("[cronjob]:检测微信养号任务过期");
+//        LocalDate lastDay = LocalDate.now().plusDays(-1);
+//        List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
+//        for (FosterwxStation fosterwxStation : fosterwxStationList) {
+//            List<Integer> tasks = new ArrayList<>();
+//            Integer stationId = fosterwxStation.getId();
+//            FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
+//            fosterwxTaskScheduleHandle.setStationId(stationId);
+//            fosterwxTaskScheduleHandle.setSendDate(lastDay);
+//            fosterwxTaskScheduleHandle.setPage(1);
+//            fosterwxTaskScheduleHandle.setPagesize(99999);
+//            ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
+//            List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
+//            Map<String, List<FosterwxTaskSchedule>> saveRedis = new HashMap<>();
+//            for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
+//                tasks.add(fosterwxTaskSchedule.getTaskId());
+//                //.昨日数据直接设置为过期任务
+//                FosterwxTaskSchedule save = new FosterwxTaskSchedule();
+//                save.setTaskStatus(2);
+//                fosterwxTaskScheduleService.update(save, new QueryWrapper<FosterwxTaskSchedule>()
+//                        .eq("station_id", fosterwxStation.getId())
+//                        .in("task_id", tasks)
+//                        .eq("send_date", lastDay)
+//                );
+//
+//            }
+//        }
+//    }
 }

src/main/java/com/mokamrp/privates/task/pangu/SyncNewFosterwxTask.java

@@ -37,6 +37,23 @@ public class SyncNewFosterwxTask {
         System.out.println("[cronjob]:同步微信养号任务到REDIS");
         List<LocalDateTime> dates = new ArrayList<>();
         dates.add(LocalDateTime.now().plusDays(-1));
+        dates.add(LocalDateTime.now().plusDays(-2));
+//        dates.add(LocalDateTime.now().plusDays(-3));
+//        dates.add(LocalDateTime.now().plusDays(-4));
+//        dates.add(LocalDateTime.now().plusDays(-5));
+//        dates.add(LocalDateTime.now().plusDays(-6));
+//        dates.add(LocalDateTime.now().plusDays(-7));
+//        dates.add(LocalDateTime.now().plusDays(-8));
+//        dates.add(LocalDateTime.now().plusDays(-9));
+//        dates.add(LocalDateTime.now().plusDays(-10));
+//        dates.add(LocalDateTime.now().plusDays(-11));
+//        dates.add(LocalDateTime.now().plusDays(-12));
+//        dates.add(LocalDateTime.now().plusDays(-13));
+//        dates.add(LocalDateTime.now().plusDays(-14));
+//        dates.add(LocalDateTime.now().plusDays(-15));
+//        dates.add(LocalDateTime.now().plusDays(-16));
+//        dates.add(LocalDateTime.now().plusDays(-17));
+//        dates.add(LocalDateTime.now().plusDays(-18));
         dates.add(LocalDateTime.now());
         for (Integer i =0;i<dates.size();i++){
             LocalDateTime nowDate = dates.get(i);

src/main/resources/application-prod.properties

@@ -69,7 +69,7 @@ datahub.topic=s_hera_api_external_user
 datahub.corpTopic=ods_hera_msv_corp_data
 datahub.project=hera
 
-es.host=es-cn-4591gc2fx0001549q.public.elasticsearch.aliyuncs.com
+es.host=es-cn-4591gc2fx0001549q.elasticsearch.aliyuncs.com
 es.username=elastic
 es.password=moka6_3moka
 es.port=9200