From e32581e639989f488e04279667b59919759df443 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 17:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BA=8B=E4=BA=BA=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=9A@=E7=9A=84=E4=BA=BA=E5=92=8C=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9;@=E4=BA=BA=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9A=E8=A2=AB@=E7=9A=84=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E4=BA=BA+=E6=8A=A5=E4=BA=8B=E4=BA=BA+=E6=8A=A5=E7=BB=99?=
 =?UTF-8?q?=E7=9A=84=E7=BB=84=E7=BB=87=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9?=
 =?UTF-8?q?=EF=BC=9B=E7=BB=84=E7=BB=87=E5=9B=9E=E5=A4=8D=EF=BC=9A=E6=8A=A5?=
 =?UTF-8?q?=E4=BA=8B=E4=BA=BA+@=E7=9A=84=E4=BA=BA+=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/ResiEventMentionDao.java    | 10 +++++++
 .../com/epmet/dao/ResiEventReportOrgDao.java  | 10 +++++++
 .../impl/ResiEventReplyServiceImpl.java       | 26 ++++++++++++++++---
 .../service/impl/ResiEventServiceImpl.java    |  6 +++--
 .../resources/mapper/ResiEventMentionDao.xml  | 13 ++++++++++
 .../mapper/ResiEventReportOrgDao.xml          |  9 +++++++
 6 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
index 6580567b78..15062a1385 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
@@ -55,4 +55,14 @@ public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> {
      * @date 2021/8/4 16:37
      */
     int updateReadFlag(@Param("eventId") String eventId, @Param("userId")String userId);
+
+    /**
+     * 展示红点
+     *
+     * @param resiEventId
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/8/4 17:41
+     */
+    int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
index 5d8a5044a5..216f6dace8 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
@@ -41,4 +41,14 @@ public interface ResiEventReportOrgDao extends BaseDao<ResiEventReportOrgEntity>
      * @date 2021/8/4 16:40
      */
     int updateReadFlag(@Param("eventId") String eventId, @Param("orgId") String orgId,@Param("userId") String userId);
+
+    /**
+     * 展示红点
+     *
+     * @param resiEventId
+     * @return  int
+     * @author yinzuomei
+     * @date 2021/8/4 17:41
+     */
+    int updateRedDotShow(String resiEventId);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 547d17e230..5f1d1ddaee 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -27,9 +27,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.EventConstant;
 import com.epmet.constant.ResiEventAction;
-import com.epmet.dao.ResiEventDao;
-import com.epmet.dao.ResiEventOperationLogDao;
-import com.epmet.dao.ResiEventReplyDao;
+import com.epmet.dao.*;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.ReplyFormDTO;
 import com.epmet.dto.form.ReplyListFormDTO;
@@ -66,6 +64,10 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
     @Autowired
     private ResiEventOperationLogDao resiEventOperationLogDao;
     @Autowired
+    private ResiEventMentionDao resiEventMentionDao;
+    @Autowired
+    private ResiEventReportOrgDao resiEventReportOrgDao;
+    @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@@ -130,6 +132,12 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
         reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
         resiEventOperationLogDao.insert(reCallLog);
+        // 1、更新被@的人的红点置为显示
+        resiEventMentionDao.updateRedDotShow(replyFormDTO.getResiEventId(),null);
+        // 2、更新报事人的红点置为显示
+        eventEntity.setRedDot(true);
+        resiEventDao.updateById(eventEntity);
+        // 3、组织改为不显示已经在查看详情中操作了 ,目前只有一个组织，如果后面可以报给多个组织，这里入参要增加orgId
     }
 
     private ResiEventEntity queryResiEntity(String resiEventId) {
@@ -186,6 +194,11 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
         reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
         resiEventOperationLogDao.insert(reCallLog);
+        // 1、更新被@的人的红点置为显示
+        resiEventMentionDao.updateRedDotShow(formDTO.getResiEventId(),null);
+        // 2、更新报事人的红点置为不显示已经在查看详情中操作了
+        // 3、组织改为显示
+        resiEventReportOrgDao.updateRedDotShow(formDTO.getResiEventId());
     }
 
     /**
@@ -227,6 +240,13 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         reCallLog.setActionDesc(ResiEventAction.REPLY.getDesc());
         reCallLog.setOperateTime(resiEventReplyEntity.getCreatedTime());
         resiEventOperationLogDao.insert(reCallLog);
+        // 1、当前被艾特的人红点不展示已经在查看详情接口操作了，其他被@的人的红点置为显示
+        resiEventMentionDao.updateRedDotShow(replyFormDTO.getResiEventId(),replyFormDTO.getUserId());
+        // 2、更新报事人的红点置为显示
+        eventEntity.setRedDot(true);
+        resiEventDao.updateById(eventEntity);
+        // 3、组织改为显示
+        resiEventReportOrgDao.updateRedDotShow(replyFormDTO.getResiEventId());
     }
 
     private void scanReplyContent(String content) {
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 1c41b517fb..3c3d2e84b9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -230,7 +230,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             mentionEntity.setAgencyId(npc.getAgencyId());
             mentionEntity.setPids(npc.getPids());
             mentionEntity.setReadFlag(EventConstant.UN_READ);
-            mentionEntity.setRedDot(true);
+            //默认不展示，因为此时在未读列表中
+            mentionEntity.setRedDot(false);
             list.add(mentionEntity);
         });
         return list;
@@ -245,7 +246,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             entity.setOrgType(org.getOrgLevel());
             //默认是未读
             entity.setOrgRead(EventConstant.UN_READ);
-            entity.setRedDot(true);
+            //默认是不展示红点，因为此时在待处理中。
+            entity.setRedDot(false);
             list.add(entity);
         });
         return list;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
index 3de3934948..88a62a2f2a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -65,4 +65,17 @@
                 AND USER_ID = #{userId}
                 AND DEL_FLAG = '0'
     </update>
+
+    <!--     除了当前用户，都置为显示红点 -->
+    <update id="updateRedDotShow" parameterType="map">
+         UPDATE resi_event_mention
+            SET RED_DOT = '1',
+            UPDATED_TIME = NOW()
+            WHERE
+                RESI_EVENT_ID = #{resiEventId}
+                <if test="excludeUserId != null and excludeUserId.trim() != ''">
+                    and user_id !=#{excludeUserId}
+                </if>
+                AND DEL_FLAG = '0'
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
index 9ff79fe891..98795d7364 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml
@@ -14,4 +14,13 @@
             AND ORG_ID = #{orgId}
             AND DEL_FLAG = '0'
     </update>
+
+    <update id="updateRedDotShow" parameterType="java.lang.String">
+        UPDATE resi_event_report_org
+         SET RED_DOT = '1',
+        UPDATED_TIME = NOW()
+        WHERE
+            RESI_EVENT_ID = #{resiEventId}
+            AND DEL_FLAG = '0'
+    </update>
 </mapper>
\ No newline at end of file