From 4e95025540acd9ce91b36c1ad8d5aa0cf4d8455e Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 26 Sep 2019 17:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=8F=E8=94=BD=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/events/EpdcEventsCommentsDTO.java | 4 ++++ .../esua/epdc/modules/comment/entity/EventCommentEntity.java | 5 +++++ .../java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java | 2 +- .../epdc/modules/issue/service/impl/IssueServiceImpl.java | 2 +- .../src/main/resources/mapper/comment/EventCommentDao.xml | 2 ++ .../src/main/resources/mapper/events/EpdcEventsDao.xml | 5 ++++- .../src/main/resources/mapper/issue/IssueDao.xml | 4 ++-- 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsCommentsDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsCommentsDTO.java index e067def73..13e1e17db 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsCommentsDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsCommentsDTO.java @@ -50,6 +50,10 @@ public class EpdcEventsCommentsDTO implements Serializable { * 用户信息 */ private UserBaseInfoDto user; + /** + * 屏蔽标识 0：未屏蔽，1：已屏蔽 + */ + private String shieldFlag; /** * 回复评论信息 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/entity/EventCommentEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/entity/EventCommentEntity.java index a976b60f0..3f2a0e289 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/entity/EventCommentEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/entity/EventCommentEntity.java @@ -103,4 +103,9 @@ public class EventCommentEntity extends BaseEpdcEntity { */ private Integer unLikeCount; + /** + * 屏蔽标识 0：未屏蔽，1：已屏蔽 + */ + private String shieldFlag; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java index 0d41ea55a..be01bf519 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java @@ -83,7 +83,7 @@ public interface IssueDao extends BaseDao { * @Author: liuchuang * @Date: 2019/9/7 10:26 */ - void updateCommentDelFlag(@Param("commentIds") String[] commentIds); + void updateCommentShieldFlag(@Param("commentIds") String[] commentIds); /** * 移动端-议题最新最热列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 4dee4a9ee..4f5635024 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -244,7 +244,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override @Transactional(rollbackFor = Exception.class) public Result modifyCommentById(String[] commentIds) { - baseDao.updateCommentDelFlag(commentIds); + baseDao.updateCommentShieldFlag(commentIds); return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml index d5c22db5b..c5a3ccae3 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml @@ -93,6 +93,7 @@ WHERE t1.DEL_FLAG = '0' + AND t1.SHIELD_FLAG = '0' #{timestamp} AND t1.EVENT_ID = #{eventId} ORDER BY @@ -169,6 +170,7 @@ epdc_event_comment WHERE DEL_FLAG = '0' + AND SHIELD_FLAG = '0' AND EVENT_ID = #{eventId} ORDER BY statementNum DESC, diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index c89b3c223..73f5edfc9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -120,6 +120,7 @@ + @@ -135,6 +136,7 @@ t2.USER_ID, t2.USER_FACE, t2.USER_NAME, + t2.SHIELD_FLAG, t3.ID AS replyId, t3.USER_NAME AS replyUserName, t3.CONTENT AS replyContent @@ -147,7 +149,8 @@ t1.CREATED_TIME, t1.USER_ID, t1.USER_FACE, - t1.USER_NAME + t1.USER_NAME, + t1.SHIELD_FLAG FROM epdc_event_comment t1 WHERE diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 4943e4d72..e4a51ee37 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -146,8 +146,8 @@ createdTime DESC - - UPDATE epdc_event_comment SET DEL_FLAG = '1' WHERE ID IN + + UPDATE epdc_event_comment SET SHIELD_FLAG = '1' WHERE ID IN #{commentId}