Merge branch 'dev-lqc'

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

@@ -45,13 +45,15 @@ public class SyncNewFosterwxTask {
         System.out.println("[cronjob]:同步微信养号任务到REDIS");
         List<LocalDateTime> dates = new ArrayList<>();
         LocalDateTime yesterDay = LocalDateTime.now().plusDays(-1);
-        dates.add(LocalDateTime.of(yesterDay.toLocalDate(),LocalTime.MAX)); //.昨天
+        dates.add(LocalDateTime.of(yesterDay.toLocalDate(), LocalTime.MAX)); //.昨天
         dates.add(LocalDateTime.now()); //.今天
-        for (Integer i = 0; i < dates.size(); i++) {
-            LocalDateTime nowDate = dates.get(i);
-            LocalDateTime startTime = LocalDateTime.of(nowDate.toLocalDate(), LocalTime.MIN);
-            List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
-            for (FosterwxStation fosterwxStation : fosterwxStationList) {
+        List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
+        for (FosterwxStation fosterwxStation : fosterwxStationList) {
+            Map<String, List<FosterwxTaskSchedule>> saveWxRedis = new HashMap<>();  //.type 1
+            Map<String, List<FosterwxTaskSchedule>> saveWxworkRedis = new HashMap<>(); //. type 2
+            for (Integer i = 0; i < dates.size(); i++) {
+                LocalDateTime nowDate = dates.get(i);
+                LocalDateTime startTime = LocalDateTime.of(nowDate.toLocalDate(), LocalTime.MIN);
                 List<Integer> tasks = new ArrayList<>();
                 Integer stationId = fosterwxStation.getId();
                 FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
@@ -61,8 +63,6 @@ public class SyncNewFosterwxTask {
                 fosterwxTaskScheduleHandle.setPagesize(99999);
                 ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
                 List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
-                Map<String,List<FosterwxTaskSchedule>> saveWxRedis = new HashMap<>();  //.type 1
-                Map<String,List<FosterwxTaskSchedule>> saveWxworkRedis = new HashMap<>(); //. type 2
                 for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
                     String sendDate = fosterwxTaskSchedule.getSendDate().toString();
                     FosterwxTaskScheduleHandle handle = new FosterwxTaskScheduleHandle();
@@ -83,7 +83,7 @@ public class SyncNewFosterwxTask {
                     //.任务详细信息
                     fosterwxTaskSchedule.setMobileCount(taskInfo.getMobileCount());
                     fosterwxTaskSchedule.setComment(taskInfo.getComment());
-                    if (fosterwxTaskSchedule.getType() == 1){
+                    if (fosterwxTaskSchedule.getType() == 1) {
                         //.个微任务
                         List<FosterwxTaskSchedule> sendDateDetail = saveWxRedis.get(sendDate);
                         if (sendDateDetail == null) {
@@ -94,7 +94,7 @@ public class SyncNewFosterwxTask {
                             sendDateDetail.add(fosterwxTaskSchedule);
                             saveWxRedis.put(sendDate, sendDateDetail);
                         }
-                    }else if (fosterwxTaskSchedule.getType() == 2){
+                    } else if (fosterwxTaskSchedule.getType() == 2) {
                         //.企微任务
                         List<FosterwxTaskSchedule> sendDateDetail = saveWxworkRedis.get(sendDate);
                         if (sendDateDetail == null) {