新增企微任务

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

@@ -116,7 +116,8 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         // 获取默认模板号
         FosterwxStation fosterwxStation = fosterwxStationService.getById(res.getStationId());
         if (null == fosterwxStation) return AjaxResult.error("无法获取站点");
-        res.setTemplateId(fosterwxStation.getTaskTemplateId());
+        res.setGwTemplateId(fosterwxStation.getGwTaskTemplateId());
+        res.setQwTemplateId(fosterwxStation.getQwTaskTemplateId());
 
         Corp corp = corpService.getById(res.getWorkWxCorpId());
         if (null != corp) {
@@ -125,11 +126,18 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         List<FosterwxMobileWxfriend> friendList = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id", res.getId()).orderByAsc("seq"));
         res.setFriend(friendList);
 
-        // 获取账号任务时间list
-        List<FosterwxMobileTaskTimeList> fosterwxMobileTaskTimeLists = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, res.getMobileUnioCode()).orderByAsc(FosterwxMobileTaskTimeList::getId));
+        // 获取个微账号任务时间list
+        List<FosterwxMobileTaskTimeList> fosterwxMobileTaskTimeLists = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, res.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 1).orderByAsc(FosterwxMobileTaskTimeList::getId));
 
         if (!fosterwxMobileTaskTimeLists.isEmpty()) {
-            res.setTaskTimeLists(fosterwxMobileTaskTimeLists);
+            res.setGwTaskTimeLists(fosterwxMobileTaskTimeLists);
+        }
+
+        // 获取企微账号任务时间list
+        fosterwxMobileTaskTimeLists = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, res.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 2).orderByAsc(FosterwxMobileTaskTimeList::getId));
+
+        if (!fosterwxMobileTaskTimeLists.isEmpty()) {
+            res.setQwTaskTimeLists(fosterwxMobileTaskTimeLists);
         }
 
         return AjaxResult.success(Constants.SUCCESS, res);
@@ -154,9 +162,14 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         fosterwxMobileService.save(addHandle.getRaw());
         // 判断开始做任务时间是否设置了
         AjaxResult ajaxResult = null;
-        if (null != addHandle.getRaw().getTaskTimeLists().get(0).getTaskStartAt()) {
-            fosterwxMobileTaskTimeListService.insertByMobile(addHandle.getRaw(), addHandle.getRaw().getTaskTimeLists().get(0));
-            ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(addHandle.getRaw(), addHandle.getRaw().getTaskTimeLists().get(0), authUser, false);
+        if (null != addHandle.getRaw().getGwTaskTimeLists().get(0).getTaskStartAt()) {
+            fosterwxMobileTaskTimeListService.insertByMobile(addHandle.getRaw(), addHandle.getRaw().getGwTaskTimeLists().get(0), 1);
+            ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(addHandle.getRaw(), addHandle.getRaw().getGwTaskTimeLists().get(0), authUser, false, 1);
+        }
+
+        if (null != addHandle.getRaw().getQwTaskTimeLists().get(0).getTaskStartAt()) {
+            fosterwxMobileTaskTimeListService.insertByMobile(addHandle.getRaw(), addHandle.getRaw().getQwTaskTimeLists().get(0), 2);
+            ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(addHandle.getRaw(), addHandle.getRaw().getQwTaskTimeLists().get(0), authUser, false, 2);
         }
 
         if (null == ajaxResult) return AjaxResult.success(HttpMsg.success, addHandle.getRaw().getId());
@@ -172,7 +185,10 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             this.onUpdate(editHandle);
             FosterwxMobile fosterwxMobile = editHandle.getRaw();
             FosterwxMobile oldVO = fosterwxMobileService.getById(id);
-            List<FosterwxMobileTaskTimeList> oldTimeList = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, oldVO.getMobileUnioCode()).orderByAsc(FosterwxMobileTaskTimeList::getId));
+            // 个微旧任务详情
+            List<FosterwxMobileTaskTimeList> gwOldTimeList = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, oldVO.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 1).orderByAsc(FosterwxMobileTaskTimeList::getId));
+            // 企微旧任务详情
+            List<FosterwxMobileTaskTimeList> qwOldTimeList = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, oldVO.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 2).orderByAsc(FosterwxMobileTaskTimeList::getId));
             // 新增账号
             fosterwxMobileService.update(fosterwxMobile, new QueryWrapper<FosterwxMobile>().eq("id", id));
 
@@ -191,13 +207,14 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
 
 
             AjaxResult ajaxResult = null;
-            if (null != editHandle.getRaw().getTaskTimeLists()) {
+            // 个微的任务相关操作
+            if (null != editHandle.getRaw().getGwTaskTimeLists()) {
                 // 判断开始做任务时间是否设置了
                 // 获取最新的一条时间任务
                 FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList = new FosterwxMobileTaskTimeList();
 
-                if (!editHandle.getRaw().getTaskTimeLists().isEmpty()) {
-                    FosterwxMobileTaskTimeList sample = editHandle.getRaw().getTaskTimeLists().get(editHandle.getRaw().getTaskTimeLists().size() - 1);
+                if (!editHandle.getRaw().getGwTaskTimeLists().isEmpty()) {
+                    FosterwxMobileTaskTimeList sample = editHandle.getRaw().getGwTaskTimeLists().get(editHandle.getRaw().getGwTaskTimeLists().size() - 1);
                     fosterwxMobileTaskTimeList.setTaskStartAt(sample.getTaskStartAt());
                     fosterwxMobileTaskTimeList.setTaskEndAt(sample.getTaskEndAt());
                     fosterwxMobileTaskTimeList.setTemplateId(sample.getTemplateId());
@@ -205,7 +222,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
                 }
                 // 全新增加任务的场合
                 // 批量操作的时候传过来的件数不能跟数据库件数比较 因此独立判断
-                if (editHandle.getRaw().getTaskTimeLists().size() > oldTimeList.size() || (editHandle.getRaw().getType() != null && editHandle.getRaw().getTaskTimeLists().size() == 2)) {
+                if (editHandle.getRaw().getGwTaskTimeLists().size() > gwOldTimeList.size() || (editHandle.getRaw().getType() != null && editHandle.getRaw().getGwTaskTimeLists().size() == 2)) {
                     if (null != fosterwxMobileTaskTimeList.getTaskStartAt()) {
                         if (null != fosterwxMobileTaskTimeList.getTaskEndAt()) {
                             LocalDate startDate = fosterwxMobileTaskTimeList.getTaskStartAt().toLocalDate();
@@ -219,16 +236,64 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
                                 return AjaxResult.error(fosterwxMobile.getMobileUnioCode() + "设置的持续时间超过模板的长度");
                         }
 
-                        fosterwxMobileTaskTimeListService.insertByMobile(fosterwxMobile, fosterwxMobileTaskTimeList);
-                        ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, fosterwxMobileTaskTimeList, authUser, false);
+                        fosterwxMobileTaskTimeListService.insertByMobile(fosterwxMobile, fosterwxMobileTaskTimeList, 1);
+                        ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, fosterwxMobileTaskTimeList, authUser, false, 1);
                     }
                 } else {
                     // 原有任务
-                    if (null != fosterwxMobileTaskTimeList.getTaskStartAt() && oldTimeList.get(oldTimeList.size() - 1).getTaskStartAt() == null) {
+                    if (null != fosterwxMobileTaskTimeList.getTaskStartAt() && gwOldTimeList.get(gwOldTimeList.size() - 1).getTaskStartAt() == null) {
                         if (fosterwxMobile.getWxStatus() != 2) {
-                            ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, fosterwxMobileTaskTimeList, authUser, false);
+                            ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, fosterwxMobileTaskTimeList, authUser, false, 1);
                         }
-                    } else if (null != fosterwxMobileTaskTimeList.getTaskEndAt() && oldTimeList.get(oldTimeList.size() - 1).getTaskEndAt() == null) {
+                    } else if (null != fosterwxMobileTaskTimeList.getTaskEndAt() && gwOldTimeList.get(gwOldTimeList.size() - 1).getTaskEndAt() == null) {
+                        fosterwxMobileTaskTimeListService.update(new FosterwxMobileTaskTimeList() {{
+                            setTaskEndAt(fosterwxMobileTaskTimeList.getTaskEndAt());
+                        }}, new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()));
+                        // 删除后面的任务
+                        fosterwxTaskScheduleService.remove(new LambdaQueryWrapper<FosterwxTaskSchedule>().eq(FosterwxTaskSchedule::getStationId, oldVO.getStationId()).eq(FosterwxTaskSchedule::getMobileCode, oldVO.getMobileCode()).gt(FosterwxTaskSchedule::getSendDate, fosterwxMobileTaskTimeList.getTaskEndAt()));
+                    }
+                }
+            }
+
+            // 企微任务相关操作
+            if (null != editHandle.getRaw().getQwTaskTimeLists()) {
+                // 判断开始做任务时间是否设置了
+                // 获取最新的一条时间任务
+                FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList = new FosterwxMobileTaskTimeList();
+
+                if (!editHandle.getRaw().getQwTaskTimeLists().isEmpty()) {
+                    FosterwxMobileTaskTimeList sample = editHandle.getRaw().getQwTaskTimeLists().get(editHandle.getRaw().getQwTaskTimeLists().size() - 1);
+                    fosterwxMobileTaskTimeList.setTaskStartAt(sample.getTaskStartAt());
+                    fosterwxMobileTaskTimeList.setTaskEndAt(sample.getTaskEndAt());
+                    fosterwxMobileTaskTimeList.setTemplateId(sample.getTemplateId());
+                    fosterwxMobileTaskTimeList.setDefaultSendTime(sample.getDefaultSendTime());
+                }
+                // 全新增加任务的场合
+                // 批量操作的时候传过来的件数不能跟数据库件数比较 因此独立判断
+                if (editHandle.getRaw().getQwTaskTimeLists().size() > qwOldTimeList.size() || (editHandle.getRaw().getType() != null && editHandle.getRaw().getQwTaskTimeLists().size() == 2)) {
+                    if (null != fosterwxMobileTaskTimeList.getTaskStartAt()) {
+                        if (null != fosterwxMobileTaskTimeList.getTaskEndAt()) {
+                            LocalDate startDate = fosterwxMobileTaskTimeList.getTaskStartAt().toLocalDate();
+                            LocalDate endDate = fosterwxMobileTaskTimeList.getTaskEndAt().toLocalDate();
+
+                            long dayLong = endDate.toEpochDay() - startDate.toEpochDay() + 1;
+
+                            LambdaQueryWrapper<FosterwxTaskList> fosterTaskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                            fosterTaskListLambdaQueryWrapper.eq(FosterwxTaskList::getTemplateId, fosterwxMobileTaskTimeList.getTemplateId());
+                            if (dayLong > fosterwxTaskListService.count(fosterTaskListLambdaQueryWrapper))
+                                return AjaxResult.error(fosterwxMobile.getMobileUnioCode() + "设置的持续时间超过模板的长度");
+                        }
+
+                        fosterwxMobileTaskTimeListService.insertByMobile(fosterwxMobile, fosterwxMobileTaskTimeList, 2);
+                        ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, fosterwxMobileTaskTimeList, authUser, false, 2);
+                    }
+                } else {
+                    // 原有任务
+                    if (null != fosterwxMobileTaskTimeList.getTaskStartAt() && qwOldTimeList.get(qwOldTimeList.size() - 1).getTaskStartAt() == null) {
+                        if (fosterwxMobile.getWxStatus() != 2) {
+                            ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, fosterwxMobileTaskTimeList, authUser, false, 2);
+                        }
+                    } else if (null != fosterwxMobileTaskTimeList.getTaskEndAt() && qwOldTimeList.get(qwOldTimeList.size() - 1).getTaskEndAt() == null) {
                         fosterwxMobileTaskTimeListService.update(new FosterwxMobileTaskTimeList() {{
                             setTaskEndAt(fosterwxMobileTaskTimeList.getTaskEndAt());
                         }}, new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()));
@@ -243,7 +308,8 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             }
             // 判断微信状态是否更新为正常
             if (fosterwxMobile.getWxStatus() == 1 && oldVO.getWxStatus() == 2) {
-                ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, oldTimeList.get(oldTimeList.size() - 1), authUser, true);
+                ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, gwOldTimeList.get(gwOldTimeList.size() - 1), authUser, true, 1);
+                ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, qwOldTimeList.get(qwOldTimeList.size() - 1), authUser, true, 2);
             }
             if (ajaxResult != null) {
                 return AjaxResult.error(id + "账号批量操作中出现错误");
@@ -330,7 +396,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         for (int i = 1; i <= dayOfMonth; i++) {
             String date = getForsterwxMobileHandle.getYear() + "-" + String.format("%02d", Integer.valueOf(getForsterwxMobileHandle.getMonth())) + "-" + String.format("%02d", i);
 
-            List<FosterwxTaskSchedule> fosterwxTaskScheduleList = fosterwxTaskScheduleService.getTaskListByMobileCode(stationId, mobileCode, date);
+            List<FosterwxTaskSchedule> fosterwxTaskScheduleList = fosterwxTaskScheduleService.getTaskListByMobileCode(stationId, mobileCode, date, getForsterwxMobileHandle.getType());
 
             fosterwxTaskScheduleList.forEach(fosterwxTaskSchedule -> {
                 FosterwxTaskTemplate fosterwxTaskTemplate = fosterwxTaskTemplateService.getById(fosterwxTaskSchedule.getTemplateId());
@@ -613,114 +679,205 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
                 group -= 1;
             }
 
-            // 任务开始时间不一致ids
-            List<FosterwxTaskSchedule> taskStartIds = new ArrayList<>();
-            // 任务结束时间不一致ids
-            List<FosterwxTaskSchedule> taskEndIds = new ArrayList<>();
-            // 任务模板不一致ids
-            List<FosterwxTaskSchedule> taskTemplateIds = new ArrayList<>();
-
-            // 循环所属分组
-            for (int mobileCode = group * 33 + 1; mobileCode < (group + 1) * 33 + 1; mobileCode++) {
-                // 待检查的账号任务详情
-                FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList = editHandle.getRaw().getTaskTimeLists().get(editHandle.getRaw().getTaskTimeLists().size() - 1);
-                // 唯一码
-                String mobileUnionCode = stationName + String.format("%03d", mobileCode);
-                FosterwxMobile checkVO = fosterwxMobileService.getOne(new LambdaQueryWrapper<FosterwxMobile>().eq(FosterwxMobile::getMobileUnioCode, mobileUnionCode).last("limit 1"));
-                // 账号存在的情况下 才去判断任务详情是否一致
-                if (checkVO != null && !Objects.equals(checkVO.getMobileCode(), editHandle.getRaw().getMobileCode())) {
-                    FosterwxMobileTaskTimeList checkTaskTime = fosterwxMobileTaskTimeListService.getOne(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, checkVO.getMobileUnioCode()).last("limit 1"));
-                    if (null == checkTaskTime) {
+
+            Map<String, List<FosterwxTaskSchedule>> warningMap = getWarningMap(group, editHandle, stationName);
+
+            // 检查结束 开始拼接前台报错信息
+            String gwTaskStartMobile = fosterwxTaskScheduleService.getMobileCodeCombine(warningMap.get("gwTaskStartIds"));
+            String gwTaskEndMobile = fosterwxTaskScheduleService.getMobileCodeCombine(warningMap.get("gwTaskEndIds"));
+            String gwTemplateMobile = fosterwxTaskScheduleService.getMobileCodeCombine(warningMap.get("gwTaskTemplateIds"));
+            String qwTaskStartMobile = fosterwxTaskScheduleService.getMobileCodeCombine(warningMap.get("qwTaskStartIds"));
+            String qwTaskEndMobile = fosterwxTaskScheduleService.getMobileCodeCombine(warningMap.get("qwTaskEndIds"));
+            String qwTemplateMobile = fosterwxTaskScheduleService.getMobileCodeCombine(warningMap.get("qwTaskTemplateIds"));
+
+            // 个微任务详情检查
+            StringBuffer warningInfo = new StringBuffer();
+
+            StringBuffer gwInfo = getWarningInfo(gwTaskStartMobile, gwTaskEndMobile, gwTemplateMobile, editHandle);
+            StringBuffer qwInfo = getWarningInfo(qwTaskStartMobile, qwTaskEndMobile, qwTemplateMobile, editHandle);
+
+            if (gwInfo.length() > 0) {
+                warningInfo.append("<strong style=\"color: #FF0012\">个微任务:</strong><br>").append(gwInfo);
+            }
+            if (qwInfo.length() > 0) {
+                warningInfo.append("<strong style=\"color: #FF0012\">企微任务:</strong><br>").append(qwInfo);
+            }
+            return AjaxResult.success(AjaxResult.MSG_TAG, warningInfo.toString());
+        } else {
+            // 多个账号只要进行提醒
+            List<FosterwxTaskSchedule> fosterwxTaskScheduleList = new ArrayList<>();
+            idList.forEach(id -> {
+                FosterwxMobile fosterwxMobile = fosterwxMobileService.getById(id);
+                fosterwxTaskScheduleList.add(new FosterwxTaskSchedule() {{
+                    setMobileCode(fosterwxMobile.getMobileCode());
+                }});
+            });
+
+            String mobileCode = fosterwxTaskScheduleService.getMobileCodeCombine(fosterwxTaskScheduleList);
+            return AjaxResult.success(AjaxResult.MSG_TAG, "本地编辑账号编号为" + mobileCode + "，是否确认保存");
+        }
+    }
+
+    /**
+     * 任务详情检查报错
+     * @param taskStartMobile
+     * @param taskEndMobile
+     * @param templateMobile
+     * @param editHandle
+     * @return
+     */
+    private StringBuffer getWarningInfo(String taskStartMobile, String taskEndMobile, String templateMobile, @Valid EditHandle<FosterwxMobile> editHandle) {
+        StringBuffer warningInfo = new StringBuffer();
+        if (!taskStartMobile.isEmpty() || !taskEndMobile.isEmpty() || !templateMobile.isEmpty()) {
+            if (Objects.equals(taskStartMobile, taskEndMobile) && Objects.equals(taskStartMobile, templateMobile)) {
+                // 全部相等的情况下一起报错
+                warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致，任务结束时间不一致，任务模板不一致，是否确认保存").append("<br>");
+            } else if (Objects.equals(taskStartMobile, taskEndMobile) && !taskStartMobile.isEmpty()) {
+                // 开始做任务时间还有 结束做任务时间不一致的id一样的情况下
+                warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致，任务结束时间不一致，是否确认保存").append("<br>");
+                if (null != templateMobile) {
+                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(templateMobile).append("账号，").append("任务模板不一致,是否确认保存").append("<br>");
+                }
+            } else if (Objects.equals(taskStartMobile, templateMobile) && !taskStartMobile.isEmpty()) {
+                // 开始做任务时间还有 模板任务不一致的id一样的情况下
+                warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致，任务模板不一致，是否确认保存").append("<br>");
+                if (null != taskEndMobile) {
+                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskEndMobile).append("账号，").append("任务结束时间不一致,是否确认保存").append("<br>");
+                }
+            } else if (Objects.equals(taskEndMobile, templateMobile) && !taskEndMobile.isEmpty()) {
+                // 开始做任务时间还有 模板任务不一致的id一样的情况下
+                warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskEndMobile).append("账号，").append("任务结束时间不一致，任务模板不一致，是否确认保存").append("<br>");
+                if (null != taskStartMobile) {
+                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致,是否确认保存").append("<br>");
+                }
+            } else {
+                if (!taskStartMobile.isEmpty()) {
+                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致,是否确认保存").append("<br>");
+                }
+                if (!taskEndMobile.isEmpty()) {
+                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskEndMobile).append("账号，").append("任务结束时间不一致,是否确认保存").append("<br>");
+                }
+                if (!templateMobile.isEmpty()) {
+                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(templateMobile).append("账号，").append("任务模板不一致,是否确认保存").append("<br>");
+                }
+            }
+        }
+
+        return warningInfo;
+    }
+
+    /**
+     * 根据分组辅助检查 开始时间 结束时间 模板id
+     * @param group
+     * @param editHandle
+     * @param stationName
+     * @return
+     */
+    private Map<String, List<FosterwxTaskSchedule>> getWarningMap(int group, EditHandle<FosterwxMobile> editHandle, String stationName) {
+        Map<String, List<FosterwxTaskSchedule>> map = new HashMap<>();
+        List<FosterwxTaskSchedule> gwTaskStartIds = new ArrayList<>();
+        List<FosterwxTaskSchedule> gwTaskEndIds = new ArrayList<>();
+        List<FosterwxTaskSchedule> gwTaskTemplateIds = new ArrayList<>();
+        List<FosterwxTaskSchedule> qwTaskStartIds = new ArrayList<>();
+        List<FosterwxTaskSchedule> qwTaskEndIds = new ArrayList<>();
+        List<FosterwxTaskSchedule> qwTaskTemplateIds = new ArrayList<>();
+
+        // 待检查的账号任务详情
+        FosterwxMobileTaskTimeList gwTimeList = null;
+        FosterwxMobileTaskTimeList qwTimeList = null;
+        if (null != editHandle.getRaw().getGwTaskTimeLists() && !editHandle.getRaw().getGwTaskTimeLists().isEmpty()) {
+            gwTimeList = editHandle.getRaw().getGwTaskTimeLists().get(editHandle.getRaw().getGwTaskTimeLists().size() - 1);
+        }
+        if (null != editHandle.getRaw().getQwTaskTimeLists()) {
+            qwTimeList = editHandle.getRaw().getQwTaskTimeLists().get(editHandle.getRaw().getQwTaskTimeLists().size() - 1);
+        }
+
+        // 循环所属分组
+        for (int mobileCode = group * 33 + 1; mobileCode < (group + 1) * 33 + 1; mobileCode++) {
+            // 唯一码
+            String mobileUnionCode = stationName + String.format("%03d", mobileCode);
+            FosterwxMobile checkVO = fosterwxMobileService.getOne(new LambdaQueryWrapper<FosterwxMobile>().eq(FosterwxMobile::getMobileUnioCode, mobileUnionCode).last("limit 1"));
+            // 账号存在的情况下 才去判断任务详情是否一致
+            if (checkVO != null && !Objects.equals(checkVO.getMobileCode(), editHandle.getRaw().getMobileCode())) {
+                if (null != gwTimeList) {
+                    FosterwxMobileTaskTimeList gwCheckTaskTime = fosterwxMobileTaskTimeListService.getOne(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, checkVO.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 1).last("limit 1"));
+                    if (null == gwCheckTaskTime) {
                         // 对照组的任务详情没有时 直接报错
-                        taskStartIds.add(new FosterwxTaskSchedule() {{
+                        gwTaskStartIds.add(new FosterwxTaskSchedule() {{
                             setMobileCode(checkVO.getMobileCode());
                         }});
-                        taskEndIds.add(new FosterwxTaskSchedule() {{
+                        gwTaskEndIds.add(new FosterwxTaskSchedule() {{
                             setMobileCode(checkVO.getMobileCode());
                         }});
-                        taskTemplateIds.add(new FosterwxTaskSchedule() {{
+                        gwTaskTemplateIds.add(new FosterwxTaskSchedule() {{
                             setMobileCode(checkVO.getMobileCode());
                         }});
                     } else {
                         // 如果开始时间不一致
-                        if (!Objects.equals(checkTaskTime.getTaskStartAt(), fosterwxMobileTaskTimeList.getTaskStartAt())) {
-                            taskStartIds.add(new FosterwxTaskSchedule() {{
+                        if (!Objects.equals(gwCheckTaskTime.getTaskStartAt(), gwTimeList.getTaskStartAt())) {
+                            gwTaskStartIds.add(new FosterwxTaskSchedule() {{
                                 setMobileCode(checkVO.getMobileCode());
                             }});
                         }
                         // 如果结束时间不一致
-                        if (!Objects.equals(checkTaskTime.getTaskEndAt(), fosterwxMobileTaskTimeList.getTaskEndAt())) {
-                            taskEndIds.add(new FosterwxTaskSchedule() {{
+                        if (!Objects.equals(gwCheckTaskTime.getTaskEndAt(), gwTimeList.getTaskEndAt())) {
+                            gwTaskEndIds.add(new FosterwxTaskSchedule() {{
                                 setMobileCode(checkVO.getMobileCode());
                             }});
                         }
                         // 如果任务模板不一致
-                        if (!Objects.equals(checkTaskTime.getTemplateId(), fosterwxMobileTaskTimeList.getTemplateId())) {
-                            taskTemplateIds.add(new FosterwxTaskSchedule() {{
+                        if (!Objects.equals(gwCheckTaskTime.getTemplateId(), gwTimeList.getTemplateId())) {
+                            gwTaskTemplateIds.add(new FosterwxTaskSchedule() {{
                                 setMobileCode(checkVO.getMobileCode());
                             }});
                         }
                     }
                 }
-            }
-
-            // 检查结束 开始拼接前台报错信息
-            String taskStartMobile = fosterwxTaskScheduleService.getMobileCodeCombine(taskStartIds);
-            String taskEndMobile = fosterwxTaskScheduleService.getMobileCodeCombine(taskEndIds);
-            String templateMobile = fosterwxTaskScheduleService.getMobileCodeCombine(taskTemplateIds);
 
-            StringBuffer warningInfo = new StringBuffer();
-            if (!taskStartIds.isEmpty() || !taskEndIds.isEmpty() || !taskTemplateIds.isEmpty()) {
-                if (Objects.equals(taskStartMobile, taskEndMobile) && Objects.equals(taskStartMobile, templateMobile)) {
-                    // 全部相等的情况下一起报错
-                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致，任务结束时间不一致，任务模板不一致，是否确认保存");
-                    return AjaxResult.success(AjaxResult.MSG_TAG, warningInfo);
-                } else if (Objects.equals(taskStartMobile, taskEndMobile) && !taskStartMobile.isEmpty()) {
-                    // 开始做任务时间还有 结束做任务时间不一致的id一样的情况下
-                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致，任务结束时间不一致，是否确认保存").append("<br>");
-                    if (null != templateMobile) {
-                        warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(templateMobile).append("账号，").append("任务模板不一致,是否确认保存");
-                    }
-                } else if (Objects.equals(taskStartMobile, templateMobile) && !taskStartMobile.isEmpty()) {
-                    // 开始做任务时间还有 模板任务不一致的id一样的情况下
-                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致，任务模板不一致，是否确认保存").append("<br>");
-                    if (null != taskEndMobile) {
-                        warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskEndMobile).append("账号，").append("任务结束时间不一致,是否确认保存");
-                    }
-                } else if (Objects.equals(taskEndMobile, templateMobile) && !taskEndMobile.isEmpty()) {
-                    // 开始做任务时间还有 模板任务不一致的id一样的情况下
-                    warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskEndMobile).append("账号，").append("任务结束时间不一致，任务模板不一致，是否确认保存").append("<br>");
-                    if (null != taskStartMobile) {
-                        warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致,是否确认保存");
-                    }
-                } else {
-                    if (!taskStartMobile.isEmpty()) {
-                        warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskStartMobile).append("账号，").append("任务开始时间不一致,是否确认保存").append("<br>");
-                    }
-                    if (!taskEndMobile.isEmpty()) {
-                        warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(taskEndMobile).append("账号，").append("任务结束时间不一致,是否确认保存").append("<br>");
-                    }
-                    if (!templateMobile.isEmpty()) {
-                        warningInfo.append("编号").append(editHandle.getRaw().getMobileCode()).append("账号，与编号").append(templateMobile).append("账号，").append("任务模板不一致,是否确认保存");
+                if (null != qwTimeList) {
+                    FosterwxMobileTaskTimeList qwCheckTaskTime = fosterwxMobileTaskTimeListService.getOne(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, checkVO.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, 2).last("limit 1"));
+                    if (null == qwCheckTaskTime) {
+                        // 对照组的任务详情没有时 直接报错
+                        qwTaskStartIds.add(new FosterwxTaskSchedule() {{
+                            setMobileCode(checkVO.getMobileCode());
+                        }});
+                        qwTaskEndIds.add(new FosterwxTaskSchedule() {{
+                            setMobileCode(checkVO.getMobileCode());
+                        }});
+                        qwTaskTemplateIds.add(new FosterwxTaskSchedule() {{
+                            setMobileCode(checkVO.getMobileCode());
+                        }});
+                    } else {
+                        // 如果开始时间不一致
+                        if (!Objects.equals(qwCheckTaskTime.getTaskStartAt(), qwTimeList.getTaskStartAt())) {
+                            qwTaskStartIds.add(new FosterwxTaskSchedule() {{
+                                setMobileCode(checkVO.getMobileCode());
+                            }});
+                        }
+                        // 如果结束时间不一致
+                        if (!Objects.equals(qwCheckTaskTime.getTaskEndAt(), qwTimeList.getTaskEndAt())) {
+                            qwTaskEndIds.add(new FosterwxTaskSchedule() {{
+                                setMobileCode(checkVO.getMobileCode());
+                            }});
+                        }
+                        // 如果任务模板不一致
+                        if (!Objects.equals(qwCheckTaskTime.getTemplateId(), qwTimeList.getTemplateId())) {
+                            qwTaskTemplateIds.add(new FosterwxTaskSchedule() {{
+                                setMobileCode(checkVO.getMobileCode());
+                            }});
+                        }
                     }
                 }
-                return AjaxResult.success(AjaxResult.MSG_TAG, warningInfo);
-            } else {
-                return AjaxResult.success(AjaxResult.MSG_TAG, "");
             }
-        } else {
-            // 多个账号只要进行提醒
-            List<FosterwxTaskSchedule> fosterwxTaskScheduleList = new ArrayList<>();
-            idList.forEach(id -> {
-                FosterwxMobile fosterwxMobile = fosterwxMobileService.getById(id);
-                fosterwxTaskScheduleList.add(new FosterwxTaskSchedule() {{
-                    setMobileCode(fosterwxMobile.getMobileCode());
-                }});
-            });
-
-            String mobileCode = fosterwxTaskScheduleService.getMobileCodeCombine(fosterwxTaskScheduleList);
-            return AjaxResult.success(AjaxResult.MSG_TAG, "本地编辑账号编号为" + mobileCode + "，是否确认保存");
         }
+        map.put("gwTaskStartIds", gwTaskStartIds);
+        map.put("gwTaskEndIds", gwTaskEndIds);
+        map.put("gwTaskTemplateIds", gwTaskTemplateIds);
+        map.put("qwTaskStartIds", qwTaskStartIds);
+        map.put("qwTaskEndIds", qwTaskEndIds);
+        map.put("qwTaskTemplateIds", qwTaskTemplateIds);
+
+        return map;
     }
 
     /**
@@ -736,7 +893,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         FosterwxMobile fosterwxMobile = fosterwxMobileService.getById(idList.get(0));
         if (fosterwxMobile == null) return AjaxResult.error("无法获取账号");
 
-        baseList = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()));
+        baseList = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, editHandle.getRaw().getType()));
         FosterwxMobileTaskTimeList baseVO = null;
 
         if (!baseList.isEmpty()) {
@@ -748,7 +905,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             fosterwxMobile = fosterwxMobileService.getById(idList.get(i));
             if (fosterwxMobile == null) return AjaxResult.error("无法获取账号");
 
-            compareList = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()));
+            compareList = fosterwxMobileTaskTimeListService.list(new LambdaQueryWrapper<FosterwxMobileTaskTimeList>().eq(FosterwxMobileTaskTimeList::getMobileUnioCode, fosterwxMobile.getMobileUnioCode()).eq(FosterwxMobileTaskTimeList::getType, editHandle.getRaw().getType()));
 
             // 进行判断
             if ((baseList.isEmpty() && !compareList.isEmpty()) || (!baseList.isEmpty() && compareList.isEmpty()))

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

@@ -123,7 +123,7 @@ public class FosterwxTaskListController extends BaseController<FosterwxTaskList>
             // 封禁的状态下不新增任务
             if (2 == fosterwxMobile.getWxStatus()) continue;
 
-            fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, new FosterwxMobileTaskTimeList(), authUser, true);
+            // fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, new FosterwxMobileTaskTimeList(), authUser, true);
         }
 
         if (res) {
@@ -204,7 +204,5 @@ public class FosterwxTaskListController extends BaseController<FosterwxTaskList>
 
         return AjaxResult.success(HttpMsg.importSuccess);
     }
-
-
 }
 

src/main/java/com/mokamrp/privates/entity/pangu/FosterwxTaskTemplateHandle.java

@@ -8,4 +8,5 @@ public class FosterwxTaskTemplateHandle {
     private Integer pagesize;
     private Integer id;
     private String templateName;
+    private String templateType;
 }

src/main/java/com/mokamrp/privates/entity/pangu/GetForsterwxMobileHandle.java

@@ -26,6 +26,7 @@ public class GetForsterwxMobileHandle {
     private List<Integer> Ids;
     private String prop;
     private String order;
+    private Integer type;
 
     public Integer getPage() {
         return page;

src/main/java/com/mokamrp/privates/entity/pangu/GetForsterwxStationHandle.java

@@ -10,7 +10,8 @@ public class GetForsterwxStationHandle {
     private String  stationName;
     private String  stationAdminName;
     private Integer stationUid;
-    private Integer taskTemplateId;
+    private Integer gwTaskTemplateId;
+    private Integer qwTaskTemplateId;
     private Integer vip;
     private String  uploadUid;
 }

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxMobileTaskTimeListMapper.xml

@@ -9,6 +9,7 @@
         <result column="mobile_code" property="mobileCode"/>
         <result column="mobile_unio_code" property="mobileUnioCode"/>
         <result column="template_id" property="templateId"/>
+        <result column="type" property="type" />
         <result column="task_start_at" property="taskStartAt"/>
         <result column="task_end_at" property="taskEndAt"/>
         <result column="default_send_time" property="defaultSendTime" />
@@ -18,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, station_id, mobile_code, mobile_unio_code, template_id, task_start_at, task_end_at, default_send_time, create_at, update_at
+        id, station_id, mobile_code, mobile_unio_code, template_id, type, task_start_at, task_end_at, default_send_time, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobileTaskTimeList">
         SELECT *

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxStationMapper.xml

@@ -5,7 +5,8 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation">
         <id column="id" property="id" />
-        <result column="task_template_id" property="taskTemplateId"/>
+        <result column="gw_task_template_id" property="gwTaskTemplateId" />
+        <result column="qw_task_template_id" property="qwTaskTemplateId" />
         <result column="station_name" property="stationName" />
         <result column="station_uid" property="stationUid" />
         <result column="box_share_url" property="boxShareUrl" />
@@ -16,7 +17,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , taskTemplateId, station_name, station_uid, box_share_url, upload_uid, create_at, upload_at
+        , gw_task_template_id, qw_task_template_id, station_name, station_uid, box_share_url, upload_uid, create_at, upload_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation">
         SELECT * FROM pan_fosterwx_station
@@ -24,7 +25,8 @@
             <if test="param.id != null">and id = #{param.id}</if>
             <if test="param.stationName != null">and station_name = #{param.stationName}</if>
             <if test="param.stationAdminName!= null">and station_admin_name like CONCAT('%',#{param.stationAdminName},'%')</if>
-            <if test="param.taskTemplateId != null">and task_template_id = #{param.taskTemplateId}</if>
+            <if test="param.gwTaskTemplateId != null">and gw_task_template_id = #{param.gwTaskTemplateId}</if>
+            <if test="param.qwTaskTemplateId != null">and qw_task_template_id = #{param.qwTaskTemplateId}</if>
             <if test="param.uploadUid != null">and upload_uid = #{param.uploadUid}</if>
             <if test="param.vip != null">and vip = #{param.vip}</if>
         </where>

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxTaskScheduleMapper.xml

@@ -14,6 +14,7 @@
         <result column="task_content" property="taskContent"/>
         <result column="task_status" property="taskStatus"/>
         <result column="task_send_status" property="taskSendStatus"/>
+        <result column="type" property="type" />
         <result column="send_date" property="sendDate"/>
         <result column="send_time" property="sendTime"/>
         <result column="err_msg" property="errMsg"/>
@@ -28,7 +29,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , station_id, station_name, mobile_code, template_id, task_id, task_name, task_content, task_status, task_send_status, send_date, send_time, err_msg, mark, del_flg, create_uid, update_uid, create_at, update_at
+        , station_id, station_name, mobile_code, template_id, task_id, task_name, task_content, task_status, task_send_status, type, send_date, send_time, err_msg, mark, del_flg, create_uid, update_uid, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule">
         SELECT *

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxTaskTemplateMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate">
         <id column="id" property="id"/>
         <result column="template_name" property="templateName"/>
+        <result column="template_type" property="templateType" />
         <result column="del_flg" property="delFlg"/>
         <result column="create_uid" property="createUid"/>
         <result column="update_uid" property="updateUid"/>
@@ -16,7 +17,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , template_name, del_flg, create_uid, update_uid, create_at, update_at
+        , template_name, template_type, del_flg, create_uid, update_uid, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate">
         SELECT *

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxMobile.java

@@ -182,10 +182,16 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
     private LocalDateTime updateAt;
 
     @TableField(exist = false)
-    private List<FosterwxMobileTaskTimeList> taskTimeLists;
+    private List<FosterwxMobileTaskTimeList> gwTaskTimeLists;
 
     @TableField(exist = false)
-    private Integer templateId;
+    private List<FosterwxMobileTaskTimeList> qwTaskTimeLists;
+
+    @TableField(exist = false)
+    private Integer gwTemplateId;
+
+    @TableField(exist = false)
+    private Integer qwTemplateId;
 
     @TableField(exist = false)
     private String type;

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxMobileTaskTimeList.java

@@ -51,6 +51,11 @@ public class FosterwxMobileTaskTimeList extends Model<FosterwxMobileTaskTimeList
     private Integer templateId;
 
     /**
+     * 类型(1:个微任务 2:企微任务)
+     */
+    private Integer type;
+
+    /**
      * 任务开始时间
      */
     private LocalDateTime taskStartAt;

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxStation.java

@@ -28,10 +28,16 @@ public class FosterwxStation extends Model<FosterwxStation> {
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+
+    /**
+     * 个微任务模板id(pan_fosterwx_task_template.id)
+     */
+    private Integer gwTaskTemplateId;
+
     /**
-     * 任务模板id(pan_fosterwx_task_template.id)
+     * 企微任务模板id(pan_fosterwx_task_template.id)
      */
-    private Integer taskTemplateId;
+    private Integer qwTaskTemplateId;
     /**
      * 站点名称
      */

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxTaskSchedule.java

@@ -78,6 +78,11 @@ public class FosterwxTaskSchedule extends Model<FosterwxTaskSchedule> {
     private Integer taskSendStatus;
 
     /**
+     * 类型(1:个微任务 2:企微任务)
+     */
+    private Integer type;
+
+    /**
      * 发送日期
      */
     private LocalDate sendDate;

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxTaskTemplate.java

@@ -33,6 +33,11 @@ public class FosterwxTaskTemplate extends Model<FosterwxTaskTemplate> {
     private String templateName;
 
     /**
+     * 模板类型(1:个微任务 2:企微任务)
+     */
+    private Integer templateType;
+
+    /**
      * 删除标志
      */
     private Integer delFlg;
@@ -74,6 +79,14 @@ public class FosterwxTaskTemplate extends Model<FosterwxTaskTemplate> {
         this.templateName = templateName;
     }
 
+    public Integer getTemplateType() {
+        return templateType;
+    }
+
+    public void setTemplateType(Integer templateType) {
+        this.templateType = templateType;
+    }
+
     public Integer getDelFlg() {
         return delFlg;
     }

src/main/java/com/mokamrp/privates/service/pangu/FosterwxMobileTaskTimeListService.java

@@ -24,6 +24,7 @@ public interface FosterwxMobileTaskTimeListService extends IService<FosterwxMobi
      * 根据账号新增任务时间数据
      * @param raw
      * @param fosterwxMobileTaskTimeList
+     * @param type
      */
-    void insertByMobile(FosterwxMobile raw, FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList);
+    void insertByMobile(FosterwxMobile raw, FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList, Integer type);
 }

src/main/java/com/mokamrp/privates/service/pangu/FosterwxTaskScheduleService.java

@@ -29,8 +29,9 @@ public interface FosterwxTaskScheduleService extends IService<FosterwxTaskSchedu
      * @param fosterwxMobileTaskTimeList
      * @param authUser
      * @param isChange
+     * @param type
      */
-    public AjaxResult insertByTaskDate(FosterwxMobile fosterwxMobile, FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList, User authUser, boolean isChange);
+    public AjaxResult insertByTaskDate(FosterwxMobile fosterwxMobile, FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList, User authUser, boolean isChange, Integer type);
 
     /**
      * 根据当天时间删除后续的任务
@@ -59,6 +60,7 @@ public interface FosterwxTaskScheduleService extends IService<FosterwxTaskSchedu
      * @param stationId
      * @param mobileCode
      * @param date
+     * @param type (1:个微任务,2:企微任务)
      */
-    List<FosterwxTaskSchedule> getTaskListByMobileCode(Integer stationId, Integer mobileCode, String date);
+    List<FosterwxTaskSchedule> getTaskListByMobileCode(Integer stationId, Integer mobileCode, String date, Integer type);
 }

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxMobileTaskTimeListServiceImpl.java

@@ -48,14 +48,16 @@ public class FosterwxMobileTaskTimeListServiceImpl extends ServiceImpl<FosterwxM
      * 根据账号新增任务时间数据
      * @param raw
      * @param fosterwxMobileTaskTimeList
+     * @param type
      */
     @Override
-    public void insertByMobile(FosterwxMobile raw, FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList) {
+    public void insertByMobile(FosterwxMobile raw, FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList, Integer type) {
         FosterwxMobileTaskTimeList insertVO = new FosterwxMobileTaskTimeList();
         insertVO.setStationId(raw.getStationId());
         insertVO.setMobileCode(raw.getMobileCode());
         insertVO.setMobileUnioCode(raw.getMobileUnioCode());
         insertVO.setTemplateId(fosterwxMobileTaskTimeList.getTemplateId());
+        insertVO.setType(type);
         insertVO.setTaskStartAt(fosterwxMobileTaskTimeList.getTaskStartAt());
         insertVO.setTaskEndAt(fosterwxMobileTaskTimeList.getTaskEndAt());
         insertVO.setDefaultSendTime(fosterwxMobileTaskTimeList.getDefaultSendTime());

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskScheduleServiceImpl.java

@@ -84,9 +84,10 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
      * @param fosterwxMobileTaskTimeList
      * @param authUser
      * @param isChange
+     * @param type
      */
     @Override
-    public AjaxResult insertByTaskDate(FosterwxMobile fosterwxMobile, FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList, User authUser, boolean isChange) {
+    public AjaxResult insertByTaskDate(FosterwxMobile fosterwxMobile, FosterwxMobileTaskTimeList fosterwxMobileTaskTimeList, User authUser, boolean isChange, Integer type) {
         // 获取站点信息
         FosterwxStation fosterwxStation = fosterwxStationMapper.selectById(fosterwxMobile.getStationId());
 
@@ -144,6 +145,7 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
                 fosterwxTaskSchedule.setTaskStatus(0);
             }
             fosterwxTaskSchedule.setTaskSendStatus(0);
+            fosterwxTaskSchedule.setType(type);
             fosterwxTaskSchedule.setSendDate(startDate);
             // 根据默认任务发送时间设置任务发送时间
             fosterwxTaskSchedule.setSendTime(LocalDateTime.of(startDate, fosterwxMobileTaskTimeList.getDefaultSendTime()));
@@ -183,7 +185,7 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
         LambdaQueryWrapper<FosterwxTaskSchedule> fosterTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
         fosterTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, fosterwxStation.getId());
         fosterTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getMobileCode, fosterwxMobile.getMobileCode());
-        fosterTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTemplateId, fosterwxStation.getTaskTemplateId());
+        fosterTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTemplateId, fosterwxStation.getGwTaskTemplateId());
         fosterTaskScheduleLambdaQueryWrapper.ge(FosterwxTaskSchedule::getSendDate, today);
         fosterTaskScheduleLambdaQueryWrapper.orderByAsc(FosterwxTaskSchedule::getId);
 
@@ -281,11 +283,12 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
     }
 
     @Override
-    public List<FosterwxTaskSchedule> getTaskListByMobileCode(Integer stationId, Integer mobileCode, String date) {
+    public List<FosterwxTaskSchedule> getTaskListByMobileCode(Integer stationId, Integer mobileCode, String date, Integer type) {
         LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
         fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, stationId);
         fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getMobileCode, mobileCode);
         fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getSendDate, date);
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getType, type);
         fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getDelFlg, 1);
         fosterwxTaskScheduleLambdaQueryWrapper.orderByAsc(FosterwxTaskSchedule::getSendDate);
 

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskTemplateServiceImpl.java

@@ -39,6 +39,8 @@ public class FosterwxTaskTemplateServiceImpl extends ServiceImpl<FosterwxTaskTem
         LambdaQueryWrapper<FosterwxTaskTemplate> taskTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
         if (null != handle.getTemplateName() && !handle.getTemplateName().isEmpty())
             taskTemplateLambdaQueryWrapper.like(FosterwxTaskTemplate::getTemplateName, handle.getTemplateName());
+        if (null != handle.getTemplateType())
+            taskTemplateLambdaQueryWrapper.eq(FosterwxTaskTemplate::getTemplateType, handle.getTemplateType());
         if (null != handle.getId())
             taskTemplateLambdaQueryWrapper.eq(FosterwxTaskTemplate::getId, handle.getId());
         taskTemplateLambdaQueryWrapper.eq(FosterwxTaskTemplate::getDelFlg, 1);

src/test/java/com/mokamrp/AutoMPPangu.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -30,7 +31,7 @@ public class AutoMPPangu {
 				// IEmployeeService
 				.setBaseResultMap(true) //生成sql映射文件
 				.setBaseColumnList(true);//生成sql片段
-		
+
 		//2. 数据源配置
 		DataSourceConfig  dsConfig  = new DataSourceConfig();
 		dsConfig.setDbType(DbType.MYSQL)  // 设置数据库类型
@@ -38,7 +39,7 @@ public class AutoMPPangu {
 				.setUrl("jdbc:mysql://172.18.71.27:3306/mochat")
 				.setUsername("typer")
 				.setPassword("jch9sh_shl");
-		 
+
 		//3. 策略配置
 		StrategyConfig stConfig = new StrategyConfig();
 		stConfig.setCapitalMode(true) //全局大写命名
@@ -47,9 +48,9 @@ public class AutoMPPangu {
 				.setColumnNaming(NamingStrategy.underline_to_camel)
 				.setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略，下划线转驼峰命名
 				.setTablePrefix("pan_") //表名前缀
-				.setInclude("pan_fosterwx_task_list");  //生成的表
-		
-		//4. 包名策略配置 
+				.setInclude("pan_fosterwx_task_schedule");  //生成的表
+
+		//4. 包名策略配置
 		PackageConfig pkConfig = new PackageConfig();
 		pkConfig.setParent("com.mokamrp.privates")
 				.setMapper("mapper.pangu")
@@ -84,7 +85,7 @@ public class AutoMPPangu {
 		//7. 执行
 		ag.execute();
 	}
-	
-	
-	
+
+
+
 }