finish

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");

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;
     }

src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java

@@ -90,7 +90,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 .endTime(task.getEndTime())
                 .canUpload(canUpload)
                 .hasError(hasError)
-                .publishedId(account2.getNickname())
+                .publishedId(task.getPublishedId())
                 .build();
             result.add(taskVO);
         }