From f199a44f03b93536a25763502335b6134949bb84 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Thu, 16 Jul 2020 15:44:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=9A=E7=9F=A5=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=E6=B5=8F=E8=A7=88=E6=95=B0=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8A=A01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epdc/result/EpdcNoticeDetailResultDTO.java  |  5 +++++
 .../esua/epdc/service/impl/NoticeServiceImpl.java   | 13 ++++++++++---
 .../src/main/resources/mapper/NoticeDao.xml         |  3 ++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java
index cf7c167a..4134b515 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java
@@ -48,4 +48,9 @@ public class EpdcNoticeDetailResultDTO implements Serializable {
      * 首图
      */
     private String imgUrl;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
 }
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
index 5277c210..c8990685 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
@@ -46,7 +46,6 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.NoticeDepartmentService;
 import com.elink.esua.epdc.service.NoticeService;
 import com.elink.esua.epdc.util.NewsUtils;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -249,8 +248,16 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     @Override
     public Result<EpdcNoticeDetailResultDTO> getNoticeDetailById(String noticeId) {
         EpdcNoticeDetailResultDTO dto = this.baseDao.selectOneAppNotice(noticeId);
-        dto.setNoticeContent("<div style=\"font-size:19px;line-height:31px\">" + dto.getNoticeContent() + "</div>");
-        return new Result().ok(dto);
+        // 浏览数+1
+        if (null != dto) {
+            dto.setReadingAmount(dto.getReadingAmount() + NumConstant.ONE);
+            NoticeEntity entity = new NoticeEntity();
+            entity.setId(noticeId);
+            entity.setReadingAmount(dto.getReadingAmount());
+            updateById(entity);
+            dto.setNoticeContent("<div style=\"font-size:19px;line-height:31px\">" + dto.getNoticeContent() + "</div>");
+        }
+        return new Result<EpdcNoticeDetailResultDTO>().ok(dto);
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml
index 46ed5284..507b0157 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml
@@ -33,7 +33,8 @@
             n.READING_AMOUNT AS readingAmount,
             n.RELEASE_TIME AS noticeTime,
             SUBSTRING_INDEX(n.ALL_DEPT_NAMES,'-',-1) AS deptName,
-            n.NOTICE_IMAGE_URL imgUrl
+            n.NOTICE_IMAGE_URL imgUrl,
+            n.MOBILE mobile
         FROM
             epdc_notice n
         WHERE