修改任务模块名称

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

@@ -40,13 +40,13 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
     public FosterwxMobileWxfriendService fosterwxMobileWxfriendService;
 
     @Autowired
-    private FosterTaskScheduleService fosterTaskScheduleService;
+    private FosterwxTaskScheduleService fosterwxTaskScheduleService;
 
     @Autowired
     private FosterwxStationService fosterwxStationService;
 
     @Autowired
-    private FosterTaskListService fosterTaskListService;
+    private FosterwxTaskListService fosterwxTaskListService;
 
     /*
      * @fast
@@ -84,7 +84,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         // 判断开始做任务时间是否设置了
         AjaxResult ajaxResult = null;
         if (null != fosterwxMobile.getTaskStartAt() && fosterwxMobile.getWxStatus() != 2) {
-            ajaxResult = fosterTaskScheduleService.insertByTaskDate(fosterwxMobile, authUser);
+            ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, authUser);
         }
 
         if (null == ajaxResult) return AjaxResult.success("新增账号成功");
@@ -103,20 +103,18 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         AjaxResult ajaxResult = null;
         if (null != fosterwxMobile.getTaskStartAt()) {
             if (fosterwxMobile.getWxStatus() != 2) {
-                ajaxResult = fosterTaskScheduleService.insertByTaskDate(fosterwxMobile, authUser);
+                ajaxResult = fosterwxTaskScheduleService.insertByTaskDate(fosterwxMobile, authUser);
             }
         }
 
         // 判断微信状态是否更新为封禁
         if (fosterwxMobile.getWxStatus() == 2) {
-            ajaxResult = fosterTaskScheduleService.deleteByDate(fosterwxMobile, authUser);
+            ajaxResult = fosterwxTaskScheduleService.deleteByDate(fosterwxMobile, authUser);
         }
 
         if (null == ajaxResult) return AjaxResult.success("更新账号成功");
 
         return ajaxResult;
     }
-
-
 }
 

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

@@ -9,9 +9,9 @@ import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.help.Analysis;
 import com.mokamrp.privates.interceptor.AuthUser;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskList;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList;
 import com.mokamrp.privates.mapper.pojo.User;
-import com.mokamrp.privates.service.pangu.FosterTaskListService;
+import com.mokamrp.privates.service.pangu.FosterwxTaskListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -37,10 +37,10 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 @RestController
 @RequestMapping("/taskList")
-public class FosterTaskListController extends BaseController<FosterTaskList> {
+public class FosterwxTaskListController extends BaseController<FosterwxTaskList> {
 
     @Autowired
-    public FosterTaskListService fosterTaskListService;
+    public FosterwxTaskListService fosterwxTaskListService;
 
     /*
      * @fast
@@ -55,23 +55,23 @@ public class FosterTaskListController extends BaseController<FosterTaskList> {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String, Object> res = fosterTaskListService.getList(postBasePageHandle, taskName, taskContent);
+        Map<String, Object> res = fosterwxTaskListService.getList(postBasePageHandle, taskName, taskContent);
         return AjaxResult.success(res);
     }
 
     @GetMapping("/getMaxTaskName")
     public Object getMaxTaskName(String templateId) {
-        LambdaQueryWrapper<FosterTaskList> taskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        taskListLambdaQueryWrapper.eq(FosterTaskList::getTemplateId, templateId);
-        taskListLambdaQueryWrapper.orderByDesc(FosterTaskList::getTaskName);
+        LambdaQueryWrapper<FosterwxTaskList> taskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        taskListLambdaQueryWrapper.eq(FosterwxTaskList::getTemplateId, templateId);
+        taskListLambdaQueryWrapper.orderByDesc(FosterwxTaskList::getTaskName);
         taskListLambdaQueryWrapper.last("Limit 1");
 
-        FosterTaskList fosterTaskList = fosterTaskListService.getOne(taskListLambdaQueryWrapper);
+        FosterwxTaskList fosterwxTaskList = fosterwxTaskListService.getOne(taskListLambdaQueryWrapper);
 
-        if (null == fosterTaskList) {
+        if (null == fosterwxTaskList) {
             return AjaxResult.success(Constants.SUCCESS, "Day1");
         } else {
-            String taskName = fosterTaskList.getTaskName();
+            String taskName = fosterwxTaskList.getTaskName();
             return AjaxResult.success(Constants.SUCCESS, "Day" + Integer.valueOf(taskName.replace("Day", "") + 1));
         }
     }
@@ -97,17 +97,17 @@ public class FosterTaskListController extends BaseController<FosterTaskList> {
         AtomicInteger i = new AtomicInteger(0);
         row.forEach(map -> {
             i.getAndIncrement();
-            FosterTaskList fosterTaskList = new FosterTaskList();
-            fosterTaskList.setTemplateId(templateId);
-            fosterTaskList.setTaskName("Day" + i);
-            fosterTaskList.setTaskContent(map.get("taskContent"));
-            fosterTaskList.setDelFlg(1);
-            fosterTaskList.setCreateUid(authUser.getId());
-            fosterTaskList.setUpdateUid(authUser.getId());
-            fosterTaskList.setCreateAt(LocalDateTime.now());
-            fosterTaskList.setUpdateAt(LocalDateTime.now());
-
-            fosterTaskListService.save(fosterTaskList);
+            FosterwxTaskList fosterwxTaskList = new FosterwxTaskList();
+            fosterwxTaskList.setTemplateId(templateId);
+            fosterwxTaskList.setTaskName("Day" + i);
+            fosterwxTaskList.setTaskContent(map.get("taskContent"));
+            fosterwxTaskList.setDelFlg(1);
+            fosterwxTaskList.setCreateUid(authUser.getId());
+            fosterwxTaskList.setUpdateUid(authUser.getId());
+            fosterwxTaskList.setCreateAt(LocalDateTime.now());
+            fosterwxTaskList.setUpdateAt(LocalDateTime.now());
+
+            fosterwxTaskListService.save(fosterwxTaskList);
         });
 
         return AjaxResult.success(HttpMsg.importSuccess);

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

@@ -4,14 +4,11 @@ import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskSchedule;
-import com.mokamrp.privates.service.pangu.FosterTaskScheduleService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule;
+import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Map;
@@ -27,10 +24,10 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/taskSchedule")
-public class FosterTaskScheduleController extends BaseController<FosterTaskSchedule> {
+public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskSchedule> {
 
     @Autowired
-    public FosterTaskScheduleService fosterTaskScheduleService;
+    public FosterwxTaskScheduleService fosterwxTaskScheduleService;
 
     /*
      * @fast
@@ -39,11 +36,14 @@ public class FosterTaskScheduleController extends BaseController<FosterTaskSched
      */
 
     @PostMapping("/list")
-    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult) {
+    public Object list(@RequestParam(required = false) String taskName,
+                       @RequestParam(required = false) Integer stationId,
+                       @RequestParam String date,
+                       @Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String, Object> res = fosterTaskScheduleService.getList(postBasePageHandle);
+        Map<String, Object> res = fosterwxTaskScheduleService.getList(postBasePageHandle, taskName, stationId, date);
         return AjaxResult.success(res);
     }
 

src/main/java/com/mokamrp/privates/controller/pangu/FosterTaskTemplateController.java → src/main/java/com/mokamrp/privates/controller/pangu/FosterwxTaskTemplateController.java

@@ -4,8 +4,8 @@ import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskTemplate;
-import com.mokamrp.privates.service.pangu.FosterTaskTemplateService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate;
+import com.mokamrp.privates.service.pangu.FosterwxTaskTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -24,10 +24,10 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/taskTemplate")
-public class FosterTaskTemplateController extends BaseController<FosterTaskTemplate> {
+public class FosterwxTaskTemplateController extends BaseController<FosterwxTaskTemplate> {
 
     @Autowired
-    public FosterTaskTemplateService fosterTaskTemplateService;
+    public FosterwxTaskTemplateService fosterwxTaskTemplateService;
 
     /*
      * @fast
@@ -40,7 +40,7 @@ public class FosterTaskTemplateController extends BaseController<FosterTaskTempl
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String, Object> res = fosterTaskTemplateService.getList(postBasePageHandle, templateName);
+        Map<String, Object> res = fosterwxTaskTemplateService.getList(postBasePageHandle, templateName);
         return AjaxResult.success(res);
     }
 

src/main/java/com/mokamrp/privates/mapper/pangu/FosterTaskListMapper.java → src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxTaskListMapper.java

@@ -2,7 +2,7 @@ package com.mokamrp.privates.mapper.pangu;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskList;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -16,6 +16,6 @@ import java.util.List;
  * @since 2021-07-23
  */
 @Component
-public interface FosterTaskListMapper extends BaseMapper<FosterTaskList> {
-    public List<FosterTaskList> getList(Page<FosterTaskList> pageObj);
+public interface FosterwxTaskListMapper extends BaseMapper<FosterwxTaskList> {
+    public List<FosterwxTaskList> getList(Page<FosterwxTaskList> pageObj);
 }

src/main/java/com/mokamrp/privates/mapper/pangu/FosterTaskListMapper.xml → src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxTaskListMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mokamrp.privates.mapper.pangu.FosterTaskListMapper">
+<mapper namespace="com.mokamrp.privates.mapper.pangu.FosterwxTaskListMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterTaskList">
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList">
         <id column="id" property="id"/>
         <result column="template_id" property="templateId"/>
         <result column="task_name" property="taskName"/>
@@ -20,7 +20,7 @@
         id
         , template_id, task_name, task_content, del_flg, create_uid, update_uid, create_at, update_at
     </sql>
-    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterTaskList">
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList">
         SELECT *
         FROM pan_task_list
     </select>

src/main/java/com/mokamrp/privates/mapper/pangu/FosterTaskScheduleMapper.java → src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxTaskScheduleMapper.java

@@ -2,7 +2,7 @@ package com.mokamrp.privates.mapper.pangu;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskSchedule;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -16,6 +16,6 @@ import java.util.List;
  * @since 2021-07-23
  */
 @Component
-public interface FosterTaskScheduleMapper extends BaseMapper<FosterTaskSchedule> {
-    public List<FosterTaskSchedule> getList(Page<FosterTaskSchedule> pageObj);
+public interface FosterwxTaskScheduleMapper extends BaseMapper<FosterwxTaskSchedule> {
+    public List<FosterwxTaskSchedule> getList(Page<FosterwxTaskSchedule> pageObj);
 }

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

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mokamrp.privates.mapper.pangu.FosterTaskScheduleMapper">
+<mapper namespace="com.mokamrp.privates.mapper.pangu.FosterwxTaskScheduleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterTaskSchedule">
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule">
         <id column="id" property="id"/>
         <result column="station_id" property="stationId"/>
         <result column="station_name" property="stationName"/>
         <result column="mobile_code" property="mobileCode"/>
         <result column="template_id" property="templateId"/>
         <result column="task_id" property="taskId"/>
+        <result column="task_name" property="taskName"/>
         <result column="task_status" property="taskStatus"/>
         <result column="task_send_status" property="taskSendStatus"/>
         <result column="send_date" property="sendDate"/>
@@ -26,10 +27,10 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , station_id, station_name, mobile_code, template_id, task_id, 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_status, task_send_status, 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.FosterTaskSchedule">
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule">
         SELECT *
-        FROM pan_task_schedule
+        FROM pan_fosterwx_task_schedule
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/FosterTaskTemplateMapper.java → src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxTaskTemplateMapper.java

@@ -2,7 +2,7 @@ package com.mokamrp.privates.mapper.pangu;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskTemplate;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -16,6 +16,6 @@ import java.util.List;
  * @since 2021-07-23
  */
 @Component
-public interface FosterTaskTemplateMapper extends BaseMapper<FosterTaskTemplate> {
-    public List<FosterTaskTemplate> getList(Page<FosterTaskTemplate> pageObj);
+public interface FosterwxTaskTemplateMapper extends BaseMapper<FosterwxTaskTemplate> {
+    public List<FosterwxTaskTemplate> getList(Page<FosterwxTaskTemplate> pageObj);
 }

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mokamrp.privates.mapper.pangu.FosterTaskTemplateMapper">
+<mapper namespace="com.mokamrp.privates.mapper.pangu.FosterwxTaskTemplateMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterTaskTemplate">
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate">
         <id column="id" property="id"/>
         <result column="template_name" property="templateName"/>
         <result column="del_flg" property="delFlg"/>
@@ -18,7 +18,7 @@
         id
         , template_name, del_flg, create_uid, update_uid, create_at, update_at
     </sql>
-    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterTaskTemplate">
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate">
         SELECT *
         FROM pan_task_template
     </select>

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterTaskList.java → src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxTaskList.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
  * @since 2021-07-23
  */
 @TableName("pan_fosterwx_task_list")
-public class FosterTaskList extends Model<FosterTaskList> {
+public class FosterwxTaskList extends Model<FosterwxTaskList> {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  * @since 2021-07-23
  */
 @TableName("pan_fosterwx_task_schedule")
-public class FosterTaskSchedule extends Model<FosterTaskSchedule> {
+public class FosterwxTaskSchedule extends Model<FosterwxTaskSchedule> {
 
     private static final long serialVersionUID = 1L;
 
@@ -54,6 +54,11 @@ public class FosterTaskSchedule extends Model<FosterTaskSchedule> {
     private Integer taskId;
 
     /**
+     * 任务名称
+     */
+    private String taskName;
+
+    /**
      * 任务完成状态(0:待完成,1:已完成,2:已过期)
      */
     private Integer taskStatus;
@@ -157,6 +162,14 @@ public class FosterTaskSchedule extends Model<FosterTaskSchedule> {
         this.taskId = taskId;
     }
 
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
     public Integer getTaskStatus() {
         return taskStatus;
     }
@@ -252,13 +265,14 @@ public class FosterTaskSchedule extends Model<FosterTaskSchedule> {
 
     @Override
     public String toString() {
-        return "TaskSchedule{" +
+        return "FosterwxTaskSchedule{" +
                 "id=" + id +
                 ", stationId=" + stationId +
                 ", stationName=" + stationName +
                 ", mobileCode=" + mobileCode +
                 ", templateId=" + templateId +
                 ", taskId=" + taskId +
+                ", taskName=" + taskName +
                 ", taskStatus=" + taskStatus +
                 ", taskSendStatus=" + taskSendStatus +
                 ", sendDate=" + sendDate +

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

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
  * @since 2021-07-23
  */
 @TableName("pan_fosterwx_task_template")
-public class FosterTaskTemplate extends Model<FosterTaskTemplate> {
+public class FosterwxTaskTemplate extends Model<FosterwxTaskTemplate> {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/mokamrp/privates/service/pangu/FosterTaskListService.java → src/main/java/com/mokamrp/privates/service/pangu/FosterwxTaskListService.java

@@ -2,7 +2,7 @@ package com.mokamrp.privates.service.pangu;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.PostBasePageHandle;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskList;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author leon
  * @since 2021-07-23
  */
-public interface FosterTaskListService extends IService<FosterTaskList> {
+public interface FosterwxTaskListService extends IService<FosterwxTaskList> {
     //.@leon 获取数据列表
     public Map<String, Object> getList(PostBasePageHandle handle, String taskName, String taskContent);
 }

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

@@ -3,8 +3,8 @@ package com.mokamrp.privates.service.pangu;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskSchedule;
 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;
@@ -17,9 +17,9 @@ import java.util.Map;
  * @author leon
  * @since 2021-07-23
  */
-public interface FosterTaskScheduleService extends IService<FosterTaskSchedule> {
+public interface FosterwxTaskScheduleService extends IService<FosterwxTaskSchedule> {
     //.@leon 获取数据列表
-    public Map<String, Object> getList(PostBasePageHandle handle);
+    public Map<String, Object> getList(PostBasePageHandle handle, String taskName, Integer stationId, String date);
 
 
     /**

src/main/java/com/mokamrp/privates/service/pangu/FosterTaskTemplateService.java → src/main/java/com/mokamrp/privates/service/pangu/FosterwxTaskTemplateService.java

@@ -2,7 +2,7 @@ package com.mokamrp.privates.service.pangu;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.PostBasePageHandle;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskTemplate;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author leon
  * @since 2021-07-23
  */
-public interface FosterTaskTemplateService extends IService<FosterTaskTemplate> {
+public interface FosterwxTaskTemplateService extends IService<FosterwxTaskTemplate> {
     //.@leon 获取数据列表
     public Map<String, Object> getList(PostBasePageHandle handle, String templateName);
 }

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

@@ -1,147 +0,0 @@
-package com.mokamrp.privates.service.pangu.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mokamrp.privates.entity.PostBasePageHandle;
-import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.mapper.pangu.FosterTaskListMapper;
-import com.mokamrp.privates.mapper.pangu.FosterTaskScheduleMapper;
-import com.mokamrp.privates.mapper.pangu.FosterwxStationMapper;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskList;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskSchedule;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
-import com.mokamrp.privates.mapper.pojo.User;
-import com.mokamrp.privates.service.pangu.FosterTaskScheduleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 盘古微信任务排期 服务实现类
- * </p>
- *
- * @author leon
- * @since 2021-07-23
- */
-@Service
-public class FosterTaskScheduleServiceImpl extends ServiceImpl<FosterTaskScheduleMapper, FosterTaskSchedule> implements FosterTaskScheduleService {
-
-    @Autowired
-    public FosterTaskScheduleMapper fosterTaskScheduleMapper;
-
-    @Autowired
-    private FosterwxStationMapper fosterwxStationMapper;
-
-    @Autowired
-    private FosterTaskListMapper fosterTaskListMapper;
-
-    /**
-     * 获取数据列表 支持分页
-     * @param handle
-     * @return
-     */
-    public Map<String, Object> getList(PostBasePageHandle handle) {
-        Integer pagesize = handle.getPagesize();
-        Integer page = handle.getPage();
-        Page<FosterTaskSchedule> pageObj = new Page<FosterTaskSchedule>(page, pagesize);
-        List<FosterTaskSchedule> list = fosterTaskScheduleMapper.getList(pageObj);
-        Map<String, Object> resMap = new HashMap<String, Object>();
-        resMap.put("list", list);
-        resMap.put("total", pageObj.getTotal());
-        return resMap;
-    }
-
-    /**
-     * 根据开始任务时间生成排期
-     * @param fosterwxMobile
-     * @param authUser
-     */
-    @Override
-    public AjaxResult insertByTaskDate(FosterwxMobile fosterwxMobile, User authUser) {
-        // 获取站点信息
-        FosterwxStation fosterwxStation = fosterwxStationMapper.selectById(fosterwxMobile.getStationId());
-
-        if (fosterwxStation == null) return AjaxResult.error(fosterwxMobile.getStationId() + "站点不存在！");
-
-        LocalDate startDate = fosterwxMobile.getTaskStartAt().toLocalDate();
-
-        // 根据站点绑定的任务模板获取模板列表
-        LambdaQueryWrapper<FosterTaskList> fosterTaskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        fosterTaskListLambdaQueryWrapper.eq(FosterTaskList::getTemplateId, fosterwxStation.getTaskTemplateId());
-        List<FosterTaskList> fosterTaskLists = fosterTaskListMapper.selectList(fosterTaskListLambdaQueryWrapper);
-
-        for (FosterTaskList fosterTaskList : fosterTaskLists) {
-            FosterTaskSchedule fosterTaskSchedule = new FosterTaskSchedule();
-            fosterTaskSchedule.setStationId(fosterwxStation.getId());
-            fosterTaskSchedule.setStationName(fosterwxStation.getStationName());
-            fosterTaskSchedule.setMobileCode(fosterwxMobile.getMobileCode());
-            fosterTaskSchedule.setTemplateId(fosterwxStation.getTaskTemplateId());
-            fosterTaskSchedule.setTaskId(fosterTaskList.getId());
-            fosterTaskSchedule.setTaskStatus(0);
-            fosterTaskSchedule.setTaskSendStatus(0);
-            fosterTaskSchedule.setSendDate(startDate);
-            fosterTaskSchedule.setSendTime(null);
-            fosterTaskSchedule.setErrMsg("");
-            fosterTaskSchedule.setMark("");
-            fosterTaskSchedule.setDelFlg(1);
-            fosterTaskSchedule.setCreateUid(authUser.getId());
-            fosterTaskSchedule.setUpdateUid(authUser.getId());
-            fosterTaskSchedule.setCreateAt(LocalDateTime.now());
-            fosterTaskSchedule.setUpdateAt(LocalDateTime.now());
-
-            fosterTaskScheduleMapper.insert(fosterTaskSchedule);
-
-            startDate = startDate.plusDays(1);
-        }
-
-        return AjaxResult.success("新增账号成功");
-    }
-
-    /**
-     * 根据当天时间删除后续任务
-     * @param fosterwxMobileService
-     * @param authUser
-     * @return
-     */
-    @Override
-    public AjaxResult deleteByDate(FosterwxMobile fosterwxMobile, User authUser) {
-        LocalDate today = LocalDate.now();
-        LocalDateTime localDateTime = LocalDateTime.now();
-
-        // 获取站点信息
-        FosterwxStation fosterwxStation = fosterwxStationMapper.selectById(fosterwxMobile.getStationId());
-
-        if (fosterwxStation == null) return AjaxResult.error(fosterwxMobile.getStationId() + "站点不存在！");
-
-        // 根据站点id 手机编号 模板id 获取今天之后的任务
-        LambdaQueryWrapper<FosterTaskSchedule> fosterTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        fosterTaskScheduleLambdaQueryWrapper.eq(FosterTaskSchedule::getStationId, fosterwxStation.getId());
-        fosterTaskScheduleLambdaQueryWrapper.eq(FosterTaskSchedule::getMobileCode, fosterwxMobile.getMobileCode());
-        fosterTaskScheduleLambdaQueryWrapper.eq(FosterTaskSchedule::getTemplateId, fosterwxStation.getTaskTemplateId());
-        fosterTaskScheduleLambdaQueryWrapper.ge(FosterTaskSchedule::getSendDate, today);
-        fosterTaskScheduleLambdaQueryWrapper.orderByAsc(FosterTaskSchedule::getId);
-
-        List<FosterTaskSchedule> fosterTaskScheduleList = fosterTaskScheduleMapper.selectList(fosterTaskScheduleLambdaQueryWrapper);
-
-        for (FosterTaskSchedule fosterTaskSchedule : fosterTaskScheduleList) {
-            // 需要单独判断今天的发送时间是不是已经过去了 没有过去需要删除任务
-            if (fosterTaskSchedule.getSendDate().equals(today) && localDateTime.isAfter(fosterTaskSchedule.getSendTime()))
-                continue;
-
-            FosterTaskSchedule updateVO = new FosterTaskSchedule();
-            updateVO.setId(fosterTaskSchedule.getId());
-            updateVO.setDelFlg(0);
-            fosterTaskScheduleMapper.updateById(updateVO);
-        }
-
-        return AjaxResult.success("修改成功");
-    }
-}

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterTaskListServiceImpl.java → src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskListServiceImpl.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.entity.PostBasePageHandle;
-import com.mokamrp.privates.mapper.pangu.FosterTaskListMapper;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskList;
-import com.mokamrp.privates.service.pangu.FosterTaskListService;
+import com.mokamrp.privates.mapper.pangu.FosterwxTaskListMapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList;
+import com.mokamrp.privates.service.pangu.FosterwxTaskListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,10 +22,10 @@ import java.util.Map;
  * @since 2021-07-23
  */
 @Service
-public class FosterTaskListServiceImpl extends ServiceImpl<FosterTaskListMapper, FosterTaskList> implements FosterTaskListService {
+public class FosterwxTaskListServiceImpl extends ServiceImpl<FosterwxTaskListMapper, FosterwxTaskList> implements FosterwxTaskListService {
 
     @Autowired
-    public FosterTaskListMapper fosterTaskListMapper;
+    public FosterwxTaskListMapper fosterwxTaskListMapper;
 
     /**
      * 获取数据列表 支持分页
@@ -38,11 +38,15 @@ public class FosterTaskListServiceImpl extends ServiceImpl<FosterTaskListMapper,
     public Map<String, Object> getList(PostBasePageHandle handle, String taskName, String taskContent) {
         Integer pageSize = handle.getPagesize();
         Integer page = handle.getPage();
-        Page<FosterTaskList> pageObj = new Page<FosterTaskList>(page, pageSize);
-        LambdaQueryWrapper<FosterTaskList> taskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        taskListLambdaQueryWrapper.eq(FosterTaskList::getTaskName, taskName);
-        taskListLambdaQueryWrapper.eq(FosterTaskList::getTaskContent, taskContent);
-        pageObj = fosterTaskListMapper.selectPage(pageObj, taskListLambdaQueryWrapper);
+        Page<FosterwxTaskList> pageObj = new Page<FosterwxTaskList>(page, pageSize);
+
+        LambdaQueryWrapper<FosterwxTaskList> taskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (null != taskName && !taskName.isEmpty())
+            taskListLambdaQueryWrapper.eq(FosterwxTaskList::getTaskName, taskName);
+        if (null != taskContent && !taskContent.isEmpty())
+            taskListLambdaQueryWrapper.eq(FosterwxTaskList::getTaskContent, taskContent);
+
+        pageObj = fosterwxTaskListMapper.selectPage(pageObj, taskListLambdaQueryWrapper);
         Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("list", pageObj.getRecords());
         resMap.put("total", pageObj.getTotal());

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

@@ -0,0 +1,154 @@
+package com.mokamrp.privates.service.pangu.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pangu.FosterwxStationMapper;
+import com.mokamrp.privates.mapper.pangu.FosterwxTaskListMapper;
+import com.mokamrp.privates.mapper.pangu.FosterwxTaskScheduleMapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule;
+import com.mokamrp.privates.mapper.pojo.User;
+import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 盘古微信任务排期 服务实现类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-07-23
+ */
+@Service
+public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskScheduleMapper, FosterwxTaskSchedule> implements FosterwxTaskScheduleService {
+
+    @Autowired
+    public FosterwxTaskScheduleMapper fosterwxTaskScheduleMapper;
+
+    @Autowired
+    private FosterwxStationMapper fosterwxStationMapper;
+
+    @Autowired
+    private FosterwxTaskListMapper fosterwxTaskListMapper;
+
+    /**
+     * 获取数据列表 支持分页
+     * @param handle
+     * @param taskName
+     * @param stationId
+     * @param date
+     * @return
+     */
+    public Map<String, Object> 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);
+        LambdaQueryWrapper<FosterwxTaskSchedule> fosterTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        // if(null!=taskName&&!taskName.isEmpty()) fosterTaskScheduleLambdaQueryWrapper.eq(FosterTaskSchedule::gettask)
+
+        List<FosterwxTaskSchedule> list = fosterwxTaskScheduleMapper.getList(pageObj);
+        Map<String, Object> resMap = new HashMap<String, Object>();
+        resMap.put("list", list);
+        resMap.put("total", pageObj.getTotal());
+        return resMap;
+    }
+
+    /**
+     * 根据开始任务时间生成排期
+     * @param fosterwxMobile
+     * @param authUser
+     */
+    @Override
+    public AjaxResult insertByTaskDate(FosterwxMobile fosterwxMobile, User authUser) {
+        // 获取站点信息
+        FosterwxStation fosterwxStation = fosterwxStationMapper.selectById(fosterwxMobile.getStationId());
+
+        if (fosterwxStation == null) return AjaxResult.error(fosterwxMobile.getStationId() + "站点不存在！");
+
+        LocalDate startDate = fosterwxMobile.getTaskStartAt().toLocalDate();
+
+        // 根据站点绑定的任务模板获取模板列表
+        LambdaQueryWrapper<FosterwxTaskList> fosterTaskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        fosterTaskListLambdaQueryWrapper.eq(FosterwxTaskList::getTemplateId, fosterwxStation.getTaskTemplateId());
+        List<FosterwxTaskList> fosterwxTaskLists = fosterwxTaskListMapper.selectList(fosterTaskListLambdaQueryWrapper);
+
+        for (FosterwxTaskList fosterwxTaskList : fosterwxTaskLists) {
+            FosterwxTaskSchedule fosterwxTaskSchedule = new FosterwxTaskSchedule();
+            fosterwxTaskSchedule.setStationId(fosterwxStation.getId());
+            fosterwxTaskSchedule.setStationName(fosterwxStation.getStationName());
+            fosterwxTaskSchedule.setMobileCode(fosterwxMobile.getMobileCode());
+            fosterwxTaskSchedule.setTemplateId(fosterwxStation.getTaskTemplateId());
+            fosterwxTaskSchedule.setTaskId(fosterwxTaskList.getId());
+            fosterwxTaskSchedule.setTaskName(fosterwxTaskList.getTaskName());
+            fosterwxTaskSchedule.setTaskStatus(0);
+            fosterwxTaskSchedule.setTaskSendStatus(0);
+            fosterwxTaskSchedule.setSendDate(startDate);
+            fosterwxTaskSchedule.setSendTime(null);
+            fosterwxTaskSchedule.setErrMsg("");
+            fosterwxTaskSchedule.setMark("");
+            fosterwxTaskSchedule.setDelFlg(1);
+            fosterwxTaskSchedule.setCreateUid(authUser.getId());
+            fosterwxTaskSchedule.setUpdateUid(authUser.getId());
+            fosterwxTaskSchedule.setCreateAt(LocalDateTime.now());
+            fosterwxTaskSchedule.setUpdateAt(LocalDateTime.now());
+
+            fosterwxTaskScheduleMapper.insert(fosterwxTaskSchedule);
+
+            startDate = startDate.plusDays(1);
+        }
+
+        return AjaxResult.success("新增账号成功");
+    }
+
+    /**
+     * 根据当天时间删除后续任务
+     * @param fosterwxMobileService
+     * @param authUser
+     * @return
+     */
+    @Override
+    public AjaxResult deleteByDate(FosterwxMobile fosterwxMobile, User authUser) {
+        LocalDate today = LocalDate.now();
+        LocalDateTime localDateTime = LocalDateTime.now();
+
+        // 获取站点信息
+        FosterwxStation fosterwxStation = fosterwxStationMapper.selectById(fosterwxMobile.getStationId());
+
+        if (fosterwxStation == null) return AjaxResult.error(fosterwxMobile.getStationId() + "站点不存在！");
+
+        // 根据站点id 手机编号 模板id 获取今天之后的任务
+        LambdaQueryWrapper<FosterwxTaskSchedule> fosterTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        fosterTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, fosterwxStation.getId());
+        fosterTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getMobileCode, fosterwxMobile.getMobileCode());
+        fosterTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTemplateId, fosterwxStation.getTaskTemplateId());
+        fosterTaskScheduleLambdaQueryWrapper.ge(FosterwxTaskSchedule::getSendDate, today);
+        fosterTaskScheduleLambdaQueryWrapper.orderByAsc(FosterwxTaskSchedule::getId);
+
+        List<FosterwxTaskSchedule> fosterwxTaskScheduleList = fosterwxTaskScheduleMapper.selectList(fosterTaskScheduleLambdaQueryWrapper);
+
+        for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
+            // 需要单独判断今天的发送时间是不是已经过去了 没有过去需要删除任务
+            if (fosterwxTaskSchedule.getSendDate().equals(today) && localDateTime.isAfter(fosterwxTaskSchedule.getSendTime()))
+                continue;
+
+            FosterwxTaskSchedule updateVO = new FosterwxTaskSchedule();
+            updateVO.setId(fosterwxTaskSchedule.getId());
+            updateVO.setDelFlg(0);
+            fosterwxTaskScheduleMapper.updateById(updateVO);
+        }
+
+        return AjaxResult.success("修改成功");
+    }
+}

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

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.entity.PostBasePageHandle;
-import com.mokamrp.privates.mapper.pangu.FosterTaskTemplateMapper;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskTemplate;
-import com.mokamrp.privates.service.pangu.FosterTaskTemplateService;
+import com.mokamrp.privates.mapper.pangu.FosterwxTaskTemplateMapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate;
+import com.mokamrp.privates.service.pangu.FosterwxTaskTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,10 +22,10 @@ import java.util.Map;
  * @since 2021-07-23
  */
 @Service
-public class FosterTaskTemplateServiceImpl extends ServiceImpl<FosterTaskTemplateMapper, FosterTaskTemplate> implements FosterTaskTemplateService {
+public class FosterwxTaskTemplateServiceImpl extends ServiceImpl<FosterwxTaskTemplateMapper, FosterwxTaskTemplate> implements FosterwxTaskTemplateService {
 
     @Autowired
-    public FosterTaskTemplateMapper fosterTaskTemplateMapper;
+    public FosterwxTaskTemplateMapper fosterwxTaskTemplateMapper;
 
     /**
      * 获取数据列表 支持分页
@@ -37,14 +37,15 @@ public class FosterTaskTemplateServiceImpl extends ServiceImpl<FosterTaskTemplat
     public Map<String, Object> getList(PostBasePageHandle handle, String templateName) {
         Integer pageSize = handle.getPagesize();
         Integer page = handle.getPage();
-        LambdaQueryWrapper<FosterTaskTemplate> taskTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        taskTemplateLambdaQueryWrapper.eq(FosterTaskTemplate::getTemplateName, templateName);
-        taskTemplateLambdaQueryWrapper.eq(FosterTaskTemplate::getDelFlg, 1);
-        taskTemplateLambdaQueryWrapper.orderByDesc(FosterTaskTemplate::getId);
+        LambdaQueryWrapper<FosterwxTaskTemplate> taskTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (null != templateName && !templateName.isEmpty())
+            taskTemplateLambdaQueryWrapper.eq(FosterwxTaskTemplate::getTemplateName, templateName);
+        taskTemplateLambdaQueryWrapper.eq(FosterwxTaskTemplate::getDelFlg, 1);
+        taskTemplateLambdaQueryWrapper.orderByDesc(FosterwxTaskTemplate::getId);
 
-        Page<FosterTaskTemplate> taskTemplatePage = new Page<>(page, pageSize);
+        Page<FosterwxTaskTemplate> taskTemplatePage = new Page<>(page, pageSize);
 
-        taskTemplatePage = fosterTaskTemplateMapper.selectPage(taskTemplatePage, taskTemplateLambdaQueryWrapper);
+        taskTemplatePage = fosterwxTaskTemplateMapper.selectPage(taskTemplatePage, taskTemplateLambdaQueryWrapper);
 
         Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("list", taskTemplatePage.getRecords());

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

@@ -19,17 +19,17 @@ public class AutoMPPangu {
 	public void testGenerator() {
 
 		//1. 全局配置
-		String outPutDir = "D://project/moka-private/src/main/java";
+		String outPutDir = "/Users/luqiucheng/Desktop/test";
 		GlobalConfig config = new GlobalConfig();
 		config.setActiveRecord(true) // 是否支持AR模式
-			  .setAuthor("leon") // 作者
-			  .setOutputDir(outPutDir) // 生成路径
-			  .setFileOverride(true)  // 文件覆盖
-			  .setIdType(IdType.AUTO) // 主键策略
-			  .setServiceName("%sService")  // 设置生成的service接口的名字的首字母是否为I
-			  					      // IEmployeeService
- 			  .setBaseResultMap(true) //生成sql映射文件
- 			  .setBaseColumnList(true);//生成sql片段
+				.setAuthor("leon") // 作者
+				.setOutputDir(outPutDir) // 生成路径
+				.setFileOverride(true)  // 文件覆盖
+				.setIdType(IdType.AUTO) // 主键策略
+				.setServiceName("%sService")  // 设置生成的service接口的名字的首字母是否为I
+				// IEmployeeService
+				.setBaseResultMap(true) //生成sql映射文件
+				.setBaseColumnList(true);//生成sql片段
 		
 		//2. 数据源配置
 		DataSourceConfig  dsConfig  = new DataSourceConfig();
@@ -47,7 +47,7 @@ public class AutoMPPangu {
 				.setColumnNaming(NamingStrategy.underline_to_camel)
 				.setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略，下划线转驼峰命名
 				.setTablePrefix("pan_") //表名前缀
-				.setInclude("pan_fosterwx_mobile_wxfriend");  //生成的表
+				.setInclude("pan_fosterwx_task_schedule");  //生成的表
 		
 		//4. 包名策略配置 
 		PackageConfig pkConfig = new PackageConfig();