From 27d2e9dce019b804e5add501d578cd6171eee522 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 10 Jun 2020 09:25:13 +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?= 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 | 1 - 5 files changed, 8 insertions(+), 10 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 5f2759a2..5d224b5f 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,7 +5,6 @@ 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; @@ -25,14 +24,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/{residentType}") - public Result> getImgUrlList(@PathVariable("residentType") String residentType){ - return residentConfigService.listResidentConfig(residentType); + @GetMapping("getResidentConfig") + public Result> getImgUrlList(){ + return residentConfigService.listResidentConfig(); } } 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 61b8c3de..12523e4a 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(String residentType); + List selectListResidentConfigByResidentType(); /** * @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 d53db97e..1547779d 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(String residentType); + Result> listResidentConfig(); /** * @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 f2ee5d99..5aeda932 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(String residentType) { - return new Result>().ok(baseDao.selectListResidentConfigByResidentType(residentType)); + public Result> listResidentConfig() { + return new Result>().ok(baseDao.selectListResidentConfigByResidentType()); } @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 0a243b2c..7a086af9 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 @@ -48,7 +48,6 @@ FROM `epdc_resident_config` WHERE DEL_FLAG = 0 - AND RESIDENT_TYPE = #{residentType} ORDER BY SORT,CREATED_TIME DESC