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

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

@@ -70,9 +70,9 @@ public class FosterwxTaskListController extends BaseController<FosterwxTaskList>
     }
 
     @PostMapping("/getMaxTaskName")
-    public Object getMaxTaskName(String templateId) {
+    public Object getMaxTaskName(@Valid @RequestBody FosterwxTaskListHandle handle) {
         LambdaQueryWrapper<FosterwxTaskList> taskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        taskListLambdaQueryWrapper.eq(FosterwxTaskList::getTemplateId, templateId);
+        taskListLambdaQueryWrapper.eq(FosterwxTaskList::getTemplateId, handle.getTemplateId());
         taskListLambdaQueryWrapper.orderByDesc(FosterwxTaskList::getTaskName);
         taskListLambdaQueryWrapper.last("Limit 1");
 
@@ -82,7 +82,8 @@ public class FosterwxTaskListController extends BaseController<FosterwxTaskList>
             return AjaxResult.success(Constants.SUCCESS, "Day1");
         } else {
             String taskName = fosterwxTaskList.getTaskName();
-            return AjaxResult.success(Constants.SUCCESS, "Day" + Integer.valueOf(taskName.replace("Day", "") + 1));
+            int num = Integer.parseInt(taskName.replace("Day", "")) + 1;
+            return AjaxResult.success(Constants.SUCCESS, "Day" + num);
         }
     }
 

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

@@ -3,7 +3,6 @@ package com.mokamrp.privates.controller.pangu;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.pangu.FosterwxTaskScheduleHandle;
 import com.mokamrp.privates.help.AjaxResult;
@@ -16,7 +15,10 @@ import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 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.time.LocalDateTime;
@@ -61,31 +63,61 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
     }
 
 
-    @PutMapping("/edit")
+    @PostMapping("/editPro")
     @Transactional(rollbackFor = Exception.class)
-    public Object edit(@Valid @RequestBody EditHandle<FosterwxTaskSchedule> editHandle, BindingResult bindingResult, @AuthUser User authUser) {
+    public Object edit(@Valid @RequestBody List<FosterwxTaskScheduleHandle> editList, BindingResult bindingResult, @AuthUser User authUser) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        this.onUpdate(editHandle);
 
-        LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, editHandle.getRaw().getStationId());
-        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTaskId, editHandle.getRaw().getTaskId());
-        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getDelFlg, 1);
+        editList.forEach(edit -> {
+            LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, edit.getStationId());
+            fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTaskId, edit.getTaskId());
+            fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getDelFlg, 1);
+
+            List<FosterwxTaskSchedule> fosterwxTaskScheduleList = fosterwxTaskScheduleService.list(fosterwxTaskScheduleLambdaQueryWrapper);
+
+            fosterwxTaskScheduleList.forEach(fosterwxTaskSchedule -> {
+                FosterwxTaskSchedule updateVO = new FosterwxTaskSchedule();
+                updateVO.setId(fosterwxTaskSchedule.getId());
+                if (null != edit.getSendTime())
+                    updateVO.setSendTime(edit.getSendTime());
+                if (null != edit.getSendDate())
+                    updateVO.setSendDate(edit.getSendDate());
+                if (null != edit.getMark()) updateVO.setMark(edit.getMark());
+                updateVO.setUpdateUid(authUser.getId());
+                updateVO.setUpdateAt(LocalDateTime.now());
+
+                fosterwxTaskScheduleService.updateById(updateVO);
+            });
+        });
 
-        List<FosterwxTaskSchedule> fosterwxTaskScheduleList = fosterwxTaskScheduleService.list(fosterwxTaskScheduleLambdaQueryWrapper);
+        return AjaxResult.success("更新成功！");
+    }
 
-        fosterwxTaskScheduleList.forEach(fosterwxTaskSchedule -> {
-            FosterwxTaskSchedule updateVO = new FosterwxTaskSchedule();
-            updateVO.setId(fosterwxTaskSchedule.getId());
-            if (null != fosterwxTaskSchedule.getSendTime()) updateVO.setSendTime(fosterwxTaskSchedule.getSendTime());
-            if (null != fosterwxTaskSchedule.getMark()) updateVO.setMark(fosterwxTaskSchedule.getMark());
-            updateVO.setUpdateUid(authUser.getId());
-            updateVO.setUpdateAt(LocalDateTime.now());
+    @PostMapping("/addPro")
+    @Transactional(rollbackFor = Exception.class)
+    public Object add(@Valid @RequestBody FosterwxTaskSchedule fosterwxTaskSchedule, BindingResult bindingResult, @AuthUser User authUser) {
+        // 临时任务
+        fosterwxTaskSchedule.setTemplateId(0);
+        // 根据模板id获取最大的taskid
+        LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTemplateId, 0);
+        fosterwxTaskScheduleLambdaQueryWrapper.orderByDesc(FosterwxTaskSchedule::getTaskId);
+        fosterwxTaskScheduleLambdaQueryWrapper.last("Limit 1");
+        FosterwxTaskSchedule maxId = fosterwxTaskScheduleService.getOne(fosterwxTaskScheduleLambdaQueryWrapper);
+        if (null == maxId) {
+            fosterwxTaskSchedule.setTaskId(1);
+        } else {
+            fosterwxTaskSchedule.setTaskId(maxId.getTaskId() + 1);
+        }
+        fosterwxTaskSchedule.setCreateAt(LocalDateTime.now());
+        fosterwxTaskSchedule.setCreateUid(authUser.getId());
+        fosterwxTaskSchedule.setUpdateAt(LocalDateTime.now());
+        fosterwxTaskSchedule.setUpdateUid(authUser.getId());
 
-            fosterwxTaskScheduleService.updateById(updateVO);
-        });
+        fosterwxTaskScheduleService.save(fosterwxTaskSchedule);
 
         return AjaxResult.success("更新成功！");
     }
@@ -125,16 +157,19 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
     public Object getInfo(@Valid @RequestBody FosterwxTaskScheduleHandle handle) {
         FosterwxTaskSchedule fosterwxTaskSchedule = fosterwxTaskScheduleService.getInfo(handle);
 
-        if (null != fosterwxTaskSchedule) return AjaxResult.error("获取失败！");
+        if (null == fosterwxTaskSchedule) return AjaxResult.error("获取失败！");
 
         Map<String, Object> res = new HashMap<>();
 
-        StringBuffer sb = new StringBuffer();
-        sb.append("手机编号：" + fosterwxTaskSchedule.getComment() + "<br><br>");
+        res.put("mobile", fosterwxTaskSchedule.getComment());
         FosterwxTaskList fosterwxTaskList = fosterwxTaskListService.getById(fosterwxTaskSchedule.getTaskId());
-        sb.append("任务内容：" + fosterwxTaskList.getTaskContent());
+        // 如果是临时任务 直接获取任务排期里面的任务内容
+        if (0 == fosterwxTaskSchedule.getTemplateId()) {
+            res.put("content", fosterwxTaskSchedule.getTaskContent());
+        } else {
+            res.put("content", fosterwxTaskList.getTaskContent());
+        }
 
-        res.put("content", sb);
 
         return AjaxResult.success(res);
     }

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

@@ -9,4 +9,5 @@ public class FosterwxTaskListHandle {
     private Integer id;
     private String taskName;
     private String taskContent;
+    private Integer templateId;
 }

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

@@ -1,7 +1,11 @@
 package com.mokamrp.privates.entity.pangu;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 @Data
 public class FosterwxTaskScheduleHandle {
     private Integer page;
@@ -13,4 +17,8 @@ public class FosterwxTaskScheduleHandle {
     private String date;
     private String year;
     private String month;
+    private LocalDate sendDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime sendTime;
+    private String mark;
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -82,6 +83,7 @@ public class FosterwxTaskSchedule extends Model<FosterwxTaskSchedule> {
     /**
      * 发送时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime sendTime;
 
     /**

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

@@ -120,6 +120,7 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
             fosterwxTaskSchedule.setTemplateId(fosterwxStation.getTaskTemplateId());
             fosterwxTaskSchedule.setTaskId(fosterwxTaskList.getId());
             fosterwxTaskSchedule.setTaskName(fosterwxTaskList.getTaskName());
+            fosterwxTaskSchedule.setTaskContent(fosterwxTaskList.getTaskContent());
             fosterwxTaskSchedule.setTaskStatus(0);
             fosterwxTaskSchedule.setTaskSendStatus(0);
             fosterwxTaskSchedule.setSendDate(startDate);