diff --git a/src/main/java/com/iflytop/nuclear/controller/TaskController.java b/src/main/java/com/iflytop/nuclear/controller/TaskController.java index 297ce74..883fa73 100644 --- a/src/main/java/com/iflytop/nuclear/controller/TaskController.java +++ b/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 taskInfo) { + Task task = taskService.getById(taskId); UpdateWrapper 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(); diff --git a/src/main/java/com/iflytop/nuclear/model/Task.java b/src/main/java/com/iflytop/nuclear/model/Task.java index 5cbbe91..2f500d1 100644 --- a/src/main/java/com/iflytop/nuclear/model/Task.java +++ b/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; diff --git a/src/main/java/com/iflytop/nuclear/service/NuclearCoreConfigService.java b/src/main/java/com/iflytop/nuclear/service/NuclearCoreConfigService.java index d0c9837..31ba547 100644 --- a/src/main/java/com/iflytop/nuclear/service/NuclearCoreConfigService.java +++ b/src/main/java/com/iflytop/nuclear/service/NuclearCoreConfigService.java @@ -18,4 +18,6 @@ public interface NuclearCoreConfigService extends IService { boolean updateDetectionResult(String imgUrl, String detectionResult, String coord, int taskId, String detectionResultBottom); NuclearCoreConfig getDetailById(String taskId, String serialNumber); + + boolean getAllDetection(String taskId); } diff --git a/src/main/java/com/iflytop/nuclear/service/impl/NuclearCoreConfigServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/NuclearCoreConfigServiceImpl.java index 15511d7..94a85a1 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/NuclearCoreConfigServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/NuclearCoreConfigServiceImpl.java @@ -71,4 +71,15 @@ public class NuclearCoreConfigServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("result", 0); + List list = this.list(queryWrapper); + if (list.size() > 0) { + return false; + } + return true; + } } 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 9f5145a..26d2289 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java @@ -68,6 +68,10 @@ public class TaskServiceImpl extends ServiceImpl implements Ta QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("username", task.getOperatorId()); Account account = accountService.getOne(queryWrapper); + + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("username", task.getPublishedId()); + Account account2 = accountService.getOne(queryWrapper2); TaskVO taskVO = TaskVO.builder() .taskName(task.getTaskName()) .checkOrder(task.getCheckOrder()) @@ -81,7 +85,8 @@ public class TaskServiceImpl extends ServiceImpl implements Ta .startTime(task.getStartTime()) .endTime(task.getEndTime()) .canUpload(canUpload) - .hasError(hasError) + .hasError(hasError) + .publishedId(account2.getNickname()) .build(); result.add(taskVO); } @@ -131,6 +136,12 @@ public class TaskServiceImpl extends ServiceImpl 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)) { diff --git a/src/main/java/com/iflytop/nuclear/vo/TaskVO.java b/src/main/java/com/iflytop/nuclear/vo/TaskVO.java index 9cafcf9..02e36c6 100644 --- a/src/main/java/com/iflytop/nuclear/vo/TaskVO.java +++ b/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; } diff --git a/uploadfiles/xlsx/20230726/template-35.xlsx b/uploadfiles/xlsx/20230726/template-35.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230726/template-35.xlsx differ diff --git a/uploadfiles/xlsx/20230726/template-36.xlsx b/uploadfiles/xlsx/20230726/template-36.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230726/template-36.xlsx differ