From 0acfa13002a446d3d020a43dc7b3d920505db5d0 Mon Sep 17 00:00:00 2001 From: liejiu946 Date: Fri, 6 Mar 2026 16:53:22 +0800 Subject: [PATCH] =?UTF-8?q?opt:1.=E5=AE=8C=E5=96=84=E5=A4=96=E9=83=A8API?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/api/task/api/TaskAPI.java | 13 +++++++++++++ .../task/controller/ExternalTaskController.java | 4 ++-- .../task/service/ExternalTaskService.java | 4 ++-- .../service/impl/ExternalTaskServiceImpl.java | 14 +++++++++----- .../org/nl/task/provider/TaskAPIProvider.java | 11 +++++++++++ .../nl/task/service/impl/TaskServiceImpl.java | 2 +- .../src/main/resources/config/application.yml | 1 + .../language/buss/buss_zh_CN.properties | Bin 174 -> 170 bytes 8 files changed, 39 insertions(+), 10 deletions(-) diff --git a/nl-business-api/src/main/java/org/nl/api/task/api/TaskAPI.java b/nl-business-api/src/main/java/org/nl/api/task/api/TaskAPI.java index b51acc1..3f2379b 100644 --- a/nl-business-api/src/main/java/org/nl/api/task/api/TaskAPI.java +++ b/nl-business-api/src/main/java/org/nl/api/task/api/TaskAPI.java @@ -66,4 +66,17 @@ public interface TaskAPI { * @return */ boolean queryTaskInfoByDestination(String destination); + + /** + * 根据任务号查询任务 + * @param taskCode + * @return + */ + WebResponse queryTaskInfoByTaskCode(String taskCode); + + /** + * 查询当前未完成任务 + * @return + */ + WebResponse queryNotFinishTaskInfos(); } diff --git a/nl-business-externalApi/src/main/java/org/nl/externalApi/task/controller/ExternalTaskController.java b/nl-business-externalApi/src/main/java/org/nl/externalApi/task/controller/ExternalTaskController.java index ea843d8..bda0140 100644 --- a/nl-business-externalApi/src/main/java/org/nl/externalApi/task/controller/ExternalTaskController.java +++ b/nl-business-externalApi/src/main/java/org/nl/externalApi/task/controller/ExternalTaskController.java @@ -41,9 +41,9 @@ public class ExternalTaskController { return new ResponseEntity<>(externalTaskService.getTaskInfos(), HttpStatus.OK); } - @GetMapping("/getTaskInfos/{id}") + @GetMapping("/getTaskInfo/{id}") @Log("外部API:根据任务号查询任务") public ResponseEntity getTaskInfosById(@PathVariable String id){ - return new ResponseEntity<>(externalTaskService.getTaskInfosById(id), HttpStatus.OK); + return new ResponseEntity<>(externalTaskService.getTaskInfosByTaskCode(id), HttpStatus.OK); } } diff --git a/nl-business-externalApi/src/main/java/org/nl/externalApi/task/service/ExternalTaskService.java b/nl-business-externalApi/src/main/java/org/nl/externalApi/task/service/ExternalTaskService.java index f10deb5..ce0edc8 100644 --- a/nl-business-externalApi/src/main/java/org/nl/externalApi/task/service/ExternalTaskService.java +++ b/nl-business-externalApi/src/main/java/org/nl/externalApi/task/service/ExternalTaskService.java @@ -30,9 +30,9 @@ public interface ExternalTaskService { WebResponse getTaskInfos(); /** - * 根据任务号查询任务信息 + * 外部API 根据任务号查询任务信息 * @param task_code * @return WebResponse */ - WebResponse getTaskInfosById(String task_code); + WebResponse getTaskInfosByTaskCode(String task_code); } diff --git a/nl-business-externalApi/src/main/java/org/nl/externalApi/task/service/impl/ExternalTaskServiceImpl.java b/nl-business-externalApi/src/main/java/org/nl/externalApi/task/service/impl/ExternalTaskServiceImpl.java index 60ad757..9cefb84 100644 --- a/nl-business-externalApi/src/main/java/org/nl/externalApi/task/service/impl/ExternalTaskServiceImpl.java +++ b/nl-business-externalApi/src/main/java/org/nl/externalApi/task/service/impl/ExternalTaskServiceImpl.java @@ -1,7 +1,10 @@ package org.nl.externalApi.task.service.impl; +import cn.hutool.core.bean.BeanUtil; import jakarta.annotation.Resource; import org.nl.api.task.api.TaskAPI; +import org.nl.api.task.core.TaskRequestParam; +import org.nl.enums.TaskSourceEnum; import org.nl.externalApi.task.param.CreateTaskParam; import org.nl.externalApi.task.service.ExternalTaskService; import org.nl.response.WebResponse; @@ -19,21 +22,22 @@ public class ExternalTaskServiceImpl implements ExternalTaskService { @Override public WebResponse createTask(CreateTaskParam createTaskParam) { - return null; + TaskRequestParam taskRequestParam = BeanUtil.toBean(createTaskParam, TaskRequestParam.class); + return taskAPI.createTask(taskRequestParam, TaskSourceEnum.EXTERNAL_API.getName()); } @Override public WebResponse cancelTask(String task_code) { - return null; + return taskAPI.cancelTask(task_code); } @Override public WebResponse getTaskInfos() { - return null; + return taskAPI.queryNotFinishTaskInfos(); } @Override - public WebResponse getTaskInfosById(String task_code) { - return null; + public WebResponse getTaskInfosByTaskCode(String task_code) { + return taskAPI.queryTaskInfoByTaskCode(task_code); } } diff --git a/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java b/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java index 21094ec..5ef8514 100644 --- a/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java +++ b/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java @@ -108,4 +108,15 @@ public class TaskAPIProvider implements TaskAPI { public boolean queryTaskInfoByDestination(String destination) { return taskService.count(new LambdaQueryWrapper<>(Task.class).eq(Task::getDestinations, destination).lt(Task::getStatus,TaskStatusEnum.FINISHED.getCode())) >0; } + + @Override + public WebResponse queryTaskInfoByTaskCode(String taskCode) { + Task task = taskService.getOne(new LambdaQueryWrapper<>(Task.class).eq(Task::getTask_code,taskCode)); + return WebResponse.requestParamOk(task); + } + + @Override + public WebResponse queryNotFinishTaskInfos() { + return WebResponse.requestParamOk(taskService.queryCurrentTaskInfo()); + } } diff --git a/nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java b/nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java index 24ea516..8e5fd0d 100644 --- a/nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java +++ b/nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java @@ -157,7 +157,7 @@ public class TaskServiceImpl extends ServiceImpl implements Tas if (result == null || !result.isOk()){ throw new BadRequestException(LangProcess.msg("task_schedule_create_failed")); } - return WebResponse.requestOk(); + return WebResponse.requestParamOk(task.getTask_code()); }catch (Exception e){ log.error("创建任务失败:{}",e.getMessage()); throw new BadRequestException(LangProcess.msg("task_create_failed",e.getMessage())); diff --git a/nl-web-app/src/main/resources/config/application.yml b/nl-web-app/src/main/resources/config/application.yml index eb11255..d3c87e1 100644 --- a/nl-web-app/src/main/resources/config/application.yml +++ b/nl-web-app/src/main/resources/config/application.yml @@ -46,6 +46,7 @@ security: # frobot屏幕操作 - /schedule/vehicle/** - /schedule/setting/** + - /external/api/** - /task/** - /mapinfo/** - /security/** diff --git a/nl-web-app/src/main/resources/language/buss/buss_zh_CN.properties b/nl-web-app/src/main/resources/language/buss/buss_zh_CN.properties index 7e5f999efb965df753d4aeccb47f5e76ca4e5d35..46d1cb2eec7a2a5704b148f6ed28fbf66eb2d22f 100644 GIT binary patch delta 12 TcmZ3-xQcN?$i%P^CN2g595w@n delta 17 YcmZ3*xQ=l`2oo>E#E=jcUIs1(04l2kq5uE@