Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

# Conflicts:
#	src/main/java/com/mokamrp/privates/controller/pangu/FosterwxTaskScheduleController.java
#	src/main/java/com/mokamrp/privates/service/pangu/FosterwxTaskScheduleService.java
#	src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskScheduleServiceImpl.java

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

@@ -7,7 +7,7 @@ import com.mokamrp.privates.constant.HttpMsg;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.AddHandle;
-import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxTaskListHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.help.Analysis;
 import com.mokamrp.privates.interceptor.AuthUser;
@@ -61,13 +61,11 @@ public class FosterwxTaskListController extends BaseController<FosterwxTaskList>
      */
 
     @PostMapping("/list")
-    public Object list(@RequestParam(required = false) String taskName,
-                       @RequestParam(required = false) String taskContent,
-                       @Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult) {
+    public Object list(@Valid @RequestBody FosterwxTaskListHandle handle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String, Object> res = fosterwxTaskListService.getList(postBasePageHandle, taskName, taskContent);
+        Map<String, Object> res = fosterwxTaskListService.getList(handle);
         return AjaxResult.success(res);
     }
 

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

@@ -5,7 +5,7 @@ import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.EditHandle;
 import com.mokamrp.privates.entity.ResHandle;
-import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxTaskScheduleHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList;
@@ -51,14 +51,12 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
      */
 
     @PostMapping("/list")
-    public Object list(@RequestParam(required = false) String taskName,
-                       @RequestParam(required = false) Integer stationId,
-                       @RequestParam String date,
-                       @Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult) {
+    public Object list(
+            @Valid @RequestBody FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        ResHandle<List<FosterwxTaskSchedule>> res = fosterwxTaskScheduleService.getList(postBasePageHandle, taskName, stationId, date);
+        ResHandle<List<FosterwxTaskSchedule>> res = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
         return AjaxResult.success(res);
     }
 
@@ -93,25 +91,28 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
     }
 
     @PostMapping("/getTaskList")
-    public Object getTaskList(@RequestParam Integer stationId, @RequestParam String year, @RequestParam String month) {
-        PostBasePageHandle postBasePageHandle = new PostBasePageHandle();
-        postBasePageHandle.setPage(1);
-        postBasePageHandle.setPagesize(100000);
+    public Object getTaskList(@Valid @RequestBody FosterwxTaskScheduleHandle handle) {
+        handle.setPage(1);
+        handle.setPagesize(100000);
 
         Calendar c = Calendar.getInstance();
-        // c.set(year, month, 0);
+        c.set(Integer.valueOf(handle.getYear()), Integer.valueOf(handle.getMonth()), 0);
+        int dayOfMonth = c.get(Calendar.DAY_OF_MONTH);
 
-
-        ResHandle<List<FosterwxTaskSchedule>> res = fosterwxTaskScheduleService.getList(postBasePageHandle, null, stationId, null);
+        Map<String, Object> res = new HashMap<>();
+        for (int i = 1; i <= dayOfMonth; i++) {
+            String date = handle.getYear() + "-" + String.format("%02d", Integer.valueOf(handle.getMonth())) + "-" + String.format("%02d", i);
+            handle.setDate(date);
+            res.put(date, fosterwxTaskScheduleService.getList(handle));
+        }
         return AjaxResult.success(res);
     }
 
     @PostMapping("/getInfo")
-    public Object getInfo(@RequestParam String stationId,
-                          @RequestParam String taskId) {
+    public Object getInfo(@Valid @RequestBody FosterwxTaskScheduleHandle handle) {
         LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, stationId);
-        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTaskId, taskId);
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, handle.getStationId());
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTaskId, handle.getTaskId());
         fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getDelFlg, 1);
         fosterwxTaskScheduleLambdaQueryWrapper.orderByAsc(FosterwxTaskSchedule::getMobileCode);
 

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

@@ -2,13 +2,16 @@ package com.mokamrp.privates.controller.pangu;
 
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
-import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxTaskTemplateHandle;
 import com.mokamrp.privates.help.AjaxResult;
 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.*;
+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 javax.validation.Valid;
 import java.util.Map;
@@ -36,11 +39,11 @@ public class FosterwxTaskTemplateController extends BaseController<FosterwxTaskT
      */
 
     @PostMapping("/list")
-    public Object list(@RequestParam(required = false) String templateName, @Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult) {
+    public Object list(@Valid @RequestBody FosterwxTaskTemplateHandle fosterwxTaskTemplateHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        Map<String, Object> res = fosterwxTaskTemplateService.getList(postBasePageHandle, templateName);
+        Map<String, Object> res = fosterwxTaskTemplateService.getList(fosterwxTaskTemplateHandle);
         return AjaxResult.success(res);
     }
 

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

@@ -0,0 +1,12 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+@Data
+public class FosterwxTaskListHandle {
+    private Integer page;
+    private Integer pagesize;
+    private Integer id;
+    private String taskName;
+    private String taskContent;
+}

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

@@ -0,0 +1,16 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+@Data
+public class FosterwxTaskScheduleHandle {
+    private Integer page;
+    private Integer pagesize;
+    private Integer id;
+    private Integer taskId;
+    private String taskName;
+    private Integer stationId;
+    private String date;
+    private String year;
+    private String month;
+}

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

@@ -0,0 +1,11 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+@Data
+public class FosterwxTaskTemplateHandle {
+    private Integer page;
+    private Integer pagesize;
+    private Integer id;
+    private String templateName;
+}

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

@@ -22,6 +22,6 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList">
         SELECT *
-        FROM pan_task_list
+        FROM pan_fosterwx_task_list
     </select>
 </mapper>

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

@@ -20,6 +20,6 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate">
         SELECT *
-        FROM pan_task_template
+        FROM pan_fosterwx_task_template
     </select>
 </mapper>

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service.pangu;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxTaskListHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList;
 
 import java.util.Map;
@@ -16,5 +16,5 @@ import java.util.Map;
  */
 public interface FosterwxTaskListService extends IService<FosterwxTaskList> {
     //.@leon 获取数据列表
-    public Map<String, Object> getList(PostBasePageHandle handle, String taskName, String taskContent);
+    public Map<String, Object> getList(FosterwxTaskListHandle handle);
 }

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

@@ -1,8 +1,10 @@
 package com.mokamrp.privates.service.pangu;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxTaskScheduleHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskSchedule;
@@ -20,8 +22,7 @@ import java.util.List;
  */
 public interface FosterwxTaskScheduleService extends IService<FosterwxTaskSchedule> {
     //.@leon 获取数据列表
-    public ResHandle<List<FosterwxTaskSchedule>> getList(PostBasePageHandle handle, String taskName, Integer stationId, String date);
-
+    public ResHandle<List<FosterwxTaskSchedule>> getList(FosterwxTaskScheduleHandle handle);
 
     /**
      * 根据任务开始时间创建排期/微信状态更新重新生成为执行部分任务

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service.pangu;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxTaskTemplateHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate;
 
 import java.util.Map;
@@ -16,5 +16,5 @@ import java.util.Map;
  */
 public interface FosterwxTaskTemplateService extends IService<FosterwxTaskTemplate> {
     //.@leon 获取数据列表
-    public Map<String, Object> getList(PostBasePageHandle handle, String templateName);
+    public Map<String, Object> getList(FosterwxTaskTemplateHandle handle);
 }

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

@@ -3,7 +3,7 @@ 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.entity.pangu.FosterwxTaskListHandle;
 import com.mokamrp.privates.mapper.pangu.FosterwxTaskListMapper;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskList;
 import com.mokamrp.privates.service.pangu.FosterwxTaskListService;
@@ -30,21 +30,19 @@ public class FosterwxTaskListServiceImpl extends ServiceImpl<FosterwxTaskListMap
     /**
      * 获取数据列表 支持分页
      * @param handle
-     * @param taskName
-     * @param taskContent
      * @return
      */
     @Override
-    public Map<String, Object> getList(PostBasePageHandle handle, String taskName, String taskContent) {
+    public Map<String, Object> getList(FosterwxTaskListHandle handle) {
         Integer pageSize = handle.getPagesize();
         Integer page = handle.getPage();
         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);
+        if (null != handle.getTaskName() && !handle.getTaskName().isEmpty())
+            taskListLambdaQueryWrapper.eq(FosterwxTaskList::getTaskName, handle.getTaskName());
+        if (null != handle.getTaskContent() && !handle.getTaskContent().isEmpty())
+            taskListLambdaQueryWrapper.eq(FosterwxTaskList::getTaskContent, handle.getTaskContent());
 
         pageObj = fosterwxTaskListMapper.selectPage(pageObj, taskListLambdaQueryWrapper);
         Map<String, Object> resMap = new HashMap<String, Object>();

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.entity.ResHandle;
-import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxTaskScheduleHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.FosterwxStationMapper;
 import com.mokamrp.privates.mapper.pangu.FosterwxTaskListMapper;
@@ -47,19 +47,21 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
     /**
      * 获取数据列表 支持分页
      * @param handle
-     * @param taskName
-     * @param stationId
-     * @param date
      * @return
      */
     @Override
-    public ResHandle<List<FosterwxTaskSchedule>> getList(PostBasePageHandle handle, String taskName, Integer stationId, String date) {
+    public ResHandle<List<FosterwxTaskSchedule>> getList(FosterwxTaskScheduleHandle handle) {
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxTaskSchedule> pageObj = new Page<FosterwxTaskSchedule>(page, pagesize);
         QueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleQueryWrapper = new QueryWrapper<>();
         fosterwxTaskScheduleQueryWrapper.select("distinct station_id,station_name,task_id,task_name,task_status,task_send_status,create_uid,send_time,err_msg,mark");
-        fosterwxTaskScheduleQueryWrapper.eq("send_date", LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        fosterwxTaskScheduleQueryWrapper.eq("send_date", LocalDate.parse(handle.getDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        if (null != handle.getId()) fosterwxTaskScheduleQueryWrapper.eq("id", handle.getId());
+        if (null != handle.getTaskName() && !handle.getTaskName().isEmpty())
+            fosterwxTaskScheduleQueryWrapper.eq("task_name", handle.getTaskName());
+        if (null != handle.getStationId())
+            fosterwxTaskScheduleQueryWrapper.eq("station_id", handle.getStationId());
         fosterwxTaskScheduleQueryWrapper.orderByDesc("station_id");
         fosterwxTaskScheduleQueryWrapper.orderByDesc("task_id");
 

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

@@ -3,7 +3,7 @@ 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.entity.pangu.FosterwxTaskTemplateHandle;
 import com.mokamrp.privates.mapper.pangu.FosterwxTaskTemplateMapper;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate;
 import com.mokamrp.privates.service.pangu.FosterwxTaskTemplateService;
@@ -30,16 +30,17 @@ public class FosterwxTaskTemplateServiceImpl extends ServiceImpl<FosterwxTaskTem
     /**
      * 获取数据列表 支持分页
      * @param handle
-     * @param templateName
      * @return
      */
     @Override
-    public Map<String, Object> getList(PostBasePageHandle handle, String templateName) {
+    public Map<String, Object> getList(FosterwxTaskTemplateHandle handle) {
         Integer pageSize = handle.getPagesize();
         Integer page = handle.getPage();
         LambdaQueryWrapper<FosterwxTaskTemplate> taskTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        if (null != templateName && !templateName.isEmpty())
-            taskTemplateLambdaQueryWrapper.eq(FosterwxTaskTemplate::getTemplateName, templateName);
+        if (null != handle.getTemplateName() && !handle.getTemplateName().isEmpty())
+            taskTemplateLambdaQueryWrapper.eq(FosterwxTaskTemplate::getTemplateName, handle.getTemplateName());
+        if (null != handle.getId())
+            taskTemplateLambdaQueryWrapper.eq(FosterwxTaskTemplate::getId, handle.getId());
         taskTemplateLambdaQueryWrapper.eq(FosterwxTaskTemplate::getDelFlg, 1);
         taskTemplateLambdaQueryWrapper.orderByDesc(FosterwxTaskTemplate::getId);
 

src/main/java/com/mokamrp/privates/tast/pangu/SyncFosterwxTask.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxTaskScheduleHandle;
 import com.mokamrp.privates.mapper.data.pojo.PanCSLTRecord;
 import com.mokamrp.privates.mapper.data.pojo.PanCSTQRecord;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
@@ -43,9 +44,6 @@ public class SyncFosterwxTask {
         Integer taskCnt = 60;
         Date nowDate = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        PostBasePageHandle postBasePageHandle = new PostBasePageHandle();
-        postBasePageHandle.setPage(1);
-        postBasePageHandle.setPagesize(9999999);
         List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
         for (FosterwxStation fosterwxStation : fosterwxStationList){
             for (Integer i =0;i<=60;i++){
@@ -54,7 +52,12 @@ public class SyncFosterwxTask {
                     nextDate = df.format(new Date(nowDate.getTime() + 1000 * 60 * 60 * 24 * i));
                 }
                 Integer stationId = fosterwxStation.getId();
-                ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(postBasePageHandle,"",fosterwxStation.getId(),nextDate);
+                FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
+                fosterwxTaskScheduleHandle.setStationId(stationId);
+                fosterwxTaskScheduleHandle.setDate(nextDate);
+                fosterwxTaskScheduleHandle.setPage(1);
+                fosterwxTaskScheduleHandle.setPagesize(99999);
+                ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
                 List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
                 stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask+stationId,nextDate, JSON.toJSONString(fosterwxTaskScheduleList));
             }