leon 5 лет назад
Родитель
Сommit
1eb2941a7d

+ 2 - 0
src/main/java/com/mokamrp/privates/constant/RedisKey.java

@@ -25,5 +25,7 @@ public class RedisKey {
     public static final String CheckWxDomainToken = "check_wx_domain_token";
     //.企微客服发送朋友圈任务
     public static final String WorkEmployeeFriendcircleJob = "work_employee_friendcircle_job";
+    //.盘古 微信养号任务
+    public static final String PanWxfosterTask = "pan_wxfoster_task:";
 }
 

+ 3 - 2
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxTaskScheduleController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.EditHandle;
+import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
@@ -57,7 +58,7 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String, Object> res = fosterwxTaskScheduleService.getList(postBasePageHandle, taskName, stationId, date);
+        ResHandle<List<FosterwxTaskSchedule>> res = fosterwxTaskScheduleService.getList(postBasePageHandle, taskName, stationId, date);
         return AjaxResult.success(res);
     }
 
@@ -101,7 +102,7 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
         // c.set(year, month, 0);
 
 
-        Map<String, Object> res = fosterwxTaskScheduleService.getList(postBasePageHandle, null, stationId, null);
+        ResHandle<List<FosterwxTaskSchedule>> res = fosterwxTaskScheduleService.getList(postBasePageHandle, null, stationId, null);
         return AjaxResult.success(res);
     }
 

+ 12 - 0
src/main/java/com/mokamrp/privates/entity/ResHandle.java

@@ -0,0 +1,12 @@
+package com.mokamrp.privates.entity;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ResHandle<T>{
+    private Long total;
+    private T list;
+}

+ 3 - 2
src/main/java/com/mokamrp/privates/service/pangu/FosterwxTaskScheduleService.java

@@ -1,13 +1,14 @@
 package com.mokamrp.privates.service.pangu;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule;
 import com.mokamrp.privates.mapper.pojo.User;
 
-import java.util.Map;
+import java.util.List;
 
 /**
  * <p>
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 public interface FosterwxTaskScheduleService extends IService<FosterwxTaskSchedule> {
     //.@leon 获取数据列表
-    public Map<String, Object> getList(PostBasePageHandle handle, String taskName, Integer stationId, String date);
+    public ResHandle<List<FosterwxTaskSchedule>> getList(PostBasePageHandle handle, String taskName, Integer stationId, String date);
 
 
     /**

+ 6 - 7
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskScheduleServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.FosterwxStationMapper;
@@ -21,9 +22,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -54,7 +53,7 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
      * @return
      */
     @Override
-    public Map<String, Object> getList(PostBasePageHandle handle, String taskName, Integer stationId, String date) {
+    public ResHandle<List<FosterwxTaskSchedule>> getList(PostBasePageHandle handle, String taskName, Integer stationId, String date) {
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxTaskSchedule> pageObj = new Page<FosterwxTaskSchedule>(page, pagesize);
@@ -65,10 +64,10 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
         fosterwxTaskScheduleQueryWrapper.orderByDesc("task_id");
 
         pageObj = fosterwxTaskScheduleMapper.selectPage(pageObj, fosterwxTaskScheduleQueryWrapper);
-        Map<String, Object> resMap = new HashMap<String, Object>();
-        resMap.put("list", pageObj.getRecords());
-        resMap.put("total", pageObj.getTotal());
-        return resMap;
+        ResHandle<List<FosterwxTaskSchedule>> resHandle = new ResHandle<>();
+        resHandle.setTotal(pageObj.getTotal());
+        resHandle.setList(pageObj.getRecords());
+        return resHandle;
     }
 
     /**

+ 25 - 2
src/main/java/com/mokamrp/privates/tast/pangu/SyncFosterwxTask.java

@@ -1,10 +1,14 @@
 package com.mokamrp.privates.tast.pangu;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecord;
 import com.mokamrp.privates.mapper.data.pojo.PanCSTQRecord;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule;
 import com.mokamrp.privates.mapper.pangu.pojo.PromoteQrcodePoolRecord;
 import com.mokamrp.privates.service.data.PanCSLTRecordService;
 import com.mokamrp.privates.service.data.PanCSTQRecordService;
@@ -12,9 +16,13 @@ import com.mokamrp.privates.service.pangu.FosterwxStationService;
 import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
 import com.mokamrp.privates.service.pangu.PromoteQrcodePoolRecordService;
 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
@@ -26,15 +34,30 @@ public class SyncFosterwxTask {
     @Autowired
     public FosterwxStationService fosterwxStationService;
 
-    @Scheduled(cron = "0 */30 * * * ?")
+    @Autowired
+    public StringRedisTemplate stringRedisTemplate;
+
+    @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");
         PostBasePageHandle postBasePageHandle = new PostBasePageHandle();
         postBasePageHandle.setPage(1);
         postBasePageHandle.setPagesize(9999999);
         List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
         for (FosterwxStation fosterwxStation : fosterwxStationList){
-            fosterwxTaskScheduleService.getList(postBasePageHandle,"",fosterwxStation.getId(),"2021-07-24");
+            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();
+                ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(postBasePageHandle,"",fosterwxStation.getId(),nextDate);
+                List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
+                stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask+stationId,nextDate, JSON.toJSONString(fosterwxTaskScheduleList));
+            }
         }
     }
 }