盘古养号任务兼容个微和企微

src/main/java/com/mokamrp/privates/constant/RedisKey.java

@@ -27,6 +27,8 @@ public class RedisKey {
     public static final String WorkEmployeeFriendcircleJob = "work_employee_friendcircle_job";
     //.盘古 微信养号任务
     public static final String PanWxfosterTask = "pan_wxfoster_task:";
+    //.盘古 企微养号任务
+    public static final String PanWxworkfosterTask = "pan_wxworkfoster_task:";
     //.盘古 微信养号站点内账号列表
     public static final String PanWxFosterMobileInfo = "pan_wxfoster_mobile_info:";
     //.盘古 微信养号账号修改异步操作

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxTaskScheduleController.java

@@ -197,7 +197,11 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
 
             FosterwxTaskSchedule deleteVO = new FosterwxTaskSchedule();
             deleteVO.setDelFlg(0);
-            stringRedisTemplate.opsForHash().delete(RedisKey.PanWxfosterTask + fosterwxTaskScheduleHandle.getStationId().toString(), fosterwxTaskScheduleHandle.getSendDate().toString());
+            if (fosterwxTaskScheduleHandle.getType() == 1) { //.个微任务
+                stringRedisTemplate.opsForHash().delete(RedisKey.PanWxfosterTask + fosterwxTaskScheduleHandle.getStationId().toString(), fosterwxTaskScheduleHandle.getSendDate().toString());
+            } else if (fosterwxTaskScheduleHandle.getType() == 2) { //.企微任务
+                stringRedisTemplate.opsForHash().delete(RedisKey.PanWxworkfosterTask + fosterwxTaskScheduleHandle.getStationId().toString(), fosterwxTaskScheduleHandle.getSendDate().toString());
+            }
             boolean res = service.update(deleteVO, queryWrapper);
         });
         return AjaxResult.success(Constants.SUCCESS, "删除成功");

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

@@ -60,7 +60,8 @@ public class SyncNewFosterwxTask {
                 fosterwxTaskScheduleHandle.setPagesize(99999);
                 ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
                 List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
-                Map<String, List<FosterwxTaskSchedule>> saveRedis = new HashMap<>();
+                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();
@@ -81,19 +82,36 @@ public class SyncNewFosterwxTask {
                     //.任务详细信息
                     fosterwxTaskSchedule.setMobileCount(taskInfo.getMobileCount());
                     fosterwxTaskSchedule.setComment(taskInfo.getComment());
-                    List<FosterwxTaskSchedule> sendDateDetail = saveRedis.get(sendDate);
-                    if (sendDateDetail == null) {
-                        List<FosterwxTaskSchedule> firstAdd = new ArrayList<>();
-                        firstAdd.add(fosterwxTaskSchedule);
-                        saveRedis.put(sendDate, firstAdd);
-                    } else {
-                        sendDateDetail.add(fosterwxTaskSchedule);
-                        saveRedis.put(sendDate, sendDateDetail);
+                    if (fosterwxTaskSchedule.getType() == 1){
+                        //.个微任务
+                        List<FosterwxTaskSchedule> sendDateDetail = saveWxRedis.get(sendDate);
+                        if (sendDateDetail == null) {
+                            List<FosterwxTaskSchedule> firstAdd = new ArrayList<>();
+                            firstAdd.add(fosterwxTaskSchedule);
+                            saveWxRedis.put(sendDate, firstAdd);
+                        } else {
+                            sendDateDetail.add(fosterwxTaskSchedule);
+                            saveWxRedis.put(sendDate, sendDateDetail);
+                        }
+                    }else if (fosterwxTaskSchedule.getType() == 2){
+                        //.企微任务
+                        List<FosterwxTaskSchedule> sendDateDetail = saveWxworkRedis.get(sendDate);
+                        if (sendDateDetail == null) {
+                            List<FosterwxTaskSchedule> firstAdd = new ArrayList<>();
+                            firstAdd.add(fosterwxTaskSchedule);
+                            saveWxworkRedis.put(sendDate, firstAdd);
+                        } else {
+                            sendDateDetail.add(fosterwxTaskSchedule);
+                            saveWxworkRedis.put(sendDate, sendDateDetail);
+                        }
                     }
                 }
-                for (Map.Entry<String, List<FosterwxTaskSchedule>> entry : saveRedis.entrySet()) {
+                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();
@@ -106,7 +124,8 @@ public class SyncNewFosterwxTask {
                     );
                 }
                 tasks.clear();
-                saveRedis.clear();
+                saveWxRedis.clear();
+                saveWxworkRedis.clear();
             }
         }
     }