springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java
@@ -25,34 +25,33 @@ @ApiModelProperty("图片地址 多个用逗号隔开") private String photoPah; @ApiModelProperty("联系方式") @ApiModelProperty(value = "联系方式",hidden = true) private String phone; @ApiModelProperty("留言人id") @ApiModelProperty(value = "留言人id",hidden = true) private Long sendtoUserId; @ApiModelProperty("留言人姓名") @ApiModelProperty(value = "留言人姓名",hidden = true) private String sendtoUserName; @ApiModelProperty("状态 1 待回复 2 已回复") @ApiModelProperty(value = "状态 1 待回复 2 已回复",hidden = true) private Integer status; @ApiModelProperty("是否公开 1 公开 2 保密") @ApiModelProperty(value = "是否公开 1 公开 2 保密",hidden = true) private Integer ispublic; @ApiModelProperty("回复人主键") @ApiModelProperty(value = "回复人主键",hidden = true) private Long userId; @ApiModelProperty("回复人账号") @ApiModelProperty(value = "回复人账号",hidden = true) private String userAccount; @ApiModelProperty("回复人姓名") @ApiModelProperty(value = "回复人姓名",hidden = true) private String userName; @ApiModelProperty("社区主键") @ApiModelProperty(value = "社区主键",hidden = true) private Long communityId; @ApiModelProperty("回复时间") @ApiModelProperty(value = "回复时间",hidden = true) private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java
@@ -23,37 +23,42 @@ @ApiModelProperty("图片地址 多个用逗号隔开") private String photoPah; @ApiModelProperty("留言对象联系方式") @ApiModelProperty(value = "留言对象联系方式",hidden = true) private String phone; @ApiModelProperty("回复人id") private Long sendtoUserId; @ApiModelProperty("回复人姓名") @ApiModelProperty(value = "回复人姓名",hidden = true) private String sendtoUserName; @ApiModelProperty("状态 1 待回复 2 已回复") @ApiModelProperty(value = "状态 1 待回复 2 已回复",hidden = true) private Integer status; @ApiModelProperty("是否公开 1 公开 2 保密") @ApiModelProperty(value = "是否公开 1 公开 2 保密",hidden = true) private Integer ispublic; @ApiModelProperty("留言人主键") @ApiModelProperty(value = "留言人主键",hidden = true) private Long userId; @ApiModelProperty("留言人账号") @ApiModelProperty(value = "留言人账号",hidden = true) private String userAccount; @ApiModelProperty("留言人电话") @NotBlank(groups = {AddGroup.class},message = "联系方式不能为空") private String userPhone; @ApiModelProperty("留言人姓名") @ApiModelProperty(value = "留言人姓名",hidden = true) private String userName; @ApiModelProperty("社区主键") @ApiModelProperty(value = "社区主键",hidden = true) private Long communityId; @ApiModelProperty("留言对象 1社区团队2社区团委") @ApiModelProperty(value = "留言对象 1社区团队2社区团委",hidden = true) private Long type; @ApiModelProperty("回复时间") @ApiModelProperty(value = "回复时间",hidden = true) private Date createAt; @ApiModelProperty("当前页数") private Long pageNum; @ApiModelProperty("每页记录数") private Long pageSize; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PageComActMessageVO.java
New file @@ -0,0 +1,68 @@ package com.panzhihua.common.model.vos.community; import java.util.Date; import java.util.List; import javax.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("留言") public class PageComActMessageVO { @ApiModelProperty("主键") private Long id; @ApiModelProperty("留言内容") @NotBlank(groups = {AddGroup.class},message = "留言内容不能为空") private String msgContent; @ApiModelProperty("图片地址 多个用逗号隔开") private String photoPah; @ApiModelProperty("留言对象联系方式") private String phone; @ApiModelProperty("回复人id") private Long sendtoUserId; @ApiModelProperty("回复人姓名") private String sendtoUserName; @ApiModelProperty("状态 1 待回复 2 已回复") private Integer status; @ApiModelProperty("是否公开 1 公开 2 保密") private Integer ispublic; @ApiModelProperty("留言人主键") private Long userId; @ApiModelProperty("留言人账号") private String userAccount; @ApiModelProperty("留言人电话") @NotBlank(groups = {AddGroup.class},message = "联系方式不能为空") private String userPhone; @ApiModelProperty("留言人姓名") private String userName; @ApiModelProperty("社区主键") private Long communityId; @ApiModelProperty("留言对象 1社区团队2社区团委") private Long type; @ApiModelProperty("回复时间") private Date createAt; private List<ComActMessageBackVO> backList; @ApiModelProperty("当前页数") private Long pageNum; @ApiModelProperty("每页记录数") private Long pageSize; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ResetComActMessageVO.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.common.model.vos.community; import java.util.List; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("留言-批量设置公开隐藏") public class ResetComActMessageVO { @ApiModelProperty("主键集合") private List<Long> ids; @ApiModelProperty(value = "是否公开 1 公开 2 保密") private Integer ispublic; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -874,16 +874,52 @@ @PostMapping("addmessage") R addMessage(ComActMessageVO comActMessageVO); /** * 新增留言 * @param comActMessageVO 新增留言信息 * 我的留言 * @param comActMessageVO 留言信息 * @return 发布结果 */ @GetMapping("pagemymessage") @PostMapping("pagemymessage") R pageMyMessageApplets(ComActMessageVO comActMessageVO); @GetMapping("pagemycommunitymessage") R pageMyCommunityMessageApplets(ComActMessageVO comActMessageVO); @GetMapping("pagesendtomemessage") /** * 给我的留言 * @param comActMessageVO 留言信息 * @return 发布结果 */ @PostMapping("pagesendtomemessage") R pageSendToMessageApplets(ComActMessageVO comActMessageVO); } /** * 新增留言回复 * @param comActMessageBackVO 保存留言回复信息 * @return 发布结果 */ @PostMapping("addmessageback") R addMessageBack(ComActMessageBackVO comActMessageBackVO); /** * 根据id查询留言列表 * @param id 用户id * @return 发布结果 */ @PostMapping("pagemessagebyuser") R pageMessageByUser(ComActMessageVO comActMessageVO); /** * 根据id删除留言 * @param id id * @return 删除结果 */ @PostMapping("deletemessage") R deleteMessage(ComActMessageVO comActMessageVO); /** * 根据id集合批量设置是否公开 * @param ids id集合 * @return 删除结果 */ @PostMapping("resetmessagepublic") R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO); /** * 分页显示社区所有留言 * @param comActMessageVO 留言信息 * @return 结果集合 */ @PostMapping("pagemycommunitymessage") R pageMyCommunityMessage(@RequestBody ComActMessageVO comActMessageVO); }