diff --git a/src/main/java/com/iflytop/nuclear/controller/TaskController.java b/src/main/java/com/iflytop/nuclear/controller/TaskController.java index 45c81f1..58edf9b 100644 --- a/src/main/java/com/iflytop/nuclear/controller/TaskController.java +++ b/src/main/java/com/iflytop/nuclear/controller/TaskController.java @@ -48,12 +48,30 @@ public class TaskController { public ResponseData createTask(@RequestBody Task taskInfo) { taskInfo.setPublishTime(new Date()); taskInfo.setStatus(0); + // 少一个publish id + String token = request.getHeader("Authorization"); + if (token.length() > 0){ + String[] s = token.split(" "); + String username = JwtTokenUtils.getUsername(s[1]); + taskInfo.setPublishedId(username); + } boolean save = taskService.save(taskInfo); JSONObject jsonObject = new JSONObject(); jsonObject.put("result", save); return ResponseData.success(jsonObject); } + @PostMapping("/stop") + public ResponseData stopTask(@RequestBody Task taskInfo) { + taskInfo.setStartTime(taskInfo.getStartTime()); + taskInfo.setEndTime(new Date()); + boolean b = taskService.updateById(taskInfo); + if (b) { + return ResponseData.success(); + } + return ResponseData.fail("结束任务失败"); + } + @GetMapping("/list") public ResponseData getTaskListByUserId() { String token = request.getHeader("Authorization"); diff --git a/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java index 3b369ea..44f8906 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java @@ -139,9 +139,9 @@ public class CheckServiceImpl implements CheckService { nextCoord = this.getNextCoord(nextCoord, order, taskId + ""); this.updateCoordAndStatus(taskId, nextCoord, 1, false, false, order); this.sendMessageToDevice(nextCoord, taskId); - if ("finish".equals(nextCoord)) { - this.updateCoordAndStatus(taskId, nextCoord, 3, false, true, order); - } + // if ("finish".equals(nextCoord)) { + // this.updateCoordAndStatus(taskId, nextCoord, 3, false, true, order); + // } } return nextCoord; } @@ -175,9 +175,9 @@ public class CheckServiceImpl implements CheckService { nextCoord = this.getNextCoord(nextCoord, order, taskId + ""); this.updateCoordAndStatus(taskId, nextCoord, 1, false, false, order); this.sendMessageToDevice(nextCoord, taskId); - if ("finish".equals(nextCoord)) { - this.updateCoordAndStatus(taskId, nextCoord, 3, false, true, order); - } + // if ("finish".equals(nextCoord)) { + // this.updateCoordAndStatus(taskId, nextCoord, 3, false, true, order); + // } } return nextCoord; } diff --git a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java index b6cda80..a9b28a4 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java @@ -90,7 +90,7 @@ public class TaskServiceImpl extends ServiceImpl implements Ta .endTime(task.getEndTime()) .canUpload(canUpload) .hasError(hasError) - .publishedId(account2.getNickname()) + .publishedId(task.getPublishedId()) .build(); result.add(taskVO); } diff --git a/uploadfiles/xlsx/20230826/template-53.xlsx b/uploadfiles/xlsx/20230826/template-53.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230826/template-53.xlsx differ diff --git a/uploadfiles/xlsx/20230826/template-54.xlsx b/uploadfiles/xlsx/20230826/template-54.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230826/template-54.xlsx differ diff --git a/uploadfiles/xlsx/20230826/template-55.xlsx b/uploadfiles/xlsx/20230826/template-55.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230826/template-55.xlsx differ diff --git a/uploadfiles/xlsx/20230826/template-56.xlsx b/uploadfiles/xlsx/20230826/template-56.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230826/template-56.xlsx differ diff --git a/uploadfiles/xlsx/20230826/template-57.xlsx b/uploadfiles/xlsx/20230826/template-57.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230826/template-57.xlsx differ