diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java index 20575626fd..ed9bb74e21 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReplyListFormDTO.java @@ -20,4 +20,7 @@ public class ReplyListFormDTO implements Serializable { @NotBlank(message = "报事ID不能为空",groups = ReplyListForm.class) private String resiEventId; + + @NotBlank(message = "当前用户id不能为空",groups = ReplyListForm.class) + private String currentUserId; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java index f5b744289e..87209854a4 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ReplyListResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Author zxc @@ -14,5 +16,21 @@ public class ReplyListResultDTO implements Serializable { private static final long serialVersionUID = 4875335642497226847L; + /** + * 回复人的昵称,比如:南宁路社区,人大代表-李四,山东路-尹女士 + * */ + private String replyName; + /** + * 回复时间 + * */ + private Date replyTime; + + /** + * 回复的内容 + * */ + private String replyContent; + + @JsonIgnore + private String replyUserId; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java index 6a1eac37ef..dec9a9a80f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventReplyController.java @@ -17,6 +17,8 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.ReplyListFormDTO; @@ -51,7 +53,8 @@ public class ResiEventReplyController { * @date 2021/8/3 11:11 上午 */ @PostMapping("list") - public Result> replyList(@RequestBody ReplyListFormDTO formDTO){ + public Result> replyList(@LoginUser TokenDto tokenDto, @RequestBody ReplyListFormDTO formDTO){ + formDTO.setCurrentUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class); return new Result>().ok(resiEventReplyService.replyList(formDTO)); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java index 38cbf1467d..603c1eefc9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventReplyDao.java @@ -18,9 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.ReplyListResultDTO; import com.epmet.entity.ResiEventReplyEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 事件回复表 * @@ -29,5 +32,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiEventReplyDao extends BaseDao { - + + /** + * 查询事件的回复列表 + * + * @param resiEventId + * @return java.util.List + * @author yinzuomei + * @date 2021/8/4 13:22 + */ + List selectReplyList(String resiEventId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java index 4b003cf048..98767e41c8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java @@ -44,6 +44,12 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl replyList(ReplyListFormDTO formDTO) { - return null; + List list=baseDao.selectReplyList(formDTO.getResiEventId()); + list.forEach(dto->{ + if(dto.getReplyUserId().equals(formDTO.getCurrentUserId())){ + dto.setReplyName("我"); + } + }); + return list; } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml index 5e01548862..bc763a71f5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventReplyDao.xml @@ -3,6 +3,19 @@ - + \ No newline at end of file