diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/CommentFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/CommentFormDTO.java similarity index 79% rename from esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/CommentFormDTO.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/CommentFormDTO.java index 101f14927..5379df699 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/CommentFormDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/CommentFormDTO.java @@ -6,7 +6,7 @@ * 版权所有，侵权必究！ */ -package com.elink.esua.epdc.dto; +package com.elink.esua.epdc.dto.form; import lombok.Data; @@ -19,9 +19,12 @@ import javax.validation.constraints.NotBlank; @Data public class CommentFormDTO { + private static final long serialVersionUID = 1L; + @NotBlank(message = "议题id不能为空") private String issueId; + //父评论（被评论）ID private String faCommentId; @NotBlank(message = "评论内容不能为空") diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java index e2fb757a7..e7afe3cf3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java @@ -3,14 +3,12 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CommentFormDTO; +import com.elink.esua.epdc.dto.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; import com.elink.esua.epdc.service.CommentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 移动端接口-评论模块 * @Author WJP @@ -36,7 +34,7 @@ public class ApiCommentController { /** - * 表态评论（赞/踩） + * 评论（赞/踩） */ @PostMapping("statement") public Result statement(@LoginUser TokenDto userDetail, CommentStatementFormDTO commentStatementFormDTO) { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index cb12f1de6..77500c484 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java @@ -67,6 +67,12 @@ public class ApiIssueController { } + /** + * 议题（赞/踩） + * @param userDetail + * @param formDto + * @return + */ @PostMapping("statement") public Result statement(@LoginUser TokenDto userDetail, StatementFormDTO formDto) { formDto.setUserId(userDetail.getUserId()); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java index 2856b5d80..a31b1f752 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java @@ -48,8 +48,14 @@ public interface IssueFeignClient { @GetMapping(value = "events/epdc-app/issue/list", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listIssues(IssueFormDTO formDto); + /** + * 议题（赞/踩） + * @param formDto + * @return + */ @PostMapping(value = "events/epdc-app/issue/statement", consumes = MediaType.APPLICATION_JSON_VALUE) Result statement(StatementFormDTO formDto); + /** * 议题详情 * @Params: [formDto] diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CommentService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CommentService.java index 0c209d9b0..0eab5cf25 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CommentService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CommentService.java @@ -3,15 +3,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CommentFormDTO; -import com.elink.esua.epdc.dto.UploadDTO; +import com.elink.esua.epdc.dto.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; -import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; -import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; -import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; /** * 移动端接口-评论模块 @@ -20,8 +13,17 @@ import java.util.List; */ public interface CommentService { + /** + * 提交评论或回复接口 + * @param userDetail + * @param commentFormDTO + * @return + */ Result submit(@LoginUser TokenDto userDetail, CommentFormDTO commentFormDTO); + /** + * 评论（赞/踩） + */ Result statement(@LoginUser TokenDto userDetail, CommentStatementFormDTO commentStatementFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java index 7c9bb814b..ec02234e9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java @@ -48,7 +48,11 @@ public interface IssueService { */ Result upload(MultipartFile file); - + /** + * 议题（赞/踩） + * @param formDto + * @return + */ Result statement(StatementFormDTO formDto); /** * 议题详情 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java index a9d55f3ac..5de6bf2b9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java @@ -3,7 +3,7 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CommentFormDTO; +import com.elink.esua.epdc.dto.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; import com.elink.esua.epdc.dto.comment.EventCommentDTO; import com.elink.esua.epdc.feign.CommentFeignClient; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/CommentStatementFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/CommentStatementFormDTO.java index 3865cd98d..6e7571ed0 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/CommentStatementFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/CommentStatementFormDTO.java @@ -27,9 +27,14 @@ public class CommentStatementFormDTO implements Serializable { private static final long serialVersionUID = 1L; - + /** + * 表态 0赞；1踩 + */ private String attitude; + /** + * 评论ID + */ private String commentId; private String useId; 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 20cb70aab..01c025be3 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 @@ -37,13 +37,22 @@ public class AppEventCommentController { @Autowired private EventCommentUserAttitudeService eventCommentUserAttitudeService; - //提交评论或回复接口 + /** + * 提交评论或回复接口 + * @param dto + * @return + */ @PostMapping("submit") public Result submit(@RequestBody EventCommentDTO dto){ eventCommentService.submit(dto); return new Result(); } + /** + * 评论（赞/踩）接口 + * @param formDto + * @return + */ @PostMapping("statement") public Result statement(@RequestBody CommentStatementFormDTO formDto) { eventCommentUserAttitudeService.statement(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 f2a3ec530..1118ac310 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 @@ -93,7 +93,10 @@ public interface EventCommentService extends BaseService { */ void delete(String[] ids); - //提交评论或回复接口 + /** + * 提交评论或回复接口 + * @param dto + */ void submit(EventCommentDTO dto); /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java index 09d6bfbba..b91301340 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java @@ -94,5 +94,10 @@ public interface EventCommentUserAttitudeService extends BaseService