banner接口，增加：banner类型参数: 0-(活动/志愿者banner)， 2-志愿者证书

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
@@ -109,7 +110,7 @@ public class ApiAppActInfoController {
     }
 
     @GetMapping("banner/list")
-    public Result<List<ActBannerDTO>> bannerList() {
+    public Result<List<ActBannerDTO>> bannerList(EpdcAppBannerFormDTO dto) {
-        return actInfoService.getBannerList();
+        return actInfoService.getBannerList(dto);
     }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
@@ -61,7 +62,7 @@ public interface ActInfoFeignClient {
     Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id);
 
     @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<ActBannerDTO>> getBannerList();
+    Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto);
 
 
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign.fallback;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
@@ -42,8 +43,8 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getCancelDetail", id);
     }
     @Override
-    public Result<List<ActBannerDTO>> getBannerList() {
+    public Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList", dto);
     }
 
 

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -45,7 +46,7 @@ public interface ActInfoService {
 
     Result<ActInfoDetailAppResultDTO> getCancelDetail(String itemId);
 
-    Result<List<ActBannerDTO>> getBannerList();
+    Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto);
 
 
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -47,7 +48,7 @@ public class ActInfoServiceImpl implements ActInfoService {
         return actInfoFeignClient.getCancelDetail(itemId);
     }
     @Override
-    public Result<List<ActBannerDTO>> getBannerList() {
+    public Result<List<ActBannerDTO>> getBannerList(EpdcAppBannerFormDTO dto) {
-        return actInfoFeignClient.getBannerList();
+        return actInfoFeignClient.getBannerList(dto);
     }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.activity.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * banner列表入参
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-06-02
+ */
+@Data
+public class EpdcAppBannerFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * banner类型:0-(活动/志愿者banner)， 2-志愿者证书
+     */
+    private String bannerType;
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.activity.controller;
 
 import com.elink.esua.epdc.activity.ActBannerDTO;
+import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -68,9 +69,12 @@ public class ActBannerController {
     }
 
     @GetMapping("bannerlist")
-    public Result<List<ActBannerDTO>> getBannerList(){
+    public Result<List<ActBannerDTO>> getBannerList(@RequestBody EpdcAppBannerFormDTO dto){
         Map<String, Object> params =new HashMap<String, Object>();
         params.put("status","1");
+        if (null != dto.getBannerType()) {
+            params.put("bannerType", dto.getBannerType());
+        }
         List<ActBannerDTO> data = actBannerService.list(params);
         return new Result<List<ActBannerDTO>>().ok(data);
     }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml

@@ -107,6 +107,9 @@
         <if test="status != null and status != ''">
             AND banner.STATUS = #{status}
         </if>
+        <if test="bannerType != null and bannerType != ''">
+            AND banner.BANNER_TYPE = #{bannerType}
+        </if>
         ORDER BY
         banner.CREATED_TIME DESC
     </select>