Merge remote-tracking branch 'origin/master'

src/main/java/com/mokamrp/privates/tast/pangu/SyncFosterwxTask.java

@@ -42,39 +42,39 @@ public class SyncFosterwxTask {
 
     @Scheduled(cron = "0 */1 * * * ?")
     public void execute() {
-        System.out.println("[cronjob]:同步微信养号任务到REDIS");
-        Integer taskCnt = 60;
-        Date nowDate = new Date();
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
-        for (FosterwxStation fosterwxStation : fosterwxStationList) {
-            for (Integer i = 0; i <= 60; i++) {
-                String nextDate = df.format(nowDate);
-                if (!i.equals(0)) {
-                    nextDate = df.format(new Date(nowDate.getTime() + 1000 * 60 * 60 * 24 * i));
-                }
-                Integer stationId = fosterwxStation.getId();
-                FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
-                fosterwxTaskScheduleHandle.setStationId(stationId);
-                fosterwxTaskScheduleHandle.setDate(nextDate);
-                fosterwxTaskScheduleHandle.setPage(1);
-                fosterwxTaskScheduleHandle.setPagesize(99999);
-                ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
-                List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
-                for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
-                    FosterwxTaskScheduleHandle handle = new FosterwxTaskScheduleHandle();
-                    handle.setTaskId(fosterwxTaskSchedule.getTaskId());
-                    handle.setStationId(fosterwxTaskSchedule.getStationId());
-                    handle.setSendDate(fosterwxTaskSchedule.getSendDate());
-                    FosterwxTaskSchedule taskInfo = fosterwxTaskScheduleService.getInfo(handle);
-                    if (taskInfo == null) {
-                        continue;
-                    }
-                    fosterwxTaskSchedule.setMobileCount(taskInfo.getMobileCount());
-                    fosterwxTaskSchedule.setComment(taskInfo.getComment());
-                }
-                stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask + stationId, nextDate, JSON.toJSONString(fosterwxTaskScheduleList));
-            }
-        }
+//        System.out.println("[cronjob]:同步微信养号任务到REDIS");
+//        Integer taskCnt = 60;
+//        Date nowDate = new Date();
+//        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+//        List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
+//        for (FosterwxStation fosterwxStation : fosterwxStationList) {
+//            for (Integer i = 0; i <= 60; i++) {
+//                String nextDate = df.format(nowDate);
+//                if (!i.equals(0)) {
+//                    nextDate = df.format(new Date(nowDate.getTime() + 1000 * 60 * 60 * 24 * i));
+//                }
+//                Integer stationId = fosterwxStation.getId();
+//                FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
+//                fosterwxTaskScheduleHandle.setStationId(stationId);
+//                fosterwxTaskScheduleHandle.setDate(nextDate);
+//                fosterwxTaskScheduleHandle.setPage(1);
+//                fosterwxTaskScheduleHandle.setPagesize(99999);
+//                ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
+//                List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
+//                for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
+//                    FosterwxTaskScheduleHandle handle = new FosterwxTaskScheduleHandle();
+//                    handle.setTaskId(fosterwxTaskSchedule.getTaskId());
+//                    handle.setStationId(fosterwxTaskSchedule.getStationId());
+//                    handle.setSendDate(fosterwxTaskSchedule.getSendDate());
+//                    FosterwxTaskSchedule taskInfo = fosterwxTaskScheduleService.getInfo(handle);
+//                    if (taskInfo == null) {
+//                        continue;
+//                    }
+//                    fosterwxTaskSchedule.setMobileCount(taskInfo.getMobileCount());
+//                    fosterwxTaskSchedule.setComment(taskInfo.getComment());
+//                }
+//                stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask + stationId, nextDate, JSON.toJSONString(fosterwxTaskScheduleList));
+//            }
+//        }
     }
 }

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

@@ -0,0 +1,66 @@
+package com.mokamrp.privates.tast.pangu;
+
+import com.alibaba.fastjson.JSON;
+import com.mokamrp.privates.constant.RedisKey;
+import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxTaskScheduleHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule;
+import com.mokamrp.privates.service.pangu.FosterwxStationService;
+import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class SyncNewFosterwxTask {
+
+    @Autowired
+    public FosterwxTaskScheduleService fosterwxTaskScheduleService;
+
+    @Autowired
+    public FosterwxStationService fosterwxStationService;
+
+    @Autowired
+    public StringRedisTemplate stringRedisTemplate;
+
+    @Scheduled(cron = "0 */1 * * * ?")
+    public void execute() {
+        System.out.println("[cronjob]:同步微信养号任务到REDIS");
+        Integer taskCnt = 60;
+        LocalDateTime nowDate = LocalDateTime.now();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        String dateStr = df.format(nowDate);
+        List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
+        for (FosterwxStation fosterwxStation : fosterwxStationList) {
+            Integer stationId = fosterwxStation.getId();
+            FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
+            fosterwxTaskScheduleHandle.setStationId(stationId);
+//            fosterwxTaskScheduleHandle.setDate(nextDate);
+            fosterwxTaskScheduleHandle.setSendTime(nowDate);
+            fosterwxTaskScheduleHandle.setPage(1);
+            fosterwxTaskScheduleHandle.setPagesize(99999);
+            ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
+            List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
+            for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
+                FosterwxTaskScheduleHandle handle = new FosterwxTaskScheduleHandle();
+                handle.setTaskId(fosterwxTaskSchedule.getTaskId());
+                handle.setStationId(fosterwxTaskSchedule.getStationId());
+                handle.setSendDate(fosterwxTaskSchedule.getSendDate());
+                FosterwxTaskSchedule taskInfo = fosterwxTaskScheduleService.getInfo(handle);
+                if (taskInfo == null) {
+                    continue;
+                }
+                fosterwxTaskSchedule.setMobileCount(taskInfo.getMobileCount());
+                fosterwxTaskSchedule.setComment(taskInfo.getComment());
+            }
+            stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask + stationId, dateStr, JSON.toJSONString(fosterwxTaskScheduleList));
+        }
+    }
+}