From a0f8a237d2b93791502ae6f46ffd24f98424bacb Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 23 May 2023 09:49:15 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=8E=A2=E6=B5=8B=E5=99=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2Type=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=EF=BC=8C=E5=8F=B0=E7=AB=99=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?Type=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/GardsDetectorsController.java | 9 +++++++++ .../system/controller/GardsStationsController.java | 11 +++++++++-- .../modules/system/mapper/GardsDetectorsMapper.java | 4 ++++ .../modules/system/mapper/GardsStationsMapper.java | 2 ++ .../system/mapper/xml/GardsDetectorsMapper.xml | 6 +++++- .../modules/system/mapper/xml/GardsStationsMapper.xml | 4 ++++ .../system/service/IGardsDetectorsService.java | 6 ++++++ .../modules/system/service/IGardsStationsService.java | 6 ++++++ .../service/impl/GardsDetectorsServiceImpl.java | 6 ++++++ .../system/service/impl/GardsStationsServiceImpl.java | 6 ++++++ 10 files changed, 57 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java index 8526be5c..7848e947 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsDetectorsController.java @@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("gardsDetectors") @Api(value = "监测器管理", tags = "监测器管理") @@ -35,6 +37,13 @@ public class GardsDetectorsController { return result; } + @GetMapping("findType") + @ApiOperation(value = "查询Type属性值", notes = "查询Type属性值") + public List findType(){ + List result = gardsDetectorsService.findType(); + return result; + } + @PostMapping("create") @ApiOperation(value = "新增监测器信息", notes = "新增监测器信息") public Result create(@RequestBody @Validated(value = InsertGroup.class) GardsDetectors gardsDetectors){ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java index 497b468e..2e063ec0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsStationsController.java @@ -48,11 +48,18 @@ public class GardsStationsController { return result; } + @GetMapping("findType") + @ApiOperation(value = "查询Type属性值", notes = "查询Type属性值") + public List findType(){ + List result = gardsStationsService.findType(); + return result; + } + @GetMapping("findCountryCode") @ApiOperation(value = "查询COUNTRY_CODE", notes = "查询COUNTRY_CODE") public List findCountryCode(){ - List countryCode = gardsStationsService.findCountryCode(); - return countryCode; + List result = gardsStationsService.findCountryCode(); + return result; } /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java index dc4aa2e0..88484f87 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsDetectorsMapper.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.system.entity.GardsDetectors; +import java.util.List; + public interface GardsDetectorsMapper extends BaseMapper { Page findPage(Page page, GardsDetectors gardsDetectors); + List findType(); + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsStationsMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsStationsMapper.java index 0cce035a..973d4180 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsStationsMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsStationsMapper.java @@ -7,6 +7,8 @@ import java.util.List; public interface GardsStationsMapper extends BaseMapper { + List findType(); + List findCountryCode(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml index edeaeb53..a3b9af6b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsDetectorsMapper.xml @@ -26,7 +26,7 @@ and DETECTOR_CODE like CONCAT('%',#{gardsDetectors.detectorCode},'%') - and RTRIM(TYPE, ' ') = #{gardsDetectors.type} + and TYPE = #{gardsDetectors.type} and RTRIM(STATUS, ' ') = #{gardsDetectors.status} @@ -34,4 +34,8 @@ + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsStationsMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsStationsMapper.xml index 23b55542..2c8941f1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsStationsMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsStationsMapper.xml @@ -2,6 +2,10 @@ + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java index f90df6e2..b028bc24 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsDetectorsService.java @@ -24,6 +24,12 @@ public interface IGardsDetectorsService extends IService { */ GardsDetectors findInfo(Integer id); + /** + * 查询Type属性值 + * @return + */ + List findType(); + /** * 新增监测器信息 * @param gardsDetectors diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java index 1f6b992b..b5f0bfb0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsStationsService.java @@ -25,6 +25,12 @@ public interface IGardsStationsService extends IService { */ GardsStations findInfo(Integer stationId); + /** + * 查询TYPE + * @return + */ + List findType(); + /** * 查询COUNTRY_CODE * @return diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java index 8b781eac..546aa282 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsDetectorsServiceImpl.java @@ -78,6 +78,12 @@ public class GardsDetectorsServiceImpl extends ServiceImpl findType() { + List type = this.baseMapper.findType(); + return type; + } + @Override public Result create(GardsDetectors gardsDetectors) { Result result = new Result(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java index 1917890b..eddbf13d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsStationsServiceImpl.java @@ -65,6 +65,12 @@ public class GardsStationsServiceImpl extends ServiceImpl findType() { + List type = this.baseMapper.findType(); + return type; + } + @Override public List findCountryCode() { List countryCode = this.baseMapper.findCountryCode();