From ab30fb1668f08e099043dd9980b033ab91f83ce1 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 18 May 2020 15:10:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=8A=A0=E6=8E=92=E5=BA=8F=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/dto/StartupPageDTO.java | 4 ++++ .../com/elink/esua/epdc/controller/StartupController.java | 8 +++++--- .../main/java/com/elink/esua/epdc/dao/StartupPageDao.java | 2 +- .../com/elink/esua/epdc/entity/StartupPageEntity.java | 5 +++++ .../com/elink/esua/epdc/service/StartupPageService.java | 2 +- .../esua/epdc/service/impl/StartupPageServiceImpl.java | 2 +- .../src/main/resources/mapper/StartupPageDao.xml | 7 +++---- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/StartupPageDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/StartupPageDTO.java index b65304ae..b3d0086a 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/StartupPageDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/StartupPageDTO.java @@ -48,6 +48,10 @@ public class StartupPageDTO implements Serializable { * 图片地址 - 前台展示使用 */ private List imgUrlList; + /** + * 排序 + */ + private Integer sort; /** * 停留时长 单位：秒 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupController.java index 24aca387..4eb1162a 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupController.java @@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @Description 启动页管理 启动页管理 * @Author songyunpeng @@ -45,8 +47,8 @@ public class StartupController { * @Param [] **/ @GetMapping("getStartupPage") - public Result getStartupPage() { - StartupPageResultDTO data = startupPageService.getStartupPage(); - return new Result().ok(data); + public Result> getStartupPage() { + List data = startupPageService.getStartupPage(); + return new Result>().ok(data); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/StartupPageDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/StartupPageDao.java index da4823c8..7ef9121f 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/StartupPageDao.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/StartupPageDao.java @@ -49,5 +49,5 @@ public interface StartupPageDao extends BaseDao { * @Param [] * @return com.elink.esua.dto.StartupPageDTO **/ - StartupPageResultDTO getStartupPage(); + List getStartupPage(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/StartupPageEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/StartupPageEntity.java index 2dc04f35..3f932087 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/StartupPageEntity.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/StartupPageEntity.java @@ -34,6 +34,11 @@ public class StartupPageEntity extends BaseEpdcEntity { private static final long serialVersionUID = 1L; + + /** + * 排序 + */ + private Integer sort; /** * 图片地址 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java index 5515fe91..2da99294 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java @@ -109,5 +109,5 @@ public interface StartupPageService extends BaseService { * @Date 2020/3/24 * @Param [] **/ - StartupPageResultDTO getStartupPage(); + List getStartupPage(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/StartupPageServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/StartupPageServiceImpl.java index 674defd2..03ec614f 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/StartupPageServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/StartupPageServiceImpl.java @@ -111,7 +111,7 @@ public class StartupPageServiceImpl extends BaseServiceImpl getStartupPage() { return baseDao.getStartupPage(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/StartupPageDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/StartupPageDao.xml index 1b92d9cd..3f1235cd 100755 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/StartupPageDao.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/StartupPageDao.xml @@ -18,17 +18,16 @@ \ No newline at end of file