王金鹏 6 years ago
parent
commit
60afe4b928
  1. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/CommentFormDTO.java
  2. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCommentController.java
  3. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java
  4. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java
  5. 18
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CommentService.java
  6. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java
  7. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java
  8. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/CommentStatementFormDTO.java
  9. 11
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java
  10. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java
  11. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java
  12. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java
  13. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/EventUserAttitudeService.java

5
esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/CommentFormDTO.java → 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 = "评论内容不能为空")

6
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) {

6
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());

6
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<List<IssueResultDTO>> listIssues(IssueFormDTO formDto);
/**
* 议题/
* @param formDto
* @return
*/
@PostMapping(value = "events/epdc-app/issue/statement", consumes = MediaType.APPLICATION_JSON_VALUE)
Result statement(StatementFormDTO formDto);
/**
* 议题详情
* @Params: [formDto]

18
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);
}

6
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<UploadDTO> upload(MultipartFile file);
/**
* 议题/
* @param formDto
* @return
*/
Result statement(StatementFormDTO formDto);
/**
* 议题详情

2
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;

7
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;

11
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);

5
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<EventCommentEntity> {
*/
void delete(String[] ids);
//提交评论或回复接口
/**
* 提交评论或回复接口
* @param dto
*/
void submit(EventCommentDTO dto);
/**

5
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<EventCommen
*/
void delete(String[] ids);
/**
* 评论/接口
* @param formDto
* @return
*/
void statement(CommentStatementFormDTO formDto);
}

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

@ -49,6 +49,11 @@ public class EpdcAppIssueController {
return this.issueService.listIssues(formDto);
}
/**
* 议题/
* @param formDto
* @return
*/
@PostMapping("statement")
public Result statement(@RequestBody StatementFormDTO formDto) {
this.eventUserAttitudeService.statement(formDto);

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

@ -96,5 +96,9 @@ public interface EventUserAttitudeService extends BaseService<EventUserAttitudeE
void delete(String[] ids);
/**
* 议题/
* @param formDto
*/
void statement(StatementFormDTO formDto);
}

Loading…
Cancel
Save