Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java

@@ -66,6 +66,10 @@ public class EventDetailResultDTO implements Serializable {
      * 报事提到的人
      */
     private List<String> eventPerson;
+    /**
+     * 报事提到的人,用户id
+     */
+    private List<String> eventPersonIds;
 
     /**
      * 被提到的组织
@@ -107,6 +111,11 @@ public class EventDetailResultDTO implements Serializable {
     //@JsonIgnore
     private Boolean isProject;
 
+    /**
+     * userIdentity :  报事人：report-user；被@的人：mention-user;  其他用户：other
+     */
+    private String userIdentity;
+
     public EventDetailResultDTO() {
         this.eventTime = "";
         this.eventContent = "";

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/EventConstant.java

@@ -70,4 +70,10 @@ public interface EventConstant {
     String VIDEO = "video";
     String VOICE = "voice";
     String DOC = "doc";
+
+
+    // 报事人：report_user；被@的人：mention_user;  其他用户：other
+    // String REPORT_USER="report_user";
+    String MENTION_USER="mention_user";
+    String OTHER="other";
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -157,17 +157,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
         }
         ResiEventMentionEntity resiEventMentionEntity=resiEventMentionDao.selectUser(formDTO.getEventId(),formDTO.getUserId());
-        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) && null == resiEventMentionEntity) {
-            log.warn("报事人查看详情不需要调用此接口,如果既是报事人又是人大代表，自己艾特了自己，需要更新为已读");
+        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) || null == resiEventMentionEntity) {
+            log.warn("其他用户（非报事人、非被@的人）不需要调用此接口，直接返回");
             return;
         }
         // 这个事件已经被查看了
-        eventEntity.setReadFlag(true);
-        baseDao.updateById(eventEntity);
+        if(!eventEntity.getReadFlag()){
+            eventEntity.setReadFlag(true);
+            baseDao.updateById(eventEntity);
+        }
         // 居民端：resi_user；工作端：staff
         if(EventConstant.RESI_USER.equals(formDTO.getViewType())){
             //被@的人置为已读
-            resiEventMentionDao.updateReadFlag(formDTO.getEventId(),formDTO.getUserId());
+            if (EventConstant.UN_READ.equals(resiEventMentionEntity.getReadFlag())) {
+                resiEventMentionDao.updateReadFlag(formDTO.getEventId(), formDTO.getUserId());
+            }
         }else if(EventConstant.STAFF.equals(formDTO.getViewType())){
             // 当前组织置为已读
             resiEventReportOrgDao.updateReadFlag(formDTO.getEventId(),formDTO.getOrgId(),formDTO.getUserId());
@@ -206,6 +210,16 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         }else if (tokenDto.getApp().equals(EventConstant.TYPE_GOV)){
             resiEventReportOrgDao.updateEventOrg(formDTO.getEventId(), formDTO.getOrgId());
         }
+        // 当前用户与事件的关系
+        if(tokenDto.getUserId().equals(dto.getEventUserId())){
+            //报事人
+            dto.setUserIdentity(EventConstant.REPORT_USER);
+        }else if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(dto.getEventPersonIds())&&dto.getEventPersonIds().contains(tokenDto.getUserId())){
+            // 被@的人
+            dto.setUserIdentity(EventConstant.MENTION_USER);
+        }else{
+            dto.setUserIdentity(EventConstant.OTHER);
+        }
         return dto;
     }
 

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

@@ -139,6 +139,9 @@
         <collection property="eventPerson" ofType="java.lang.String">
             <result column="person"/>
         </collection>
+        <collection property="eventPersonIds" ofType="java.lang.String">
+            <result column="personUserId"/>
+        </collection>
         <collection property="orgNameList" ofType="java.lang.String">
             <result column="orgId"/>
         </collection>
@@ -158,6 +161,7 @@
             ea.ATTACHMENT_TYPE AS type,
             ea.duration AS duration,
             IF(ISNULL(em.USER_SHOW_NAME),NULL,concat('人大代表-',em.USER_SHOW_NAME)) AS person,
+            em.user_id as personUserId,
             re.GRID_ID AS gridId,
             re.CREATED_BY AS eventUserId,
             ro.ORG_ID AS orgId