屏蔽评论

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java

@@ -73,5 +73,14 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/6 17:40
      */
-    List<EpdcEventsCommentsDTO> selectListOfCommentsByEventId(@Param("eventId") String eventId);
+    List<EpdcEventsCommentsDTO> selectListOfCommentsByEventId(@Param("eventId") String eventId, @Param("pageIndex") long pageIndex,
+                                                              @Param("pageSize") long pageSize);
+    /**
+     * 评论总数
+     * @Params: [eventId]
+     * @Return: long
+     * @Author: liuchuang
+     * @Date: 2019/9/7 10:07
+     */
+    long selectCountOfComments(@Param("eventId") String eventId);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java

@@ -54,6 +54,10 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
 	 * 用户头像
 	 */
 	private String userFace;
+	/**
+	 * 党员标识 0：否，1：是
+	 */
+	private Integer isPartyMember;
     /**
      * 议题内容
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java

@@ -95,5 +95,5 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/6 17:42
      */
-    List<EpdcEventsCommentsDTO> listOfEventsCommentSByEventId(String eventId);
+    PageData<EpdcEventsCommentsDTO> listOfEventsCommentSByEventId(String eventId, Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.events.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@@ -151,8 +152,20 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
     }
 
     @Override
-    public List<EpdcEventsCommentsDTO> listOfEventsCommentSByEventId(String eventId) {
-        return baseDao.selectListOfCommentsByEventId(eventId);
+    public PageData<EpdcEventsCommentsDTO> listOfEventsCommentSByEventId(String eventId, Map<String, Object> params) {
+        //分页参数
+        long pageIndex = 1;
+        long pageSize = 10;
+        if (params.get(Constant.PAGE) != null) {
+            pageIndex = Long.parseLong((String) params.get(Constant.PAGE));
+        }
+        if (params.get(Constant.LIMIT) != null) {
+            pageSize = Long.parseLong((String) params.get(Constant.LIMIT));
+        }
+        pageIndex = (pageIndex - 1)*pageSize;
+        List<EpdcEventsCommentsDTO> list = baseDao.selectListOfCommentsByEventId(eventId, pageIndex, pageSize);
+        long total = baseDao.selectCountOfComments(eventId);
+        return new PageData<>(list, total);
     }
 
     /**

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java

@@ -156,4 +156,16 @@ public class IssueController {
         return new Result<PageData<EpdcEventsCommentsDTO>>().ok(page);
     }
 
+    /**
+     * 屏蔽评论
+     * @Params: [commentId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: liuchuang
+     * @Date: 2019/9/7 10:22
+     */
+    @PostMapping("deleteComment")
+    public Result deleteComment(@RequestBody String commentId) {
+        return issueService.modifyCommentById(commentId);
+    }
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java

@@ -74,4 +74,13 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      */
     List<IssueJobFeedbackDTO> selectListOfJobFeedBack(@Param("issueId") String issueId, @Param("itemId") String itemId);
 
+    /**
+     * 屏蔽评论
+     * @Params: [commentId]
+     * @Return: void
+     * @Author: liuchuang
+     * @Date: 2019/9/7 10:26
+     */
+    void updateCommentDelFlag(@Param("commentId") String commentId);
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java

@@ -59,6 +59,11 @@ public class IssueEntity extends BaseEpdcEntity {
      */
 	private String userFace;
 
+	/**
+	 * 党员标识 0：否，1：是
+	 */
+	private Integer isPartyMember;
+
     /**
      * 议题内容
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java

@@ -134,4 +134,13 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @Date: 2019/9/6 18:59
      */
     PageData<EpdcEventsCommentsDTO> listOfComments(Map<String, Object> params);
+
+    /**
+     * 屏蔽评论
+     * @Params: [commentId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: liuchuang
+     * @Date: 2019/9/7 10:22
+     */
+    Result modifyCommentById(String commentId);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -184,9 +184,13 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         String issueId = params.get(FieldConstant.ID_HUMP).toString();
         IssueEntity issueEntity = baseDao.selectById(issueId);
-        IPage<EpdcEventsCommentsDTO> page = getPage(params);
-        List<EpdcEventsCommentsDTO> list = epdcEventsService.listOfEventsCommentSByEventId(issueEntity.getEventId());
-        return new PageData<>(list, page.getTotal());
+        return epdcEventsService.listOfEventsCommentSByEventId(issueEntity.getEventId(), params);
+    }
+
+    @Override
+    public Result modifyCommentById(String commentId) {
+        baseDao.updateCommentDelFlag(commentId);
+        return new Result();
     }
 
     /**

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java

@@ -64,6 +64,11 @@ public class ItemEntity extends BaseEpdcEntity {
      */
 	private String userFace;
 
+	/**
+	 * 党员标识 0：否，1：是
+	 */
+	private Integer isPartyMember;
+
     /**
      * 议题内容
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -142,9 +142,20 @@
                 AND t1.EVENT_ID = #{eventId}
             ORDER BY
                 t1.CREATED_TIME DESC
+            LIMIT #{pageIndex},#{pageSize}
             ) t2
             LEFT JOIN epdc_event_comment t3 ON t2.COMMENT_ID = t3.ID
         ORDER BY
             t2.CREATED_TIME DESC
     </select>
+
+    <select id="selectCountOfComments" resultType="long">
+        SELECT
+                count(id)
+            FROM
+                epdc_event_comment t1
+            WHERE
+                t1.DEL_FLAG = '0'
+                AND t1.EVENT_ID = #{eventId}
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -117,4 +117,8 @@
         ORDER BY
             createdTime DESC
     </select>
+
+    <update id="updateCommentDelFlag">
+        UPDATE epdc_event_comment SET DEL_FLAG = '1' WHERE ID = #{commentId}
+    </update>
 </mapper>