opt:1.完善外部API接口。

This commit is contained in:
2026-03-06 16:53:22 +08:00
parent 97dab61f8c
commit 0acfa13002
8 changed files with 39 additions and 10 deletions

View File

@@ -66,4 +66,17 @@ public interface TaskAPI {
* @return * @return
*/ */
boolean queryTaskInfoByDestination(String destination); boolean queryTaskInfoByDestination(String destination);
/**
* 根据任务号查询任务
* @param taskCode
* @return
*/
WebResponse queryTaskInfoByTaskCode(String taskCode);
/**
* 查询当前未完成任务
* @return
*/
WebResponse queryNotFinishTaskInfos();
} }

View File

@@ -41,9 +41,9 @@ public class ExternalTaskController {
return new ResponseEntity<>(externalTaskService.getTaskInfos(), HttpStatus.OK); return new ResponseEntity<>(externalTaskService.getTaskInfos(), HttpStatus.OK);
} }
@GetMapping("/getTaskInfos/{id}") @GetMapping("/getTaskInfo/{id}")
@Log("外部API:根据任务号查询任务") @Log("外部API:根据任务号查询任务")
public ResponseEntity<Object> getTaskInfosById(@PathVariable String id){ public ResponseEntity<Object> getTaskInfosById(@PathVariable String id){
return new ResponseEntity<>(externalTaskService.getTaskInfosById(id), HttpStatus.OK); return new ResponseEntity<>(externalTaskService.getTaskInfosByTaskCode(id), HttpStatus.OK);
} }
} }

View File

@@ -30,9 +30,9 @@ public interface ExternalTaskService {
WebResponse getTaskInfos(); WebResponse getTaskInfos();
/** /**
* 根据任务号查询任务信息 * 外部API 根据任务号查询任务信息
* @param task_code * @param task_code
* @return WebResponse * @return WebResponse
*/ */
WebResponse getTaskInfosById(String task_code); WebResponse getTaskInfosByTaskCode(String task_code);
} }

View File

@@ -1,7 +1,10 @@
package org.nl.externalApi.task.service.impl; package org.nl.externalApi.task.service.impl;
import cn.hutool.core.bean.BeanUtil;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.nl.api.task.api.TaskAPI; 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.param.CreateTaskParam;
import org.nl.externalApi.task.service.ExternalTaskService; import org.nl.externalApi.task.service.ExternalTaskService;
import org.nl.response.WebResponse; import org.nl.response.WebResponse;
@@ -19,21 +22,22 @@ public class ExternalTaskServiceImpl implements ExternalTaskService {
@Override @Override
public WebResponse createTask(CreateTaskParam createTaskParam) { public WebResponse createTask(CreateTaskParam createTaskParam) {
return null; TaskRequestParam taskRequestParam = BeanUtil.toBean(createTaskParam, TaskRequestParam.class);
return taskAPI.createTask(taskRequestParam, TaskSourceEnum.EXTERNAL_API.getName());
} }
@Override @Override
public WebResponse cancelTask(String task_code) { public WebResponse cancelTask(String task_code) {
return null; return taskAPI.cancelTask(task_code);
} }
@Override @Override
public WebResponse getTaskInfos() { public WebResponse getTaskInfos() {
return null; return taskAPI.queryNotFinishTaskInfos();
} }
@Override @Override
public WebResponse getTaskInfosById(String task_code) { public WebResponse getTaskInfosByTaskCode(String task_code) {
return null; return taskAPI.queryTaskInfoByTaskCode(task_code);
} }
} }

View File

@@ -108,4 +108,15 @@ public class TaskAPIProvider implements TaskAPI {
public boolean queryTaskInfoByDestination(String destination) { public boolean queryTaskInfoByDestination(String destination) {
return taskService.count(new LambdaQueryWrapper<>(Task.class).eq(Task::getDestinations, destination).lt(Task::getStatus,TaskStatusEnum.FINISHED.getCode())) >0; 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());
}
} }

View File

@@ -157,7 +157,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
if (result == null || !result.isOk()){ if (result == null || !result.isOk()){
throw new BadRequestException(LangProcess.msg("task_schedule_create_failed")); throw new BadRequestException(LangProcess.msg("task_schedule_create_failed"));
} }
return WebResponse.requestOk(); return WebResponse.requestParamOk(task.getTask_code());
}catch (Exception e){ }catch (Exception e){
log.error("创建任务失败:{}",e.getMessage()); log.error("创建任务失败:{}",e.getMessage());
throw new BadRequestException(LangProcess.msg("task_create_failed",e.getMessage())); throw new BadRequestException(LangProcess.msg("task_create_failed",e.getMessage()));

View File

@@ -46,6 +46,7 @@ security:
# frobot屏幕操作 # frobot屏幕操作
- /schedule/vehicle/** - /schedule/vehicle/**
- /schedule/setting/** - /schedule/setting/**
- /external/api/**
- /task/** - /task/**
- /mapinfo/** - /mapinfo/**
- /security/** - /security/**