发布者

src/main/java/com/iflytop/nuclear/controller/TaskController.java

@@ -95,9 +95,9 @@ public class TaskController {
 
     @PostMapping("/update/{id}")
     public ResponseData updateOperInfo(@PathVariable(name = "id") int taskId, @RequestBody Map<String,String> taskInfo) {
+        Task task = taskService.getById(taskId);
         UpdateWrapper<Task> taskUpdateWrapper = new UpdateWrapper<>();
         taskUpdateWrapper.eq("id",taskId);
-        Task task = new Task();
         task.setOperatorId(taskInfo.get("operatorId"));
         boolean update = taskService.update(task, taskUpdateWrapper);
         JSONObject jo = new JSONObject();

src/main/java/com/iflytop/nuclear/model/Task.java

@@ -26,6 +26,9 @@ public class Task {
     @TableField("operator_id")
     private String operatorId;
 
+    @TableField("publish_id")
+    private String publishedId;
+
     @TableField("excel_position")
     private String excelPosition;
 

src/main/java/com/iflytop/nuclear/service/NuclearCoreConfigService.java

@@ -18,4 +18,6 @@ public interface NuclearCoreConfigService extends IService<NuclearCoreConfig> {
     boolean updateDetectionResult(String imgUrl, String detectionResult, String coord, int taskId, String detectionResultBottom);
 
     NuclearCoreConfig getDetailById(String taskId, String serialNumber);
+
+    boolean getAllDetection(String taskId);
 }

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

@@ -71,4 +71,15 @@ public class NuclearCoreConfigServiceImpl extends ServiceImpl<NuclearCoreConfigM
         NuclearCoreConfig one = this.getOne(nuclearCoreConfigQueryWrapper);
         return one;
     }
+
+    @Override
+    public boolean getAllDetection(String taskId) {
+        QueryWrapper<NuclearCoreConfig> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("result", 0);
+        List<NuclearCoreConfig> list = this.list(queryWrapper);
+        if (list.size() > 0) {
+            return false;
+        }
+        return true;
+    }
 }

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

@@ -68,6 +68,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             QueryWrapper<Account> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("username", task.getOperatorId());
             Account account = accountService.getOne(queryWrapper);
+
+            QueryWrapper<Account> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("username", task.getPublishedId());
+            Account account2 = accountService.getOne(queryWrapper2);
             TaskVO taskVO = TaskVO.builder()
                 .taskName(task.getTaskName())
                 .checkOrder(task.getCheckOrder())
@@ -82,6 +86,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 .endTime(task.getEndTime())
                 .canUpload(canUpload)
                 .hasError(hasError)
+                .publishedId(account2.getNickname())
                 .build();
             result.add(taskVO);
         }
@@ -131,6 +136,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
     public String nextCoordString(String coord, String taskId, String direction) {
         // 根据taskId查询order 规则的下一个已经写好，需要再写一个上一个
         Task task = this.getById(taskId);
+        boolean res = nuclearCoreConfigService.getAllDetection(taskId);
+        if (res) {
+            // 所有都检测完毕
+            task.setStatus(4);
+            this.updateById(task);
+        }
         int checkOrder = task.getCheckOrder();
         if ("1".equals(direction)) {
             if ("finish".equals(coord)) {

src/main/java/com/iflytop/nuclear/vo/TaskVO.java

@@ -41,4 +41,6 @@ public class TaskVO {
 
     private String currentCoord;
     private boolean hasError;
+
+    private String publishedId;
 }