From 7bdf1ca17ef438dc07baef8f932afc204b76cd79 Mon Sep 17 00:00:00 2001 From: maochaoying <925670706@qq.com> Date: Fri, 7 Jul 2023 11:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=9D=82=E8=B7=AF=E5=BE=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iflytop/nuclear/controller/PathController.java | 6 ++--- src/main/java/com/iflytop/nuclear/model/Path.java | 14 +++++------ .../com/iflytop/nuclear/service/PathService.java | 5 +++- .../nuclear/service/impl/PathServiceImpl.java | 27 +++++++++++++++++++++- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/iflytop/nuclear/controller/PathController.java b/src/main/java/com/iflytop/nuclear/controller/PathController.java index 0272cf0..9a738c9 100644 --- a/src/main/java/com/iflytop/nuclear/controller/PathController.java +++ b/src/main/java/com/iflytop/nuclear/controller/PathController.java @@ -40,9 +40,9 @@ public class PathController { return ResponseData.success(); } - @PostMapping("/plan") - public ResponseData plan(@RequestBody List pathList) { - boolean b = pathService.plan(pathList); + @PostMapping("/plan/{id}") + public ResponseData plan(@PathVariable(name = "id") int taskId, @RequestBody List pathList) { + boolean b = pathService.plan(taskId, pathList); JSONObject jsonObject = new JSONObject(); jsonObject.put("result", b); return ResponseData.success(jsonObject); diff --git a/src/main/java/com/iflytop/nuclear/model/Path.java b/src/main/java/com/iflytop/nuclear/model/Path.java index 00e7582..09eef46 100644 --- a/src/main/java/com/iflytop/nuclear/model/Path.java +++ b/src/main/java/com/iflytop/nuclear/model/Path.java @@ -21,12 +21,12 @@ public class Path { @TableId private int id; - @TableField("order") - private String order; + @TableField("coord") + private String coord; + + @TableField("task_id") + private int taskId; - /** - * 规则的路径可以通过代码实现得出下一个坐标,不规则的则需要记录 - */ - @TableField("path") - private String path; + @TableField("order") + private int order; } diff --git a/src/main/java/com/iflytop/nuclear/service/PathService.java b/src/main/java/com/iflytop/nuclear/service/PathService.java index b49256f..e7f9973 100644 --- a/src/main/java/com/iflytop/nuclear/service/PathService.java +++ b/src/main/java/com/iflytop/nuclear/service/PathService.java @@ -13,5 +13,8 @@ import java.util.List; @Transactional public interface PathService extends IService { - boolean plan(List pathList); + boolean plan(int taskId, List pathList); } + + + diff --git a/src/main/java/com/iflytop/nuclear/service/impl/PathServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/PathServiceImpl.java index 199359a..eed0591 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/PathServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/PathServiceImpl.java @@ -1,12 +1,17 @@ package com.iflytop.nuclear.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iflytop.nuclear.mapper.PathMapper; import com.iflytop.nuclear.mapper.TaskMapper; +import com.iflytop.nuclear.model.NuclearCoreConfig; import com.iflytop.nuclear.model.Path; import com.iflytop.nuclear.model.Task; +import com.iflytop.nuclear.service.NuclearCoreConfigService; import com.iflytop.nuclear.service.PathService; import com.iflytop.nuclear.service.TaskService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -17,8 +22,28 @@ import java.util.List; */ @Service public class PathServiceImpl extends ServiceImpl implements PathService { + + @Autowired + TaskService taskService; + @Autowired + NuclearCoreConfigService nuclearCoreConfigService; + @Override - public boolean plan(List pathList) { + public boolean plan(int taskId, List pathList) { + // 更改task表中的order为2 + UpdateWrapper taskUpdateWrapper = new UpdateWrapper<>(); + taskUpdateWrapper.eq("id", taskId); + Task task = Task.builder() + .checkOrder(2) + .build(); + boolean updateResult = taskService.update(task, taskUpdateWrapper); + // 删除已经上传的config + QueryWrapper nuclearCoreConfigQueryWrapper = new QueryWrapper<>(); + nuclearCoreConfigQueryWrapper.eq("task_id", taskId); + boolean remove = nuclearCoreConfigService.remove(nuclearCoreConfigQueryWrapper); + // 保存自定义路径 + + return false; } }