1、修改APP扫码开关管理功能和接口

2、修改居民端启动页管理功能和接口

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanSwitchDTO.java

@@ -86,4 +86,9 @@ public class ScanSwitchDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+	/**
+	 * 平台：0-e锦水，1-志愿者去哪
+	 */
+	private String platform;
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/StartupPageDTO.java

@@ -98,4 +98,9 @@ public class StartupPageDTO implements Serializable {
      */
 	private String delFlag;
 
-}
+	/**
+	 * 平台：0-e锦水，1-志愿者去哪
+	 */
+	private String platform;
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppScanVersionNumDTO.java

@@ -38,4 +38,9 @@ public class EpdcAppScanVersionNumDTO implements Serializable {
     @NotBlank(message = "版本号不能为空")
     private String versionNum;
 
-}
+    /**
+     * 平台：0-e锦水，1-志愿者去哪
+     */
+    private String platform;
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppScanFlagDTO.java

@@ -49,4 +49,9 @@ public class EpdcAppScanFlagDTO implements Serializable {
      */
     private String maintainInfo;
 
-}
+    /**
+     * 平台：0-e锦水，1-志愿者去哪
+     */
+    private String platform;
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcStartupPageFormDTO.java

@@ -0,0 +1,18 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Liuchuang
+ */
+@Data
+public class EpdcStartupPageFormDTO implements Serializable {
+    private static final long serialVersionUID = 8243694943324254390L;
+
+    /**
+     * 平台：0-e锦水，1-志愿者去哪
+     */
+    private String platform;
+}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/StartupPageResultDTO.java

@@ -47,6 +47,9 @@ public class StartupPageResultDTO implements Serializable {
      */
 	private Integer duration;
 
+    /**
+     * 平台：0-e锦水，1-志愿者去哪
+     */
+    private String platform;
 
-
-}
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -28,6 +29,7 @@ import com.elink.esua.epdc.dto.ScanSwitchDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO;
 import com.elink.esua.epdc.service.ScanSwitchService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,7 +45,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("ma")
 public class ApiScanSwitchController {
-    
+
     @Autowired
     private ScanSwitchService scanSwitchService;
 
@@ -92,9 +94,12 @@ public class ApiScanSwitchController {
      */
     @GetMapping("scanSwitch")
     public Result<EpdcAppScanFlagDTO> get(EpdcAppScanVersionNumDTO scanVersionNumDTO){
+        if (StringUtils.isEmpty(scanVersionNumDTO.getPlatform())) {
+            scanVersionNumDTO.setPlatform(NumConstant.ZERO_STR);
+        }
         //效验数据
         ValidatorUtils.validateEntity(scanVersionNumDTO);
         EpdcAppScanFlagDTO data = scanSwitchService.getOneScanInfo(scanVersionNumDTO);
         return new Result<EpdcAppScanFlagDTO>().ok(data);
     }
-}
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/StartupController.java

@@ -17,9 +17,12 @@
 
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.result.EpdcStartupPageFormDTO;
 import com.elink.esua.epdc.dto.result.StartupPageResultDTO;
 import com.elink.esua.epdc.service.StartupPageService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,9 +49,12 @@ public class StartupController {
      * @Param []
      **/
     @GetMapping("getStartupPage")
-    public Result<StartupPageResultDTO> getStartupPage() {
-        StartupPageResultDTO data = startupPageService.getStartupPage();
+    public Result<StartupPageResultDTO> getStartupPage(EpdcStartupPageFormDTO formDto) {
+        if (StringUtils.isEmpty(formDto.getPlatform())) {
+            formDto.setPlatform(NumConstant.ZERO_STR);
+        }
+        StartupPageResultDTO data = startupPageService.getStartupPage(formDto);
         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

@@ -2,9 +2,12 @@ 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.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.result.EpdcStartupPageFormDTO;
 import com.elink.esua.epdc.dto.result.StartupPageResultDTO;
 import com.elink.esua.epdc.service.StartupPageService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,8 +36,11 @@ public class ApiStartupV2Controller {
      * @Param []
      **/
     @GetMapping("getStartupPage")
-    public Result<List<StartupPageResultDTO>> getStartupPage() {
-        List<StartupPageResultDTO> data = startupPageService.getStartupPageV2();
+    public Result<List<StartupPageResultDTO>> getStartupPage(EpdcStartupPageFormDTO formDto) {
+        if (StringUtils.isEmpty(formDto.getPlatform())) {
+            formDto.setPlatform(NumConstant.ZERO_STR);
+        }
+        List<StartupPageResultDTO> data = startupPageService.getStartupPageV2(formDto);
         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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.StartupPageDTO;
+import com.elink.esua.epdc.dto.result.EpdcStartupPageFormDTO;
 import com.elink.esua.epdc.dto.result.StartupPageResultDTO;
 import com.elink.esua.epdc.entity.StartupPageEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -49,7 +50,7 @@ public interface StartupPageDao extends BaseDao<StartupPageEntity> {
      * @Param []
      * @return com.elink.esua.dto.StartupPageDTO
      **/
-    StartupPageResultDTO getStartupPage();
+    StartupPageResultDTO getStartupPage(EpdcStartupPageFormDTO formDto);
     /**
      * @Description  获取欢迎页信息 v2
      * @Author songyunpeng
@@ -57,5 +58,5 @@ public interface StartupPageDao extends BaseDao<StartupPageEntity> {
      * @Param []
      * @return com.elink.esua.dto.StartupPageDTO
      **/
-    List<StartupPageResultDTO> getStartupPageV2();
-}
+    List<StartupPageResultDTO> getStartupPageV2(EpdcStartupPageFormDTO formDto);
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java

@@ -56,4 +56,9 @@ public class ScanSwitchEntity extends BaseEpdcEntity {
 	 */
 	private String maintainInfo;
 
-}
+	/**
+	 * 平台：0-e锦水，1-志愿者去哪
+	 */
+	private String platform;
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/StartupPageEntity.java

@@ -59,4 +59,9 @@ public class StartupPageEntity extends BaseEpdcEntity {
      */
 	private String remark;
 
-}
+    /**
+     * 平台：0-e锦水，1-志愿者去哪
+     */
+    private String platform;
+
+}

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

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.StartupPageDTO;
+import com.elink.esua.epdc.dto.result.EpdcStartupPageFormDTO;
 import com.elink.esua.epdc.dto.result.StartupPageResultDTO;
 import com.elink.esua.epdc.entity.StartupPageEntity;
 
@@ -109,7 +110,7 @@ public interface StartupPageService extends BaseService<StartupPageEntity> {
      * @Date 2020/3/24
      * @Param []
      **/
-    StartupPageResultDTO getStartupPage();
+    StartupPageResultDTO getStartupPage(EpdcStartupPageFormDTO formDto);
     /**
      * @return com.elink.esua.dto.StartupPageResultDTO
      * @Description 获取欢迎页信息 v2
@@ -117,5 +118,5 @@ public interface StartupPageService extends BaseService<StartupPageEntity> {
      * @Date 2020/3/24
      * @Param []
      **/
-    List<StartupPageResultDTO> getStartupPageV2();
-}
+    List<StartupPageResultDTO> getStartupPageV2(EpdcStartupPageFormDTO formDto);
+}

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

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dao.StartupPageDao;
 import com.elink.esua.epdc.dto.StartupPageDTO;
+import com.elink.esua.epdc.dto.result.EpdcStartupPageFormDTO;
 import com.elink.esua.epdc.dto.result.StartupPageResultDTO;
 import com.elink.esua.epdc.entity.StartupPageEntity;
 import com.elink.esua.epdc.service.StartupPageService;
@@ -111,13 +112,13 @@ public class StartupPageServiceImpl extends BaseServiceImpl<StartupPageDao, Star
     }
 
     @Override
-    public StartupPageResultDTO getStartupPage() {
-        return baseDao.getStartupPage();
+    public StartupPageResultDTO getStartupPage(EpdcStartupPageFormDTO formDto) {
+        return baseDao.getStartupPage(formDto);
     }
 
     @Override
-    public List<StartupPageResultDTO> getStartupPageV2() {
-        return baseDao.getStartupPageV2();
+    public List<StartupPageResultDTO> getStartupPageV2(EpdcStartupPageFormDTO formDto) {
+        return baseDao.getStartupPageV2(formDto);
     }
 
-}
+}

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

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