From 7d52cc782d9a4a38f2835cafec133ff58159d297 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 10 Jun 2020 09:59:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B1=85=E6=B0=91=E7=AB=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiResidentConfigController.java | 9 +++++---- .../java/com/elink/esua/epdc/dao/ResidentConfigDao.java | 2 +- .../elink/esua/epdc/service/ResidentConfigService.java | 2 +- .../epdc/service/impl/ResidentConfigServiceImpl.java | 4 ++-- .../src/main/resources/mapper/ResidentConfigDao.xml | 3 +++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java index 5d224b5f..21291749 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java @@ -5,6 +5,7 @@ import com.elink.esua.epdc.dto.result.ResidentConfigResultDTO; import com.elink.esua.epdc.service.ResidentConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -24,14 +25,14 @@ public class ApiResidentConfigController { private ResidentConfigService residentConfigService; /** - * @Description 获取所有居民端配置 + * @Description 获取居民端配置 * @Author songyunpeng * @Date 2020/6/9 * @Param [residentType] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - @GetMapping("getResidentConfig") - public Result> getImgUrlList(){ - return residentConfigService.listResidentConfig(); + @GetMapping("getResidentConfig/{residentType}") + public Result> getImgUrlList(@PathVariable("residentType") String residentType){ + return residentConfigService.listResidentConfig(residentType); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java index 12523e4a..61b8c3de 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java @@ -51,7 +51,7 @@ public interface ResidentConfigDao extends BaseDao { * @Param [residentType] * @return java.util.List **/ - List selectListResidentConfigByResidentType(); + List selectListResidentConfigByResidentType(String residentType); /** * @Description 根据类型和编码获取配置 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java index 1547779d..d53db97e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java @@ -103,7 +103,7 @@ public interface ResidentConfigService extends BaseService * @Param [residentType] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - Result> listResidentConfig(); + Result> listResidentConfig(String residentType); /** * @Description 根据类型和编码获取配置 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java index 5aeda932..f2ee5d99 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java @@ -114,8 +114,8 @@ public class ResidentConfigServiceImpl extends BaseServiceImpl> listResidentConfig() { - return new Result>().ok(baseDao.selectListResidentConfigByResidentType()); + public Result> listResidentConfig(String residentType) { + return new Result>().ok(baseDao.selectListResidentConfigByResidentType(residentType)); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml index 3e825f8a..a3246a7b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml @@ -49,6 +49,9 @@ FROM `epdc_resident_config` WHERE DEL_FLAG = 0 + + and RESIDENT_TYPE = #{residentType} + ORDER BY SORT,CREATED_TIME DESC