From 2371a232e111f8974f74eb427882f5cd2636425b Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 20 Oct 2021 09:47:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AFbanner=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=97=AE=E5=8D=B7=E5=8A=A0=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/BehaviorEnum.java | 4 +++ .../epdc-api/epdc-api-server/pom.xml | 2 +- .../epdc/controller/ApiNewsController.java | 16 ++++++++++++ .../elink/esua/epdc/service/NewsService.java | 11 ++++++++ .../epdc/service/impl/NewsServiceImpl.java | 8 ++++++ .../epdc/form/EpdcWenJuanBrowseFromDTO.java | 25 +++++++++++++++++++ .../epdc/result/EpdcBannerListResultDTO.java | 1 + .../src/main/resources/mapper/BannerDao.xml | 5 ++-- 8 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWenJuanBrowseFromDTO.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java index 77e036b8..117e600e 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java @@ -39,6 +39,10 @@ public enum BehaviorEnum { * 新闻浏览 */ NEWS_BROWSE("news_browse"), + /** + * 问卷浏览 + */ + BANNER_WENJUAN_BROWSE("banner_wenjuan_browse"), /** * 新闻点赞 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index bbf41b6d..990298fc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -245,7 +245,7 @@ wxc4fe0ea629aaa309 34fa86621c3c1dcebd39db333e746d88 - 47.104.85.99:9876;114.215.125.123:9876 + 114.215.125.123:9876 jinshui-organizationGroup jinshui-pointsGroup jinshui-pointsGroup diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java index ccf39078..3fb0294e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java @@ -170,6 +170,22 @@ public class ApiNewsController { return newsService.browsePoints(userDetail,newsBrowseFromDTO); } + /** + * 点击问卷加积分 + * + * @param userDetail + * @param fromDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lc + * @since 2021/10/18 15:09 + */ + @PostMapping("banner/wenjuanPoints") + @RecordUserBehavior(behavior = BehaviorEnum.BANNER_WENJUAN_BROWSE, referenceId = "#{fromDto.getBannerId}", userId = "#{userDetail.getUserId}",gridId = "#{userDetail.getGridId}") + public Result wenjuanPoints(@LoginUser TokenDto userDetail,@RequestBody EpdcWenJuanBrowseFromDTO fromDto) { + ValidatorUtils.validateEntity(fromDto); + return newsService.wenjuanPoints(userDetail,fromDto); + } + /** * 用户消息已读 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index 023c6b5b..67c0f0ad 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java @@ -156,6 +156,17 @@ public interface NewsService { **/ Result browsePoints(TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO); + /** + * 点击问卷加积分 + * + * @param userDetail + * @param fromDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lc + * @since 2021/10/18 15:09 + */ + Result wenjuanPoints(TokenDto userDetail, EpdcWenJuanBrowseFromDTO fromDto); + /** * 居民端首页数据统计 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index e3781601..2c308c8f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java @@ -131,6 +131,14 @@ public class NewsServiceImpl implements NewsService { return new Result(); } + @Override + public Result wenjuanPoints(TokenDto userDetail, EpdcWenJuanBrowseFromDTO fromDto) { + if(userDetail!=null){ + fromDto.setUserId(userDetail.getUserId()); + } + return new Result(); + } + @Override public Result> selectHomeData(TokenDto userDetail) { String userId = userDetail.getUserId(); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWenJuanBrowseFromDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWenJuanBrowseFromDTO.java new file mode 100644 index 00000000..b02ce618 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWenJuanBrowseFromDTO.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 问卷点击 + * + * @author lc + * @since 2021/10/18 15:07 + */ +@Data +public class EpdcWenJuanBrowseFromDTO implements Serializable { + private static final long serialVersionUID = 5123715909599230096L; + + /** + * banner id + */ + @NotNull(message = "banner id不能为空") + private String bannerId; + + private String userId; +} diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcBannerListResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcBannerListResultDTO.java index 691fe12f..990ce1a6 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcBannerListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcBannerListResultDTO.java @@ -20,6 +20,7 @@ public class EpdcBannerListResultDTO implements Serializable { private String title; private String newsFlag; private String newsId; + private String bannerType; /*** * web链接 */ diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml index 55d12bcc..a98a0245 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml @@ -11,7 +11,8 @@ eb.IMG_URL AS imgUrl, eb.VIDEO_URL AS videoUrl, eb.TITLE AS title, - eb.URL AS url + eb.URL AS url, + eb.BANNER_TYPE FROM epdc_banner eb LEFT JOIN epdc_banner_department ed ON ed.BANNER_ID = eb.ID @@ -60,4 +61,4 @@ UPDATE epdc_banner SET DEPT_NAME = #{newDeptName}, UPDATED_TIME = NOW() WHERE DEPT_ID = #{deptId} - \ No newline at end of file +