From d796a02c94d3425230a0863ad25b42c6767a6d3a Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 5 Nov 2020 11:07:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85banner=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=201=E3=80=81PC=E7=AB=AF=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=91=E5=B8=83=E5=86=85=E5=AE=B9=202?= =?UTF-8?q?=E3=80=81banner=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AD=89=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiAppActInfoController.java | 13 ++++++++ .../esua/epdc/feign/ActInfoFeignClient.java | 13 +++++++- .../fallback/ActInfoFeignClientFallback.java | 5 +++ .../esua/epdc/service/ActInfoService.java | 9 +++++ .../epdc/service/impl/ActInfoServiceImpl.java | 5 +++ .../esua/epdc/activity/ActBannerDTO.java | 5 +++ .../controller/EpdcActBannerController.java | 33 +++++++++++++++++++ .../modules/activity/dao/ActBannerDao.java | 11 +++++++ .../activity/entity/ActBannerEntity.java | 5 +++ .../activity/service/ActBannerService.java | 11 +++++++ .../service/impl/ActBannerServiceImpl.java | 6 ++++ .../mapper/activity/ActBannerDao.xml | 24 ++++++++++++++ 12 files changed, 139 insertions(+), 1 deletion(-) 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 d825fc71..79456217 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 @@ -114,4 +114,17 @@ public class ApiAppActInfoController { public Result> bannerList(EpdcAppBannerFormDTO dto) { return actInfoService.getBannerList(dto); } + + /** + * 志愿者banner详情 + * + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/11/5 10:57 + */ + @GetMapping("banner/detail/{id}") + public Result bannerDetail(@PathVariable String id) { + return actInfoService.getBannerDetail(id); + } } 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 3c5a250a..a77da9ac 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 @@ -62,7 +62,7 @@ public interface ActInfoFeignClient { @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getCancelDetail(@PathVariable String id); - @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(value = "heart/epdc-app/actbanner/list", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getBannerList(EpdcAppBannerFormDTO dto); /** @@ -76,4 +76,15 @@ public interface ActInfoFeignClient { @GetMapping(value = "heart/appactinfo/unreadactnums", consumes = MediaType.APPLICATION_JSON_VALUE) Result getUserUnreadSignUpActCount(String userId); + /** + * 志愿者banner详情 + * + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2020/11/5 10:34 + */ + @GetMapping(value = "heart/epdc-app/actbanner/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getBannerDetail(@PathVariable("id") String id); + } 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 157e85c8..8d96daa1 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 @@ -52,4 +52,9 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getUserUnreadSignUpActCount", userId); } + @Override + public Result getBannerDetail(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerDetail", id); + } + } 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 28d7417c..8d5164b8 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 @@ -48,5 +48,14 @@ public interface ActInfoService { Result> getBannerList(EpdcAppBannerFormDTO dto); + /** + * 志愿者banner详情 + * + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/11/5 10:56 + */ + Result getBannerDetail(String id); } 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 b84de781..ffdca3b6 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 @@ -51,4 +51,9 @@ public class ActInfoServiceImpl implements ActInfoService { public Result> getBannerList(EpdcAppBannerFormDTO dto) { return actInfoFeignClient.getBannerList(dto); } + + @Override + public Result getBannerDetail(String id) { + return actInfoFeignClient.getBannerDetail(id); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java index 1bfff225..a85f1d21 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java @@ -102,4 +102,9 @@ public class ActBannerDTO implements Serializable { * banner排序 */ private String sort; + + /** + * 内容 + */ + private String content; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java index cbb560ce..00a2d8d2 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java @@ -17,7 +17,9 @@ package com.elink.esua.epdc.modules.activity.controller; +import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -26,7 +28,9 @@ import com.elink.esua.epdc.modules.activity.service.ActBannerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @@ -44,9 +48,38 @@ public class EpdcActBannerController { * @Author zhangyong * @Date 18:27 2020-05-25 **/ + @Deprecated @GetMapping("banner/list") public Result> bannerList(@RequestBody EpdcAppActBannerFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return actBannerService.getBannerList(formDto); } + + /** + * 志愿者banner列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2020/11/5 10:20 + */ + @GetMapping("list") + public Result> getBannerList(@RequestBody EpdcAppBannerFormDTO formDto){ + List data = actBannerService.listBanners(formDto); + return new Result>().ok(data); + } + + /** + * 志愿者banner详情 + * + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/11/5 10:33 + */ + @GetMapping("detail/{id}") + public Result getBannerDetail(@PathVariable("id") String id){ + ActBannerDTO data = actBannerService.get(id); + return new Result().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java index da247f7d..aa987971 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.activity.dao; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; @@ -107,4 +108,14 @@ public interface ActBannerDao extends BaseDao { * @return void */ void rejectActBannerInfo(@Param("relationId") String relationId); + + /** + * 志愿者banner列表 + * + * @param formDto + * @return java.util.List + * @author Liuchuang + * @since 2020/11/5 10:23 + */ + List selectListBanners(EpdcAppBannerFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java index 7e895f91..736bf1ad 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java @@ -91,4 +91,9 @@ public class ActBannerEntity extends BaseEpdcEntity { * banner排序 */ private String sort; + + /** + * 内容 + */ + private String content; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java index a87cdfbf..3c370891 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.activity.service; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -153,4 +154,14 @@ public interface ActBannerService extends BaseService { * @Date 15:13 2020-06-02 **/ Result> getListSimpleDictInfo(String dictType); + + /** + * 志愿者banner列表 + * + * @param formDto + * @return java.util.List + * @author Liuchuang + * @since 2020/11/5 10:22 + */ + List listBanners(EpdcAppBannerFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java index 68d27f40..8ff880c9 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.form.EpdcAppBannerFormDTO; import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; @@ -183,4 +184,9 @@ public class ActBannerServiceImpl extends BaseServiceImpl> getListSimpleDictInfo(String dictType) { return adminFeignClient.getListSimpleDictInfo(dictType); } + + @Override + public List listBanners(EpdcAppBannerFormDTO formDto) { + return baseDao.selectListBanners(formDto); + } } 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 0368ea4e..37ed0053 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 @@ -138,4 +138,28 @@ UPDATE epdc_act_banner SET DEL_FLAG = 1,UPDATED_TIME=NOW() where ACT_ID=#{relationId} + +