居民端banner点击问卷加积分

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"),
     /**
      * 新闻点赞
      */

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -245,7 +245,7 @@
                 <volunteer.wx.ma.appId>wxc4fe0ea629aaa309</volunteer.wx.ma.appId>
                 <volunteer.wx.ma.secret>34fa86621c3c1dcebd39db333e746d88</volunteer.wx.ma.secret>
                 <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.name.server>114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
                 <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
                 <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>

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);
+    }
+
     /**
      * 用户消息已读
      *

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);
+
     /**
      * 居民端首页数据统计
      *

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<List<EpdcAppHomeDataResultDTO>> selectHomeData(TokenDto userDetail) {
         String userId = userDetail.getUserId();

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;
+}

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链接
      */

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}
     </update>
 
-</mapper>
+</mapper>