Merge remote-tracking branch 'origin/feature/lc_modifyStartPage'

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<String> imgUrlList;
+    /**
+     * 排序
+     */
+    private Integer sort;
 
     /**
      * 停留时长 单位：秒

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
@@ -36,7 +38,6 @@ public class StartupController {
 
     @Autowired
     private StartupPageService startupPageService;
-
     /**
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.dto.result.StartupPageResultDTO>
      * @Description 获取欢迎页信息
@@ -49,4 +50,5 @@ public class StartupController {
         StartupPageResultDTO data = startupPageService.getStartupPage();
         return new Result<StartupPageResultDTO>().ok(data);
     }
+
 }

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<com.elink.esua.dto.result.StartupPageResultDTO>
+     * @Description 获取欢迎页信息 v2
+     * @Author songyunpeng
+     * @Date 2020/3/25
+     * @Param []
+     **/
+    @GetMapping("getStartupPage")
+    public Result<List<StartupPageResultDTO>> getStartupPage() {
+        List<StartupPageResultDTO> data = startupPageService.getStartupPageV2();
+        return new Result<List<StartupPageResultDTO>>().ok(data);
+    }
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/StartupPageDao.java

@@ -50,4 +50,12 @@ public interface StartupPageDao extends BaseDao<StartupPageEntity> {
      * @return com.elink.esua.dto.StartupPageDTO
      **/
     StartupPageResultDTO getStartupPage();
+    /**
+     * @Description  获取欢迎页信息 v2
+     * @Author songyunpeng
+     * @Date  2020/3/24
+     * @Param []
+     * @return com.elink.esua.dto.StartupPageDTO
+     **/
+    List<StartupPageResultDTO> getStartupPageV2();
 }

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;
     /**
      * 图片地址
      */

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/StartupPageService.java

@@ -110,4 +110,12 @@ public interface StartupPageService extends BaseService<StartupPageEntity> {
      * @Param []
      **/
     StartupPageResultDTO getStartupPage();
+    /**
+     * @return com.elink.esua.dto.StartupPageResultDTO
+     * @Description 获取欢迎页信息 v2
+     * @Author songyunpeng
+     * @Date 2020/3/24
+     * @Param []
+     **/
+    List<StartupPageResultDTO> getStartupPageV2();
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/StartupPageServiceImpl.java

@@ -115,4 +115,9 @@ public class StartupPageServiceImpl extends BaseServiceImpl<StartupPageDao, Star
         return baseDao.getStartupPage();
     }
 
+    @Override
+    public List<StartupPageResultDTO> getStartupPageV2() {
+        return baseDao.getStartupPageV2();
+    }
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/StartupPageDao.xml

@@ -18,10 +18,10 @@
     </resultMap>
 
     <select id="selectListOfStartupPageDTO" resultType="com.elink.esua.epdc.dto.StartupPageDTO">
-        select ID,IMG_URL,DURATION,ENABLE_FLAG,REMARK,CREATED_TIME,UPDATED_TIME
+        select ID,IMG_URL,DURATION,ENABLE_FLAG,REMARK,SORT,CREATED_TIME,UPDATED_TIME
         from epdc_startup_page
         where DEL_FLAG = '0'
-        order by CREATED_TIME desc
+        order by SORT asc ,CREATED_TIME desc
     </select>
 
     <select id="getStartupPage" resultType="com.elink.esua.epdc.dto.result.StartupPageResultDTO">
@@ -31,4 +31,10 @@
         order by UPDATED_TIME desc
         limit 1
     </select>
+    <select id="getStartupPageV2" resultType="com.elink.esua.epdc.dto.result.StartupPageResultDTO">
+        select ID,IMG_URL,DURATION
+        from epdc_startup_page
+        where ENABLE_FLAG = '1' and DEL_FLAG = '0'
+        order by SORT asc, UPDATED_TIME desc
+    </select>
 </mapper>