Merge branch 'master' into test

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

@@ -49,13 +49,13 @@ public class SyncNewFosterwxTask {
         dates.add(LocalDateTime.now()); //.今天
         List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
         for (FosterwxStation fosterwxStation : fosterwxStationList) {
+            Integer stationId = fosterwxStation.getId();
             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();
                 fosterwxTaskScheduleHandle.setStationId(stationId);
                 fosterwxTaskScheduleHandle.setSendTime(nowDate);
@@ -107,12 +107,6 @@ public class SyncNewFosterwxTask {
                         }
                     }
                 }
-                for (Map.Entry<String, List<FosterwxTaskSchedule>> entry : saveWxRedis.entrySet()) {
-                    stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask + stationId, entry.getKey(), JSON.toJSONString(entry.getValue()));
-                }
-                for (Map.Entry<String, List<FosterwxTaskSchedule>> entry : saveWxworkRedis.entrySet()) {
-                    stringRedisTemplate.opsForHash().put(RedisKey.PanWxworkfosterTask + stationId, entry.getKey(), JSON.toJSONString(entry.getValue()));
-                }
                 //.任务状态改为 已发送
                 if (tasks.size() > 0) {
                     FosterwxTaskSchedule save = new FosterwxTaskSchedule();
@@ -125,9 +119,15 @@ public class SyncNewFosterwxTask {
                     );
                 }
                 tasks.clear();
-                saveWxRedis.clear();
-                saveWxworkRedis.clear();
             }
+            for (Map.Entry<String, List<FosterwxTaskSchedule>> entry : saveWxRedis.entrySet()) {
+                stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask + stationId, entry.getKey(), JSON.toJSONString(entry.getValue()));
+            }
+            for (Map.Entry<String, List<FosterwxTaskSchedule>> entry : saveWxworkRedis.entrySet()) {
+                stringRedisTemplate.opsForHash().put(RedisKey.PanWxworkfosterTask + stationId, entry.getKey(), JSON.toJSONString(entry.getValue()));
+            }
+            saveWxRedis.clear();
+            saveWxworkRedis.clear();
         }
     }