From fa4d9a46cac684e7f1f518751d327c2557d91b1d Mon Sep 17 00:00:00 2001 From: Coolkid Date: Fri, 26 Jan 2024 16:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=97=E5=8E=8B=EF=BC=8C?= =?UTF-8?q?=E6=B8=97=E6=B5=81=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/BasicDataController.java | 16 +++++++++++++++- .../project/xyt/service/StAdcdService.java | 2 +- .../project/xyt/service/StSpgPztbService.java | 2 -- .../project/xyt/service/StSpgSpprmpService.java | 1 - src/main/resources/mapper/StSpgSpprmpMapper.xml | 2 +- .../project/xyt/service/StAdcdServiceTest.java | 12 ++++++------ 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java b/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java index cef4327..c539e9f 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java @@ -122,6 +122,15 @@ public class BasicDataController { return R.ok(stAdcdService.queryBySearch(search)); } + @Get(path = "/adcd/search/query", summary = "查询单个行政区划接口") + public R queryAddvcdById( + @RequestParam(name="adcd") + @Parameter(in = ParameterIn.QUERY, name="adcd",description = "行政区划编码 为空查询全部，不为空查询下级树,比如4205查4205开头的所有返回树型结构") + String adcd + ){ + return R.ok(stAdcdService.queryByAddvcd(adcd)); + } + @Get(path = "/adcd/search/tree", summary = "查询行政区划树接口") public R> queryAddvcdTree( @RequestParam(required = false, name="adcd") @@ -192,11 +201,16 @@ public class BasicDataController { } - @Post(path = "/stcd/search/query", summary = "测站列表查询接口") + @Post(path = "/stcd/search/query", summary = "测站列表查询接口-结果集带分页信息") public R> queryStcdList(@Validated @RequestBody StcdSearch search) { return R.ok(stStbprpService.queryBySearch(search)); } + @Post(path = "/stcd/search/querySelect", summary = "测站列表查询接口-下拉菜单查询使用，不带分页信息") + public R> queryStcdSelect(@Validated @RequestBody StcdSearch search) { + return R.ok(stStbprpService.queryListBySearch(search)); + } + @Post(path = "/stcd/search/check", summary = "检查测站编码是否存在接口") public R checkStcdExist(@RequestBody @Validated CheckStringSearch checkStringSearch) { try { diff --git a/src/main/java/com/gunshi/project/xyt/service/StAdcdService.java b/src/main/java/com/gunshi/project/xyt/service/StAdcdService.java index dc30bcf..963cb9e 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StAdcdService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StAdcdService.java @@ -39,7 +39,7 @@ public class StAdcdService extends BaseOrderDao { * @param addcd 区划编码 * @return 区划 */ - public StAddvcdD queryByAddcd(String addcd) { + public StAddvcdD queryByAddvcd(String addcd) { return this.getBaseMapper().selectById(addcd); } diff --git a/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java b/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java index 6346354..63164b4 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java @@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.project.xyt.entity.basedata.CheckStringSearch; import com.gunshi.project.xyt.entity.basedata.GeneralSearch; import com.gunshi.project.xyt.entity.basedata.StSpgPztbVo; -import com.gunshi.project.xyt.entity.basedata.StSpgSpprmpVo; import com.gunshi.project.xyt.mapper.StSpgPztbMapper; import com.gunshi.project.xyt.model.StSpgPztb; -import com.gunshi.project.xyt.model.StSpgSpprmp; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java b/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java index a1424a2..5638e79 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java @@ -1,6 +1,5 @@ package com.gunshi.project.xyt.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.project.xyt.entity.basedata.CheckStringSearch; diff --git a/src/main/resources/mapper/StSpgSpprmpMapper.xml b/src/main/resources/mapper/StSpgSpprmpMapper.xml index bf7ddce..f48079b 100644 --- a/src/main/resources/mapper/StSpgSpprmpMapper.xml +++ b/src/main/resources/mapper/StSpgSpprmpMapper.xml @@ -163,7 +163,7 @@