From ab30fb1668f08e099043dd9980b033ab91f83ce1 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 18 May 2020 15:10:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=8A=A0=E6=8E=92=E5=BA=8F=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=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 From 607fcb97d309b084d2ce90937499e9097b884eb9 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 18 May 2020 15:33:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/StartupController.java | 8 ++-- .../controller/v2/ApiStartupV2Controller.java | 40 +++++++++++++++++++ .../elink/esua/epdc/dao/StartupPageDao.java | 10 ++++- .../esua/epdc/service/StartupPageService.java | 10 ++++- .../service/impl/StartupPageServiceImpl.java | 7 +++- .../main/resources/mapper/StartupPageDao.xml | 7 ++++ 6 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiStartupV2Controller.java 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 4eb1162a..6b9dadd8 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 @@ -38,7 +38,6 @@ public class StartupController { @Autowired private StartupPageService startupPageService; - /** * @return com.elink.esua.epdc.commons.tools.utils.Result * @Description 获取欢迎页信息 @@ -47,8 +46,9 @@ public class StartupController { * @Param [] **/ @GetMapping("getStartupPage") - public Result> getStartupPage() { - List data = startupPageService.getStartupPage(); - return new Result>().ok(data); + public Result getStartupPage() { + StartupPageResultDTO 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/controller/v2/ApiStartupV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiStartupV2Controller.java new file mode 100644 index 00000000..898146d5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiStartupV2Controller.java @@ -0,0 +1,40 @@ +package com.elink.esua.epdc.controller.v2; + +import com.elink.esua.epdc.commons.api.version.ApiVersion; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.result.StartupPageResultDTO; +import com.elink.esua.epdc.service.StartupPageService; +import org.springframework.beans.factory.annotation.Autowired; +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; + +/** + * @author songyunpeng + * @Description 启动页管理 v2 + * @create 2020-05-18 + */ +@ApiVersion(2) +@RestController +@RequestMapping("startup" + Constant.VERSION_CONTROL) +public class ApiStartupV2Controller { + + @Autowired + private StartupPageService startupPageService; + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 获取欢迎页信息 v2 + * @Author songyunpeng + * @Date 2020/3/25 + * @Param [] + **/ + @GetMapping("getStartupPage") + public Result> getStartupPage() { + List data = startupPageService.getStartupPageV2(); + return new Result>().ok(data); + } +} 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 7ef9121f..e749077b 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,13 @@ public interface StartupPageDao extends BaseDao { * @Param [] * @return com.elink.esua.dto.StartupPageDTO **/ - List getStartupPage(); + StartupPageResultDTO getStartupPage(); + /** + * @Description 获取欢迎页信息 v2 + * @Author songyunpeng + * @Date 2020/3/24 + * @Param [] + * @return com.elink.esua.dto.StartupPageDTO + **/ + List getStartupPageV2(); } \ 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/StartupPageService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java index 2da99294..b5eebbe1 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,13 @@ public interface StartupPageService extends BaseService { * @Date 2020/3/24 * @Param [] **/ - List getStartupPage(); + StartupPageResultDTO getStartupPage(); + /** + * @return com.elink.esua.dto.StartupPageResultDTO + * @Description 获取欢迎页信息 v2 + * @Author songyunpeng + * @Date 2020/3/24 + * @Param [] + **/ + List getStartupPageV2(); } \ 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 03ec614f..055c29de 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,8 +111,13 @@ public class StartupPageServiceImpl extends BaseServiceImpl getStartupPage() { + public StartupPageResultDTO getStartupPage() { return baseDao.getStartupPage(); } + @Override + public List getStartupPageV2() { + return baseDao.getStartupPageV2(); + } + } \ No newline at end of file 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 3f1235cd..6a92191f 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 @@ -25,6 +25,13 @@ +