diff --git a/src/main/java/com/iflytop/nuclear/model/Path.java b/src/main/java/com/iflytop/nuclear/model/Path.java index 09eef46..c861fde 100644 --- a/src/main/java/com/iflytop/nuclear/model/Path.java +++ b/src/main/java/com/iflytop/nuclear/model/Path.java @@ -27,6 +27,8 @@ public class Path { @TableField("task_id") private int taskId; - @TableField("order") - private int order; + @TableField("order_number") + private int orderNumber; + + private int number; } 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 eed0591..eab6919 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/PathServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/PathServiceImpl.java @@ -30,6 +30,14 @@ public class PathServiceImpl extends ServiceImpl implements Pa @Override public boolean plan(int taskId, List pathList) { + // 首先查询是否就是自定义路径,做修改操作 + QueryWrapper pathQueryWrapper = new QueryWrapper<>(); + pathQueryWrapper.eq("task_id", taskId); + List list = this.list(pathQueryWrapper); + if (list != null && list.size() > 0) { + // 有plan则删除 + this.remove(pathQueryWrapper); + } // 更改task表中的order为2 UpdateWrapper taskUpdateWrapper = new UpdateWrapper<>(); taskUpdateWrapper.eq("id", taskId); @@ -37,13 +45,15 @@ public class PathServiceImpl extends ServiceImpl implements Pa .checkOrder(2) .build(); boolean updateResult = taskService.update(task, taskUpdateWrapper); - // 删除已经上传的config - QueryWrapper nuclearCoreConfigQueryWrapper = new QueryWrapper<>(); - nuclearCoreConfigQueryWrapper.eq("task_id", taskId); - boolean remove = nuclearCoreConfigService.remove(nuclearCoreConfigQueryWrapper); + // // 删除已经上传的config + // QueryWrapper nuclearCoreConfigQueryWrapper = new QueryWrapper<>(); + // nuclearCoreConfigQueryWrapper.eq("task_id", taskId); + // boolean remove = nuclearCoreConfigService.remove(nuclearCoreConfigQueryWrapper); // 保存自定义路径 - - - return false; + for(Path path : pathList) { + path.setTaskId(taskId); + } + boolean b = this.saveBatch(pathList); + return updateResult && b; } } diff --git a/uploadfiles/xlsx/20230707/堆芯模版-24.xlsx b/uploadfiles/xlsx/20230707/堆芯模版-24.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230707/堆芯模版-24.xlsx differ