修改冲突 优化代码

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

@@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @since 2021-07-23
  */
 @RestController
-@RequestMapping("/taskList")
+@RequestMapping("/pangu/taskList")
 public class FosterwxTaskListController extends BaseController<FosterwxTaskList> {
 
     @Autowired
@@ -85,7 +85,7 @@ public class FosterwxTaskListController extends BaseController<FosterwxTaskList>
         }
     }
 
-    @PostMapping("/add")
+    @PostMapping("/addPro")
     public Object add(@Valid @RequestBody AddHandle<FosterwxTaskList> addHandle, BindingResult bindingResult, @AuthUser User authUser) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());

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

@@ -1,16 +1,23 @@
 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.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
 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.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 
@@ -23,7 +30,7 @@ import java.util.Map;
  * @since 2021-07-23
  */
 @RestController
-@RequestMapping("/taskSchedule")
+@RequestMapping("/pangu/taskSchedule")
 public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskSchedule> {
 
     @Autowired
@@ -47,6 +54,49 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
         return AjaxResult.success(res);
     }
 
+    @PutMapping("/edit")
+    @Transactional(rollbackFor = Exception.class)
+    public Object edit(@Valid @RequestBody EditHandle<FosterwxTaskSchedule> editHandle, 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);
+
+        List<FosterwxTaskSchedule> fosterwxTaskScheduleList = fosterwxTaskScheduleService.list(fosterwxTaskScheduleLambdaQueryWrapper);
+
+        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());
+
+            fosterwxTaskScheduleService.updateById(updateVO);
+        });
+
+        return AjaxResult.success("更新成功！");
+    }
+
+    @GetMapping("/getinfo")
+    public Object getinfo(@RequestParam String stationId,
+                          @RequestParam String taskId) {
+        LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, stationId);
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getTaskId, taskId);
+        fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getDelFlg, 1);
+        fosterwxTaskScheduleLambdaQueryWrapper.orderByAsc(FosterwxTaskSchedule::getMobileCode);
+
+        List<FosterwxTaskSchedule> fosterwxTaskScheduleList = fosterwxTaskScheduleService.list(fosterwxTaskScheduleLambdaQueryWrapper);
+
+        return null;
+    }
+
 
 }
 

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

@@ -23,7 +23,7 @@ import java.util.Map;
  * @since 2021-07-23
  */
 @RestController
-@RequestMapping("/taskTemplate")
+@RequestMapping("/pangu/taskTemplate")
 public class FosterwxTaskTemplateController extends BaseController<FosterwxTaskTemplate> {
 
     @Autowired