Browse Source

报事人回复:@的人和组织显示红点;@人回复:被@的其他人+报事人+报给的组织显示红点;组织回复:报事人+@的人+其他组织显示红点。

master
yinzuomei 4 years ago
parent
commit
e32581e639
  1. 10
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
  2. 10
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReportOrgDao.java
  3. 26
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
  4. 6
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
  5. 13
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
  6. 9
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReportOrgDao.xml

10
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);
}

10
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);
}

26
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) {

6
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;

13
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>

9
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>
Loading…
Cancel
Save