阅读通知接口

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
@@ -52,4 +53,17 @@ public class ApiNewsController {
     public Result<EpdcNoticeDetailResultDTO> getNoticeDetail(@PathVariable("noticeId") String noticeId) {
         return newsService.getNoticeDetail(noticeId);
     }
+
+    /**
+     * 阅读通知
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO>
+     * @author yujintao
+     * @date 2019/9/6 16:07
+     */
+    @PostMapping("notice/browse")
+    public Result<EpdcNoticeDetailResultDTO> browseNotice(@RequestBody EpdcNoticeBrowseFormDTO formDto) {
+        return newsService.updateReadingAmount(formDto);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
@@ -43,4 +44,15 @@ public interface NewsFeignClient {
      */
     @GetMapping("news/epdc-app/notice/getDetail/{noticeId}")
     Result<EpdcNoticeDetailResultDTO> getNoticeDetail(@PathVariable String noticeId);
+
+    /**
+     * 用户浏览量增加
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author yujintao
+     * @date 2019/9/6 15:54
+     */
+    @PostMapping(value = "news/epdc-app/notice/browse", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result browseNotice(@RequestBody EpdcNoticeBrowseFormDTO formDto);
 }

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
@@ -28,4 +29,9 @@ public class NewsFeignClientFallback implements NewsFeignClient {
     public Result<EpdcNoticeDetailResultDTO> getNoticeDetail(String noticeId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNoticeDetail", noticeId);
     }
+
+    @Override
+    public Result browseNotice(EpdcNoticeBrowseFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "browseNotice", formDto);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
@@ -37,4 +38,14 @@ public interface NewsService {
      * @date 2019/9/6 14:58
      */
     Result<EpdcNoticeDetailResultDTO> getNoticeDetail(String noticeId);
+
+    /**
+     * 阅读通知
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO>
+     * @author yujintao
+     * @date 2019/9/6 16:09
+     */
+    Result<EpdcNoticeDetailResultDTO> updateReadingAmount(EpdcNoticeBrowseFormDTO formDto);
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
@@ -35,4 +36,9 @@ public class NewsServiceImpl implements NewsService {
     public Result<EpdcNoticeDetailResultDTO> getNoticeDetail(String noticeId) {
         return newsFeignClient.getNoticeDetail(noticeId);
     }
+
+    @Override
+    public Result<EpdcNoticeDetailResultDTO> updateReadingAmount(EpdcNoticeBrowseFormDTO formDto) {
+        return newsFeignClient.browseNotice(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeBrowseFormDTO.java

@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 移动端通知列表，查询条件
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/5 19:40
+ */
+@Data
+public class EpdcNoticeBrowseFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 8429642784846512912L;
+
+    /**
+     * ID
+     */
+    @NotBlank(message = "通知ID不能为空")
+    private String noticeId;
+}

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
@@ -69,4 +70,18 @@ public class EpdcAppNoticeController {
     public Result<EpdcNoticeDetailResultDTO> getDetail(@PathVariable String noticeId) {
         return this.noticeService.getNoticeDetailById(noticeId);
     }
+
+    /**
+     * 用户浏览量增加
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author yujintao
+     * @date 2019/9/6 15:54
+     */
+    @PostMapping("browse")
+    public Result browseNotice(@RequestBody EpdcNoticeBrowseFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return this.noticeService.updateReadingAmount(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java

@@ -55,4 +55,14 @@ public interface NoticeDao extends BaseDao<NoticeEntity> {
      * @date 2019/9/6 14:46
      */
     EpdcNoticeDetailResultDTO selectOneAppNotice(@Param("noticeId") String noticeId);
+
+    /**
+     * 修改通知阅读数
+     *
+     * @param noticeId
+     * @return int
+     * @author yujintao
+     * @date 2019/9/6 15:59
+     */
+    int updateReadingAmount(@Param("noticeId") String noticeId);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.NoticeDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
@@ -126,4 +127,14 @@ public interface NoticeService extends BaseService<NoticeEntity> {
      * @date 2019/9/6 14:45
      */
     Result<EpdcNoticeDetailResultDTO> getNoticeDetailById(String noticeId);
+
+    /**
+     * 用户浏览量增加
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author yujintao
+     * @date 2019/9/6 15:55
+     */
+    Result updateReadingAmount(EpdcNoticeBrowseFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -32,6 +32,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NoticeDao;
 import com.elink.esua.epdc.dto.NoticeDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeBrowseFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
@@ -159,6 +160,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
         }
 
         if (isSave) {
+            entity.setReadingAmount(NumConstant.ZERO);
             insert(entity);
         } else {
             updateById(entity);
@@ -201,4 +203,10 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
         EpdcNoticeDetailResultDTO dto = this.baseDao.selectOneAppNotice(noticeId);
         return new Result().ok(dto);
     }
+
+    @Override
+    public Result updateReadingAmount(EpdcNoticeBrowseFormDTO formDto) {
+        this.baseDao.updateReadingAmount(formDto.getNoticeId());
+        return new Result();
+    }
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml

@@ -2,6 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.dao.NoticeDao">
+    <update id="updateReadingAmount">
+        UPDATE epdc_notice SET READING_AMOUNT = READING_AMOUNT + 1 WHERE id = #{noticeId}
+    </update>
 
 
     <select id="selectListAppNotice" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO">