diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java index a4d91a433..5ba71cb85 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java @@ -7,11 +7,9 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO; +import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; import com.elink.esua.epdc.dto.issue.form.WorkIssueListFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; -import com.elink.esua.epdc.dto.issue.result.WorkIssueDetailResultDTO; -import com.elink.esua.epdc.dto.issue.result.WorkIssueListResultDTO; +import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.service.WorkIssueService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -95,4 +93,15 @@ public class ApiWorkIssueController { public Result issueDetail(@PathVariable("issueId") String issueId){ return workIssueService.selectOneWorkIssueDetail(issueId); } + + + /** + * 工作端-事件评论列表 + * @param formDTO + * @return + */ + @GetMapping("event/commentList") + public Result> commentList(@RequestBody WorkEventCommentListFormDTO formDTO){ + return workIssueService.selectWorkHotOrNewEventComment(formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java index 5359dc331..4b8eda136 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java @@ -13,6 +13,7 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -69,9 +70,19 @@ public interface WorkIssueFeignClient { Result> selectWorkIssueListOfNewOrHot(WorkIssueListFormDTO formDto); /** - * 工作端-议题待处理或者已关闭的最新最热列表 + * 工作端-事件评论列表 + * @param issueId + * @return */ @GetMapping(value = "events/epdc-app/work/issue/detail/{issueId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result selectOneWorkIssueDetail(@PathVariable("issueId") String issueId); + /** + * 工作端-事件评论列表 + * @param formDTO + * @return + */ + @GetMapping(value = "events/epdc-app/comment/commentList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> commentList(@RequestBody WorkEventCommentListFormDTO formDTO); + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java index b8779a662..96699877e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java @@ -56,4 +56,9 @@ public class WorkIssueFeignClientFallback implements WorkIssueFeignClient { public Result selectOneWorkIssueDetail(String issueId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "selectOneWorkIssueDetail", issueId); } + + @Override + public Result> commentList(WorkEventCommentListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "commentList", formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java index c4b9a0c3b..5c481cf53 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java @@ -24,11 +24,9 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO; +import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; import com.elink.esua.epdc.dto.issue.form.WorkIssueListFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; -import com.elink.esua.epdc.dto.issue.result.WorkIssueDetailResultDTO; -import com.elink.esua.epdc.dto.issue.result.WorkIssueListResultDTO; +import com.elink.esua.epdc.dto.issue.result.*; import java.util.List; @@ -79,4 +77,11 @@ public interface WorkIssueService { * 工作端-议题详情 */ Result selectOneWorkIssueDetail(String issueId); + + /** + * 工作端-事件评论列表 + * @param formDTO + * @return + */ + Result> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java index f1436adbc..a0d0f8b38 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java @@ -23,11 +23,9 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO; +import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; import com.elink.esua.epdc.dto.issue.form.WorkIssueListFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; -import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; -import com.elink.esua.epdc.dto.issue.result.WorkIssueDetailResultDTO; -import com.elink.esua.epdc.dto.issue.result.WorkIssueListResultDTO; +import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.feign.WorkIssueFeignClient; import com.elink.esua.epdc.service.WorkIssueService; import org.springframework.beans.factory.annotation.Autowired; @@ -101,8 +99,21 @@ public class WorkIssueServiceImpl implements WorkIssueService { return workIssueFeignClient.selectWorkIssueListOfNewOrHot(formDto); } + /** + * 工作端-议题详情 + */ @Override public Result selectOneWorkIssueDetail(String issueId) { return workIssueFeignClient.selectOneWorkIssueDetail(issueId); } + + /** + * 工作端-事件评论列表 + * @param formDTO + * @return + */ + @Override + public Result> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO) { + return workIssueFeignClient.commentList(formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java index ab1ec7846..bb6d51a73 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.issue; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 议题待处理工作反馈DTO @@ -20,7 +21,7 @@ public class IssueJobFeedbackDTO implements Serializable { /** * 时间 */ - private String createdTime; + private Date createdTime; /** * 意见 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkEventCommentListFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkEventCommentListFormDTO.java new file mode 100644 index 000000000..7b3afc4f7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkEventCommentListFormDTO.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.dto.issue.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class WorkEventCommentListFormDTO implements Serializable { + private static final long serialVersionUID = -8864248267071206774L; + + /** + * 事件ID + */ + private String eventId; + + /** + * 0: 获取最新列表，1: 获取最热列表 + */ + private String orderType; + /** + * 页码，从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private int pageIndex; + /** + * 页容量，默认20页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private int pageSize = 20; + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java index 27bcbaca1..b3f6d8e13 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.issue.result; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 议题处理进度DTO @@ -20,7 +21,7 @@ public class IssueHandleProgressResultDTO implements Serializable { /** * 创建时间 */ - private String createdTime; + private Date createdTime; /** * 处理描述 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHotCommentResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHotCommentResultDTO.java index 75ef0bd78..70d67b604 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHotCommentResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHotCommentResultDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.issue.result; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 移动端-议题列表最热评论 @@ -32,6 +33,6 @@ public class IssueHotCommentResultDTO implements Serializable { /** * 评论时间 */ - private Integer createdTime; + private Date createdTime; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java index e936cdfd4..45fee3cef 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.issue.result; import lombok.Data; import java.io.Serializable; +import java.util.Date; @Data public class IssuePendingResponseResultDTO implements Serializable { @@ -13,7 +14,7 @@ public class IssuePendingResponseResultDTO implements Serializable { private String eventContent; - private String createdTime; + private Date createdTime; private String partyFlag; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkEventCommentResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkEventCommentResultDTO.java new file mode 100644 index 000000000..3521bdfe9 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkEventCommentResultDTO.java @@ -0,0 +1,49 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 工作端-事件评论列表 + * @Author wjp + */ +@Data +public class WorkEventCommentResultDTO implements Serializable { + private static final long serialVersionUID = 4956688227865722755L; + /** + * 评论id + */ + private String id; + /** + * 评论人昵称 + */ + private String userName; + /** + * 评论人头像 + */ + private String userFace; + /** + * 评论时间 + */ + private Date createdTime; + /** + * 评论内容 + */ + private String content; + /** + * 点赞数 + */ + private Integer likeCount; + /** + * 点踩数 + */ + private Integer unLikeCount; + /** + * 被回复数 + */ + private Integer replyCount; + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java index cc13e34c0..7c8a8e504 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java @@ -24,11 +24,15 @@ import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; +import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; +import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO; import com.elink.esua.epdc.modules.comment.service.EventCommentService; import com.elink.esua.epdc.modules.comment.service.EventCommentUserAttitudeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping(Constant.EPDC_APP + "comment") @@ -74,5 +78,13 @@ public class AppEventCommentController { return eventCommentService.listOfComments(formDTO); } - + /** + * 工作端-事件评论列表 + * @param formDTO + * @return + */ + @GetMapping("commentList") + public Result> commentList(@RequestBody WorkEventCommentListFormDTO formDTO){ + return eventCommentService.selectWorkHotOrNewEventComment(formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java index 2faaf1dff..6ac2beff4 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java @@ -20,7 +20,9 @@ package com.elink.esua.epdc.modules.comment.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; +import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO; +import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO; import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity; import org.apache.ibatis.annotations.Mapper; @@ -60,6 +62,10 @@ public interface EventCommentDao extends BaseDao { void updateOpposeNumSubtract(String commentId); + /** + * 更新回复数+1 + * @param commentId + */ void updateReplyCount(String commentId); /** @@ -89,4 +95,12 @@ public interface EventCommentDao extends BaseDao { */ IssueHotCommentResultDTO selectOneHotComment(String eventId); + /** + * 工作端-事件评论列表 + * @param formDTO + * @return + */ + List selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO); + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java index da75da155..aef267b22 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java @@ -25,7 +25,9 @@ import com.elink.esua.epdc.dto.comment.EventCommentDTO; import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; +import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO; +import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO; import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity; import java.util.List; @@ -160,4 +162,12 @@ public interface EventCommentService extends BaseService { * @since 2019/11/12 14:26 */ Result saveCommentAndAttitudeFromTopic(EpdcCommentsAndAttitudeFromTopicFormDTO formDto); + + + /** + * 工作端-事件评论列表 + * @param formDTO + * @return + */ + Result> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index 2702cd908..4dd77ccdb 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -34,7 +34,9 @@ import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; +import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO; +import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.comment.dao.EventCommentDao; import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity; @@ -272,27 +274,50 @@ public class EventCommentServiceImpl extends BaseServiceImpl().ok(data); } + /** + * 最热评论 + * @Params: [eventId] + * @Return: com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO + * @Author: liuchuang + * @Date: 2019/9/9 19:05 + */ @Override public IssueHotCommentResultDTO getHotComment(String eventId) { return baseDao.selectOneHotComment(eventId); } + /** + * 赞数+1 + * @param commentId + */ @Override public void updateApproveNumAdd(String commentId) { baseDao.updateApproveNumAdd(commentId); } + /** + * 踩数+1 + * @param commentId + */ @Override public void updateOpposeNumAdd(String commentId) { baseDao.updateOpposeNumAdd(commentId); } + /** + * 赞数-1 + * @param commentId + */ @Override public void updateApproveNumSubtract(String commentId) { baseDao.updateApproveNumSubtract(commentId); } + /** + * 踩数-1 + * @param commentId + */ @Override public void updateOpposeNumSubtract(String commentId) { baseDao.updateOpposeNumSubtract(commentId); @@ -321,4 +346,15 @@ public class EventCommentServiceImpl extends BaseServiceImpl> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO) { + List list = baseDao.selectWorkHotOrNewEventComment(formDTO); + return new Result>().ok(list); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java index 396811a8e..027d8f5c0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java @@ -68,7 +68,7 @@ public class EpdcAppWorkIssueController { * @return */ @GetMapping("list") - public Result> selectWorkIssueListOfNewOrHot(WorkIssueListFormDTO formDto){ + public Result> selectWorkIssueListOfNewOrHot(@RequestBody WorkIssueListFormDTO formDto){ return issueService.selectWorkIssueListOfNewOrHot(formDto); } 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 851937f0a..0d5d7ce8b 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 @@ -179,4 +179,30 @@ LIMIT 1 + + 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 a28c8bd91..4720a63e3 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 @@ -285,9 +285,9 @@ AND EVENT_STATE = #{state} - #{formDto.timestamp} + #{timestamp} - LIMIT #{formDto.pageIndex},#{formDto.pageSize} + LIMIT #{pageIndex},#{pageSize} 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 2bc4690a2..5084007a9 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 @@ -511,7 +511,6 @@ #{id} #{timestamp} - t1.DISTRIBUTE_TIME DESC LIMIT #{pageIndex},#{pageSize} ) temp )