leon 5 years ago
parent
commit
7c9c14f3ff

+ 6 - 0
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxTaskScheduleController.java

@@ -3,6 +3,7 @@ package com.mokamrp.privates.controller.pangu;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.AddHandle;
 import com.mokamrp.privates.entity.ResHandle;
@@ -15,6 +16,7 @@ import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.service.pangu.FosterwxTaskListService;
 import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,6 +50,9 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
     @Autowired
     private FosterwxTaskListService fosterwxTaskListService;
 
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -191,6 +196,7 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
 
             FosterwxTaskSchedule deleteVO = new FosterwxTaskSchedule();
             deleteVO.setDelFlg(0);
+            stringRedisTemplate.opsForHash().delete(RedisKey.PanWxfosterTask+fosterwxTaskScheduleHandle.getStationId().toString(),fosterwxTaskScheduleHandle.getSendDate().toString());
             boolean res = service.update(deleteVO, queryWrapper);
         });
         return AjaxResult.success(Constants.SUCCESS, "删除成功");

+ 2 - 3
src/main/java/com/mokamrp/privates/tast/pangu/SyncNewFosterwxTask.java

@@ -33,7 +33,7 @@ public class SyncNewFosterwxTask {
     @Autowired
     public StringRedisTemplate stringRedisTemplate;
 
-    @Scheduled(cron = "*/2 * * * * ?")
+    @Scheduled(cron = "* */1 * * * ?")
     public void execute() {
         System.out.println("[cronjob]:同步微信养号任务到REDIS");
         Integer taskCnt = 60;
@@ -47,7 +47,6 @@ public class SyncNewFosterwxTask {
             Integer stationId = fosterwxStation.getId();
             FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
             fosterwxTaskScheduleHandle.setStationId(stationId);
-//            fosterwxTaskScheduleHandle.setDate(nextDate);
             fosterwxTaskScheduleHandle.setSendTime(nowDate);
             fosterwxTaskScheduleHandle.setPage(1);
             fosterwxTaskScheduleHandle.setPagesize(99999);
@@ -56,7 +55,6 @@ public class SyncNewFosterwxTask {
             Map<String,List<FosterwxTaskSchedule>> saveRedis = new HashMap<>();
             for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
                 String sendDate = fosterwxTaskSchedule.getSendDate().toString();
-                tasks.add(fosterwxTaskSchedule.getTaskId());
                 FosterwxTaskScheduleHandle handle = new FosterwxTaskScheduleHandle();
                 handle.setTaskId(fosterwxTaskSchedule.getTaskId());
                 handle.setStationId(fosterwxTaskSchedule.getStationId());
@@ -65,6 +63,7 @@ public class SyncNewFosterwxTask {
                 if (taskInfo == null) {
                     continue;
                 }
+                tasks.add(fosterwxTaskSchedule.getTaskId());
                 fosterwxTaskSchedule.setMobileCount(taskInfo.getMobileCount());
                 fosterwxTaskSchedule.setComment(taskInfo.getComment());
                 List<FosterwxTaskSchedule> sendDateDetail = saveRedis.get(sendDate);