From 71fac25627ef4461a8e778bdd64fc17790f5dea0 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Sat, 7 Sep 2019 10:29:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/events/dao/EpdcEventsDao.java | 11 ++++++++++- .../modules/events/entity/EpdcEventsEntity.java | 4 ++++ .../events/service/EpdcEventsService.java | 2 +- .../service/impl/EpdcEventsServiceImpl.java | 17 +++++++++++++++-- .../issue/controller/IssueController.java | 12 ++++++++++++ .../esua/epdc/modules/issue/dao/IssueDao.java | 9 +++++++++ .../epdc/modules/issue/entity/IssueEntity.java | 5 +++++ .../modules/issue/service/IssueService.java | 9 +++++++++ .../issue/service/impl/IssueServiceImpl.java | 10 +++++++--- .../epdc/modules/item/entity/ItemEntity.java | 5 +++++ .../resources/mapper/events/EpdcEventsDao.xml | 11 +++++++++++ .../main/resources/mapper/issue/IssueDao.xml | 4 ++++ 12 files changed, 92 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java index bce27db9d..6a291fd0b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java +++ b/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 { * @Author: liuchuang * @Date: 2019/9/6 17:40 */ - List selectListOfCommentsByEventId(@Param("eventId") String eventId); + List 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); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java index 10027204f..3838953c4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java +++ b/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; /** * 议题内容 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index 4fa0015b5..65441410a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/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 { * @Author: liuchuang * @Date: 2019/9/6 17:42 */ - List listOfEventsCommentSByEventId(String eventId); + PageData listOfEventsCommentSByEventId(String eventId, Map params); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index cfd456675..38a60d336 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/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 listOfEventsCommentSByEventId(String eventId) { - return baseDao.selectListOfCommentsByEventId(eventId); + public PageData listOfEventsCommentSByEventId(String eventId, Map 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 list = baseDao.selectListOfCommentsByEventId(eventId, pageIndex, pageSize); + long total = baseDao.selectCountOfComments(eventId); + return new PageData<>(list, total); } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java index f47273be3..d9cf6c2a6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java +++ b/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>().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); + } + } 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 dab0da28e..6bb818734 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 @@ -74,4 +74,13 @@ public interface IssueDao extends BaseDao { */ List 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); + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java index 027b27a3f..c6d778542 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java +++ b/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; + /** * 议题内容 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java index 1ece2a9c6..6839ce4af 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java +++ b/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 { * @Date: 2019/9/6 18:59 */ PageData listOfComments(Map params); + + /** + * 屏蔽评论 + * @Params: [commentId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/7 10:22 + */ + Result modifyCommentById(String commentId); } 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 89699f17f..5786656f7 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 @@ -184,9 +184,13 @@ public class IssueServiceImpl extends BaseServiceImpl imp } String issueId = params.get(FieldConstant.ID_HUMP).toString(); IssueEntity issueEntity = baseDao.selectById(issueId); - IPage page = getPage(params); - List 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(); } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java index 0174e296b..671fbd240 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java +++ b/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; + /** * 议题内容 */ 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 3084973b2..2bbfdb06c 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 @@ -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 + + 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 f9fa2468b..f78fa18ca 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 @@ -117,4 +117,8 @@ ORDER BY createdTime DESC + + + UPDATE epdc_event_comment SET DEL_FLAG = '1' WHERE ID = #{commentId} +