From 3af61de6eaf42cbbd4b98d39f3cdc28bbf9969b0 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 2 Jun 2020 16:30:28 +0800 Subject: [PATCH] =?UTF-8?q?banner=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=EF=BC=9Abanner=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0:?= =?UTF-8?q?=200-(=E6=B4=BB=E5=8A=A8/=E5=BF=97=E6=84=BF=E8=80=85banner)?= =?UTF-8?q?=EF=BC=8C=202-=E5=BF=97=E6=84=BF=E8=80=85=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiAppActInfoController.java | 5 +++-- .../esua/epdc/feign/ActInfoFeignClient.java | 3 ++- .../fallback/ActInfoFeignClientFallback.java | 5 +++-- .../esua/epdc/service/ActInfoService.java | 3 ++- .../epdc/service/impl/ActInfoServiceImpl.java | 5 +++-- .../activity/form/EpdcAppBannerFormDTO.java | 22 +++++++++++++++++++ .../controller/ActBannerController.java | 6 ++++- .../mapper/activity/ActBannerDao.xml | 3 +++ 8 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java index cb152614..7abcbc73 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java +++ b/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> bannerList() { - return actInfoService.getBannerList(); + public Result> bannerList(EpdcAppBannerFormDTO dto) { + return actInfoService.getBannerList(dto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java index 95fd6e0e..0eb24268 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java +++ b/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 getCancelDetail(@PathVariable String id); @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> getBannerList(); + Result> getBannerList(EpdcAppBannerFormDTO dto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java index 0dc8b66e..0f2d1a98 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java +++ b/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> getBannerList() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList"); + public Result> getBannerList(EpdcAppBannerFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList", dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java index f8119a6e..28d7417c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java +++ b/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 getCancelDetail(String itemId); - Result> getBannerList(); + Result> getBannerList(EpdcAppBannerFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java index 654ffff5..b84de781 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java +++ b/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> getBannerList() { - return actInfoFeignClient.getBannerList(); + public Result> getBannerList(EpdcAppBannerFormDTO dto) { + return actInfoFeignClient.getBannerList(dto); } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppBannerFormDTO.java new file mode 100644 index 00000000..7d38b5ea --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java index 51e77b86..f23dcd05 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java +++ b/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> getBannerList(){ + public Result> getBannerList(@RequestBody EpdcAppBannerFormDTO dto){ Map params =new HashMap(); params.put("status","1"); + if (null != dto.getBannerType()) { + params.put("bannerType", dto.getBannerType()); + } List data = actBannerService.list(params); return new Result>().ok(data); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml index 75ae833d..d0ddd29a 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml @@ -107,6 +107,9 @@ AND banner.STATUS = #{status} + + AND banner.BANNER_TYPE = #{bannerType} + ORDER BY banner.CREATED_TIME DESC