From 2407369bb9aa5498e5138cd842fdd82428a56224 Mon Sep 17 00:00:00 2001 From: liejiu946 Date: Mon, 9 Mar 2026 10:25:02 +0800 Subject: [PATCH] =?UTF-8?q?opt:1.=E7=AB=99=E7=82=B9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=822.=E6=B7=BB=E5=8A=A0=E5=A4=96?= =?UTF-8?q?=E9=83=A8API=E6=9F=A5=E8=AF=A2=E7=AB=99=E7=82=B9=E6=8E=A5?= =?UTF-8?q?=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/map/api/MapAPI.java | 16 ++++++++++++ .../controller/ExternalTaskController.java | 6 +++++ .../task/service/ExternalTaskService.java | 6 +++++ .../service/impl/ExternalTaskServiceImpl.java | 9 +++++++ .../org/nl/map/provider/MapAPIProvider.java | 25 +++++++++++++++++++ .../service/impl/MapStationServiceImpl.java | 3 ++- 6 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 nl-business-api/src/main/java/org/nl/api/map/api/MapAPI.java create mode 100644 nl-business-map/src/main/java/org/nl/map/provider/MapAPIProvider.java diff --git a/nl-business-api/src/main/java/org/nl/api/map/api/MapAPI.java b/nl-business-api/src/main/java/org/nl/api/map/api/MapAPI.java new file mode 100644 index 0000000..151913a --- /dev/null +++ b/nl-business-api/src/main/java/org/nl/api/map/api/MapAPI.java @@ -0,0 +1,16 @@ +package org.nl.api.map.api; + +import org.nl.response.WebResponse; + +/** + * @author dsh + * 2026/3/9 + */ +public interface MapAPI { + + /** + * 获取所有站点 + * @return + */ + WebResponse getAllStations(); +} 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 bda0140..3b1e644 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 @@ -46,4 +46,10 @@ public class ExternalTaskController { public ResponseEntity getTaskInfosById(@PathVariable String id){ return new ResponseEntity<>(externalTaskService.getTaskInfosByTaskCode(id), HttpStatus.OK); } + + @GetMapping("/getAllStations") + @Log("外部API:查询全部站点") + public ResponseEntity getAllStations(){ + return new ResponseEntity<>(externalTaskService.getAllStations(), 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 ce0edc8..0494f1e 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 @@ -35,4 +35,10 @@ public interface ExternalTaskService { * @return WebResponse */ WebResponse getTaskInfosByTaskCode(String task_code); + + /** + * 外部API 查询所有站点 + * @return + */ + WebResponse getAllStations(); } 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 9cefb84..9af0af2 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 @@ -2,6 +2,7 @@ package org.nl.externalApi.task.service.impl; import cn.hutool.core.bean.BeanUtil; import jakarta.annotation.Resource; +import org.nl.api.map.api.MapAPI; import org.nl.api.task.api.TaskAPI; import org.nl.api.task.core.TaskRequestParam; import org.nl.enums.TaskSourceEnum; @@ -20,6 +21,9 @@ public class ExternalTaskServiceImpl implements ExternalTaskService { @Resource private TaskAPI taskAPI; + @Resource + private MapAPI mapAPI; + @Override public WebResponse createTask(CreateTaskParam createTaskParam) { TaskRequestParam taskRequestParam = BeanUtil.toBean(createTaskParam, TaskRequestParam.class); @@ -40,4 +44,9 @@ public class ExternalTaskServiceImpl implements ExternalTaskService { public WebResponse getTaskInfosByTaskCode(String task_code) { return taskAPI.queryTaskInfoByTaskCode(task_code); } + + @Override + public WebResponse getAllStations() { + return mapAPI.getAllStations(); + } } diff --git a/nl-business-map/src/main/java/org/nl/map/provider/MapAPIProvider.java b/nl-business-map/src/main/java/org/nl/map/provider/MapAPIProvider.java new file mode 100644 index 0000000..75a885a --- /dev/null +++ b/nl-business-map/src/main/java/org/nl/map/provider/MapAPIProvider.java @@ -0,0 +1,25 @@ +package org.nl.map.provider; + +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.nl.api.map.api.MapAPI; +import org.nl.map.station.service.MapStationService; +import org.nl.response.WebResponse; +import org.springframework.stereotype.Service; + +/** + * @author dsh + * 2026/3/9 + */ +@Slf4j +@Service +public class MapAPIProvider implements MapAPI { + + @Resource + private MapStationService mapStationService; + + @Override + public WebResponse getAllStations() { + return mapStationService.queryAllStation(); + } +} diff --git a/nl-business-map/src/main/java/org/nl/map/station/service/impl/MapStationServiceImpl.java b/nl-business-map/src/main/java/org/nl/map/station/service/impl/MapStationServiceImpl.java index 6f23777..0790780 100644 --- a/nl-business-map/src/main/java/org/nl/map/station/service/impl/MapStationServiceImpl.java +++ b/nl-business-map/src/main/java/org/nl/map/station/service/impl/MapStationServiceImpl.java @@ -1,5 +1,6 @@ package org.nl.map.station.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; @@ -23,6 +24,6 @@ public class MapStationServiceImpl extends ServiceImpl i @Override public WebResponse queryAllStation() { - return WebResponse.requestParamOk(stationMapper.selectList(new QueryWrapper<>())); + return WebResponse.requestParamOk(stationMapper.selectList(new LambdaQueryWrapper<>(Station.class).orderByAsc(Station::getStation_name))); } }