From 131aa1302bd7edab443f01800e322602d1b269ea Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 29 四月 2021 16:27:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java | 12 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java | 15 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java | 52 ++++
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborApi.java | 107 ++++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborCommentReplyByAdminDTO.java | 25 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 93 ++++++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java | 36 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java | 19 +
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java | 22 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborAllCommentByAdminDTO.java | 26 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 60 ++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java | 40 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 7
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java | 57 ++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 88 ++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java | 3
21 files changed, 645 insertions(+), 33 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index 6085294..52fb796 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -5,6 +5,8 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
import com.panzhihua.common.model.vos.shop.*;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
index 044a79b..7333d3a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
@@ -33,4 +33,7 @@
@ApiModelProperty("议事主题")
private String releaseContent;
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborAllCommentByAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborAllCommentByAdminDTO.java
new file mode 100644
index 0000000..e873076
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborAllCommentByAdminDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NonNull;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("邻里圈查看详情的评论列表")
+public class DetailNeighborAllCommentByAdminDTO {
+ @ApiModelProperty(value = "邻里圈id")
+ @NotNull(message = "邻里圈id不能为空！")
+ private Long id;
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborCommentReplyByAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborCommentReplyByAdminDTO.java
new file mode 100644
index 0000000..faae88e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborCommentReplyByAdminDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("评论回复列表")
+public class DetailNeighborCommentReplyByAdminDTO {
+ @ApiModelProperty(value = "评论id")
+ @NotNull(message = "评论id不能为空！")
+ private Long id;
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
index 52b43a2..b93aa2e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
@@ -29,6 +29,9 @@
@ApiModelProperty("职位")
@NotBlank(groups = AddGroup.class,message = "职位不能为空")
private String job;
+
+ @ApiModelProperty("职位2")
+ private String jobTwo;
@ApiModelProperty("岗位职责")
@NotBlank(groups = AddGroup.class,message = "岗位职责不能为空")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java
new file mode 100644
index 0000000..0b6deec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("修改评论回复状态")
+public class ChangeCommentReplyStatusByAdminVO {
+ @ApiModelProperty("回复id")
+ private Long id;
+
+ @ApiModelProperty("状态（1.显示 2.隐藏）")
+ private Integer status;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java
new file mode 100644
index 0000000..86b2609
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("修改评论状态")
+public class ChangeCommentStatusByAdminVO {
+
+ @ApiModelProperty("评论id")
+ private Long id;
+
+ @ApiModelProperty("状态（1.显示 2.隐藏）")
+ private Integer status;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
index 8e2d129..941dc1b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.neighbor;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
private Long releaseId;
@ApiModelProperty("发布人")
- private Long releaseName;
+ private String releaseName;
@ApiModelProperty("发布人电话")
private String releasePhone;
@@ -61,6 +62,7 @@
private Integer viewsNum;
@ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("评论数")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java
new file mode 100644
index 0000000..6bbd464
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("邻里圈评论")
+public class ComActNeighborCommentByAdminVO {
+
+ @ApiModelProperty("评论id")
+ private Long id;
+
+ @ApiModelProperty("评论内容")
+ private String content;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("评论用户")
+ private Long userName;
+
+
+ @ApiModelProperty("评论用户手机号")
+ private String userPhone;
+
+ @ApiModelProperty("评论时间")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java
new file mode 100644
index 0000000..aaf127c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("邻里圈评论的回复")
+public class ComActNeighborCommentReplyByAdminVO {
+
+ @ApiModelProperty("评论id")
+ private Long id;
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty("评论用户")
+ private Long userName;
+
+ @ApiModelProperty("评论用户手机号")
+ private String userPhone;
+
+ @ApiModelProperty("评论内容")
+ private String content;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("状态（1.显示 2.隐藏）")
+ private Integer status;
+ @ApiModelProperty("评论时间")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
new file mode 100644
index 0000000..55d05a3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("邻里圈详情")
+public class DetailNeighborCircleAdminVO {
+
+ private Long id;
+
+ @ApiModelProperty("发布人")
+ private String releaseName;
+
+ @ApiModelProperty("发布人电话")
+ private String releasePhone;
+
+ @ApiModelProperty("发布内容")
+ private String releaseContent;
+
+ @ApiModelProperty("发布图片")
+ private String releaseImages;
+
+ @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
+ private Integer status;
+
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ @ApiModelProperty("评论数")
+ private Integer commentNum;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("转发数")
+ private Integer forwardNum;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewsNum;
+
+ @ApiModelProperty("是否为精品帖(1.是 2.否)")
+ private Integer isBoutique;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java
index c430f8d..8064248 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java
@@ -29,6 +29,9 @@
@ApiModelProperty("职位")
private String job;
+
+ @ApiModelProperty("职位2")
+ private String jobTwo;
@ApiModelProperty("岗位职责")
private String jobResponsibilities;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index a48a123..d907416 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
@@ -21,6 +22,9 @@
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -2278,19 +2282,49 @@
/**
* 后台修改邻里圈
- * @param comActNeighborCircleAdminDTO 请求参数
+ * @param editNeighborCircleAdminVO 请求参数
*/
@PostMapping("/neighbor/changeStatusByAdmin")
- R changeStatusByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+ R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
/**
- * 后台修改邻里圈
+ * 邻里圈_后台删除
* @param id 邻里圈id
* @return 邻里圈列表
*/
@PostMapping("/neighbor/deleteByAdmin")
R deleteByAdmin(@RequestParam("id")Long id);
+
+ /**
+ * 查看邻里圈基础_详情
+ * @param id 邻里圈id
+ * @return 邻里圈列表
+ */
+ @GetMapping("/neighbor/detailNeighborByAdmin")
+ R detailNeighborByAdmin(@RequestParam("id")Long id);
+
+ /**
+ * 邻里圈的所有评论_分页
+ * @param dto 请求参数
+ * @return 评论列表
+ */
+ @PostMapping("/neighbor/detailNeighborAllCommentByAdmin")
+ R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto);
+
+ /**
+ * 评论的状态_修改
+ * @param vo 请求参数
+ */
+ @PostMapping("/neighbor/changeCommentStatusByAdmin")
+ R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo);
+
+ /**
+ * 邻里圈评论_详情
+ * @param id 评论id
+ */
+ @GetMapping("/neighbor/detailNeighborCommentByAdmin")
+ R detailNeighborCommentByAdmin(@RequestParam("id") Long id);
/**
@@ -2341,6 +2375,26 @@
R timedTaskNeighborCircleRecord();
/**
+ * 邻里圈评论回复_分页
+ * @param dto 参数
+ */
+ @PostMapping("/neighbor/detailNeighborCommentAllReply")
+ R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto);
+
+ /**
+ * 邻里圈评论回复_基本详情
+ * @param id 参数
+ */
+ @PostMapping("/neighbor/detailNeighborCommentReply")
+ R detailNeighborCommentReply(@RequestParam("id") Long id);
+
+ /**
+ * 评论回复状态_修改
+ * @param changeStatusReplyVO 参数
+ */
+ @PostMapping("/neighbor/changeCommentReplyStatusByAdmin")
+ R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
+ /**
* 邻里圈取消点赞
* @param fabulousAppDTO 请求参数
* @return 取消点赞结果
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborApi.java
new file mode 100644
index 0000000..95347b5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborApi.java
@@ -0,0 +1,107 @@
+package com.panzhihua.community_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.neighbor.*;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Slf4j
+@RestController
+@RequestMapping("/neighbor/")
+@Api(tags = {"邻里圈服务"})
+public class NeighborApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "邻里圈_分页",response = ComActNeighborCircleAdminVO.class)
+ @PostMapping("pageNeighborByAdmin")
+ R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO){
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ comActNeighborCircleAdminDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.pageNeighborByAdmin(comActNeighborCircleAdminDTO);
+ }
+
+ /**
+ * 后台修改邻里圈
+ * @param editNeighborCircleAdminVO 请求参数
+ */
+ @ApiOperation(value = "邻里圈_修改")
+ @PostMapping("changeStatusByAdmin")
+ R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
+ return communityService.changeStatusByAdmin(editNeighborCircleAdminVO);
+ }
+
+ /**
+ * 邻里圈_后台删除
+ * @param id 邻里圈id
+ * @return 邻里圈列表
+ */
+ @ApiOperation(value = "邻里圈_删除")
+ @PostMapping("deleteByAdmin")
+ R deleteByAdmin(@RequestParam("id")Long id){
+ return communityService.deleteByAdmin(id);
+ }
+
+ @ApiOperation(value = "邻里圈_基础详情",response = DetailNeighborCircleAdminVO.class)
+ @GetMapping("detailNeighborByAdmin")
+ R detailNeighborByAdmin(@RequestParam("id")Long id){
+ return communityService.detailNeighborByAdmin(id);
+ }
+
+
+ @ApiOperation(value = "邻里圈的所有评论_分页",response = ComActNeighborCommentByAdminVO.class)
+ @PostMapping("detailNeighborAllCommentByAdmin")
+ R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto){
+ return communityService.detailNeighborAllCommentByAdmin(dto);
+ }
+
+ @ApiOperation(value = "评论的状态_修改")
+ @PostMapping("changeCommentStatusByAdmin")
+ R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo){
+ return communityService.changeCommentStatusByAdmin(vo);
+ }
+
+
+ @ApiOperation(value = "邻里圈评论_详情",response = ComActNeighborCommentByAdminVO.class)
+ @GetMapping("detailNeighborCommentByAdmin")
+ R detailNeighborCommentByAdmin(@RequestParam("id") Long id){
+ return communityService.detailNeighborCommentByAdmin(id);
+ }
+
+
+ @ApiOperation(value = "邻里圈评论回复_分页",response = ComActNeighborCommentReplyByAdminVO.class)
+ @PostMapping("detailNeighborCommentAllReply")
+ R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto){
+ return communityService.detailNeighborCommentAllReply(dto);
+ }
+
+
+
+ @ApiOperation(value = "邻里圈评论回复_基本详情",response = ComActNeighborCommentReplyByAdminVO.class)
+ @PostMapping("detailNeighborCommentReply")
+ R detailNeighborCommentReply(@RequestParam("id") Long id){
+ return communityService.detailNeighborCommentReply(id);
+ }
+
+
+ @ApiOperation(value = "评论回复状态_修改")
+ @PostMapping("changeCommentReplyStatusByAdmin")
+ R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO){
+ return communityService.changeCommentReplyStatusByAdmin(changeStatusReplyVO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
index 7eea1ca..ec48d95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -1,12 +1,10 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.dtos.neighbor.*;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import lombok.extern.slf4j.Slf4j;
@@ -22,7 +20,7 @@
@Slf4j
@RestController
-@RequestMapping("/neighbor")
+@RequestMapping("/neighbor/")
public class NeighborApi {
@Resource
@@ -60,8 +58,8 @@
/**
* 管理后台查询邻里圈列表
- * @param comActNeighborCircleAdminDTO 请求参数
- * @return 邻里圈列表
+ * @param comActNeighborCircleAdminDTO 请求参数
+ * @return 邻里圈列表
*/
@PostMapping("pageNeighborByAdmin")
public R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
@@ -70,8 +68,8 @@
/**
* 后台添加邻里圈
- * @param addNeighborCircleAdminVO 请求参数
- * @return 邻里圈列表
+ * @param addNeighborCircleAdminVO 请求参数
+ * @return 邻里圈列表
*/
@PostMapping("addNeighborByAdmin")
public R pageNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
@@ -80,7 +78,7 @@
/**
* 后台修改邻里圈
- * @param editNeighborCircleAdminVO 请求参数
+ * @param editNeighborCircleAdminVO 请求参数
*/
@PostMapping("changeStatusByAdmin")
public R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
@@ -88,13 +86,14 @@
}
/**
- * 后台修改邻里圈
- * @param id 邻里圈id
- * @return 邻里圈列表
+ * 邻里圈_后台删除
+ * 待审核状态不可删除，显示、隐藏、已驳回的都可以删除）
+ * @param id 邻里圈id
+ * @return 邻里圈列表
*/
@Transactional(rollbackFor = Exception.class)
@PostMapping("deleteByAdmin")
- public R deleteByAdmin(@RequestParam("id")Long id) {
+ public R deleteByAdmin(@RequestParam("id") Long id) {
return comActNeighborCircleService.deleteByAdmin(id);
}
@@ -158,6 +157,72 @@
}
/**
+ * 查看邻里圈基础_详情
+ * @param id 邻里圈id
+ * @return 邻里圈列表
+ */
+ @GetMapping("detailNeighborByAdmin")
+ public R detailNeighborByAdmin(@RequestParam("id") Long id) {
+ return comActNeighborCircleService.detailNeighborByAdmin(id);
+ }
+
+
+ /**
+ * 邻里圈的所有评论_分页
+ * @param dto 请求参数
+ * @return 评论列表
+ */
+ @PostMapping("detailNeighborAllCommentByAdmin")
+ public R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto) {
+ return comActNeighborCircleService.detailNeighborAllCommentByAdmin(dto);
+ }
+
+ /**
+ * 评论的状态_修改
+ * @param vo 请求参数
+ */
+ @PostMapping("changeCommentStatusByAdmin")
+ public R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo) {
+ return comActNeighborCircleService.changeCommentStatusByAdmin(vo);
+ }
+
+ /**
+ * 邻里圈评论_详情
+ * @param id 评论id
+ */
+ @GetMapping("detailNeighborCommentByAdmin")
+ public R detailNeighborCommentByAdmin(@RequestParam("id") Long id) {
+ return comActNeighborCircleService.detailNeighborCommentByAdmin(id);
+ }
+
+ /**
+ * 邻里圈评论回复_分页
+ * @param dto 参数
+ */
+ @PostMapping("detailNeighborCommentAllReply")
+ public R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto) {
+ return comActNeighborCircleService.detailNeighborCommentAllReply(dto);
+ }
+
+ /**
+ * 邻里圈评论回复_基本详情
+ * @param id 参数
+ */
+ @PostMapping("detailNeighborCommentReply")
+ public R detailNeighborCommentReply(@RequestParam("id") Long id) {
+ return comActNeighborCircleService.detailNeighborCommentReply(id);
+ }
+
+ /**
+ * 评论的状态_修改
+ * @param changeStatusReplyVO 参数
+ */
+ @PostMapping("changeCommentReplyStatusByAdmin")
+ public R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) {
+ return comActNeighborCircleService.changeCommentReplyStatusByAdmin(changeStatusReplyVO);
+ }
+
+ /**
* 邻里圈取消点赞
* @param fabulousAppDTO 请求参数
* @return 取消点赞结果
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
index f017440..5ce5fe2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -35,4 +37,14 @@
" </script>")
IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
+ @Select("<script> " +
+ "select nc.*,u.name as userName from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id " +
+ "<where>"+
+ "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
+ "circle_id = #{dto.id}"+
+ " </if> " +
+ "</where>"+
+ " ORDER BY create_at"+
+ "</script>")
+ IPage<ComActNeighborCommentByAdminVO> selectPageDetailNeighborComment(Page page, DetailNeighborAllCommentByAdminDTO dto);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
index 504113c..9862163 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java
@@ -1,9 +1,13 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentReplyAppVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyDO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -28,4 +32,15 @@
" </script>")
List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);
+ @Select("<script> " +
+ "select cr.*,u.name as userName from com_act_neighbor_circle_comment_reply cr left join sys_user u on cr.user_id=u.user_id " +
+ "<where>"+
+ "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
+ "comment_id = #{dto.id}"+
+ " </if> " +
+ "</where>"+
+ " ORDER BY create_at"+
+ "</script>")
+ Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page<ComActNeighborCircleCommentReplyDO> page, DetailNeighborCommentReplyByAdminDTO dto);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
index 812dea0..45b7f21 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -71,11 +71,12 @@
"com_act_neighbor_circle nc\n" +
"LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" +
"<where>"+
- "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent.trim() != ""'>" +
- "and t.release_content LIKE concat('%',#{neighborCircleAdminDTO.releaseContent}, '%' ) " +
+ "nc.community_id = #{neighborCircleAdminDTO.communityId} \n"+
+ "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'>" +
+ "and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%') \n" +
" </if> " +
"<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" +
- "and t.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} " +
+ "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} \n" +
" </if> " +
"</where>"+
"order by nc.`status` asc,nc.create_at desc " +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
index aa33b85..48664c0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
@@ -4,6 +4,8 @@
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
@@ -43,14 +45,14 @@
R pageNeighborByAdmin(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
/**
- * 后台添加邻里圈
+ * 邻里圈_添加
* @param addNeighborCircleAdminVO
* @return
*/
R addNeighborByAdmin(AddNeighborCircleAdminVO addNeighborCircleAdminVO);
/**
- * 后台修改邻里圈
+ * 邻里圈_修改
* @param editNeighborCircleAdminVO
* @return
*/
@@ -63,13 +65,55 @@
R deleteByAdmin(Long id);
/**
- * 查看详情
- * @param id
+ * 查看邻里圈基础_详情
+ * @param id 邻里圈id
* @return
*/
R detailNeighborByAdmin(Long id);
/**
+ * 邻里圈的所有评论_分页
+ * @param detailNeighborAllCommentByAdminDTO 参数
+ * @return
+ */
+ R detailNeighborAllCommentByAdmin(DetailNeighborAllCommentByAdminDTO detailNeighborAllCommentByAdminDTO);
+
+ /**
+ * 评论的状态_修改
+ * @param changeStatusComment
+ * @return
+ */
+ R changeCommentStatusByAdmin(ChangeCommentStatusByAdminVO changeStatusComment);
+
+ /**
+ * 邻里圈评论_详情
+ * @param id 评论id
+ * @return
+ */
+ R detailNeighborCommentByAdmin(Long id);
+
+ /**
+ * 邻里圈评论回复_分页
+ * @param dto 参数
+ * @return
+ */
+ R detailNeighborCommentAllReply(DetailNeighborCommentReplyByAdminDTO dto);
+
+ /**
+ * 邻里圈评论回复_基本详情
+ * @param id
+ * @return
+ */
+ R detailNeighborCommentReply(Long id);
+
+ /**
+ * 评论的状态_修改
+ * @param changeStatusReplyVO
+ * @return
+ */
+ R changeCommentReplyStatusByAdmin(ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
+
+ /**
* 用户查询邻里圈列表
* @param neighborCircleAppDTO 请求参数
* @return 邻里圈列表
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index fc22ba2..1f655da 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.*;
+import com.panzhihua.common.model.vos.neighbor.*;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActNeighborCircleCommentDAO;
@@ -28,6 +29,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -192,7 +195,7 @@
public R addNeighborByAdmin(AddNeighborCircleAdminVO addVO) {
ComActNeighborCircleDO comActNeighborCircleDO = new ComActNeighborCircleDO();
AdministratorsUserVO adminUser = this.baseMapper.selectUserByUserId(addVO.getUserId());
- if(adminUser==null){
+ if (adminUser == null) {
return R.fail("请登录重试");
}
comActNeighborCircleDO.setReleaseId(addVO.getUserId());
@@ -217,7 +220,7 @@
@Override
public R changeStatusByAdmin(EditNeighborCircleAdminVO editVO) {
ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(editVO.getId());
- if(neighborCircleDO==null){
+ if (neighborCircleDO == null) {
return R.fail("id有误！");
}
neighborCircleDO.setStatus(editVO.getStatus());
@@ -448,19 +451,88 @@
.eq(ComActNeighborCircleCommentReplyDO::getCircleId, id));
//邻里圈浏览器记录
neighborCircleBrowseDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleBrowseDO>()
- .eq(ComActNeighborCircleBrowseDO::getNeighborId,id));
- //邻里圈点赞删除
- neighborCircleBrowseDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleBrowseDO>()
- .eq(ComActNeighborCircleBrowseDO::getNeighborId,id));
+ .eq(ComActNeighborCircleBrowseDO::getNeighborId, id));
+ //邻里圈点赞删除 需要一层一层删
/* neighborCircleFabulousDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleFabulousDO>()
.eq(ComActNeighborCircleFabulousDO::get))*/
- return R.ok();
+ return R.ok();
}
@Override
public R detailNeighborByAdmin(Long id) {
- return null;
+ ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(id);
+ AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId());
+ if (comActNeighborCircleDO == null) {
+ return R.fail("id有误");
+ }
+ DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
+ BeanUtils.copyProperties(comActNeighborCircleDO, vo);
+ vo.setReleaseName(user.getName());
+ return R.ok(vo);
+ }
+
+ @Override
+ public R detailNeighborAllCommentByAdmin(DetailNeighborAllCommentByAdminDTO dto) {
+ ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(dto.getId());
+ if (comActNeighborCircleDO == null) {
+ return R.fail("id有误");
+ }
+ Page<ComActNeighborCircleCommentDO> page = new Page<>(dto.getPageNum(),dto.getPageSize());
+ //1、先查询所有该邻里圈_的评论
+ IPage<ComActNeighborCommentByAdminVO> commentDOIPage = neighborCircleCommentDAO.selectPageDetailNeighborComment(page,dto);
+ return R.ok(commentDOIPage);
+ }
+
+ @Override
+ public R changeCommentStatusByAdmin(ChangeCommentStatusByAdminVO dto) {
+ ComActNeighborCircleCommentDO commentDO = neighborCircleCommentDAO.selectById(dto.getId());
+ if(commentDO==null){
+ return R.fail("id有误!");
+ }
+ commentDO.setStatus(dto.getStatus());
+ neighborCircleCommentDAO.updateById(commentDO);
+ return R.ok();
+ }
+
+ @Override
+ public R detailNeighborCommentByAdmin(Long id) {
+ ComActNeighborCircleCommentDO commentDO = neighborCircleCommentDAO.selectById(id);
+ if(commentDO==null){
+ return R.fail("id有误!");
+ }
+ ComActNeighborCommentByAdminVO vo = new ComActNeighborCommentByAdminVO();
+ BeanUtils.copyProperties(commentDO,vo);
+ return R.ok(vo);
+ }
+
+ @Override
+ public R detailNeighborCommentAllReply(DetailNeighborCommentReplyByAdminDTO dto) {
+ Page<ComActNeighborCircleCommentReplyDO> page = new Page<>(dto.getPageNum(),dto.getPageSize());
+ Page<ComActNeighborCommentReplyByAdminVO> replyPage = neighborCircleCommentReplyDAO.selectListByComment(page, dto);
+ return R.ok(replyPage);
+ }
+
+ @Override
+ public R detailNeighborCommentReply(Long id) {
+ ComActNeighborCircleCommentReplyDO replyDO = neighborCircleCommentReplyDAO.selectById(id);
+ if(replyDO==null){
+ return R.fail("id有误!");
+ }
+ ComActNeighborCommentReplyByAdminVO vo = new ComActNeighborCommentReplyByAdminVO();
+ BeanUtils.copyProperties(replyDO,vo);
+ return R.ok(vo);
+ }
+
+ @Override
+ public R changeCommentReplyStatusByAdmin(ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) {
+ ComActNeighborCircleCommentReplyDO replyDO = neighborCircleCommentReplyDAO.selectById(changeStatusReplyVO.getId());
+ if(replyDO==null){
+ return R.fail("id有误!");
+ }
+ replyDO.setStatus(changeStatusReplyVO.getStatus());
+ neighborCircleCommentReplyDAO.updateById(replyDO);
+ return R.ok();
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java
index 0389a55..4c59d88 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java
@@ -33,6 +33,10 @@
*/
private String job;
/**
+ * 职位2
+ */
+ private String jobTwo;
+ /**
* 岗位职责
*/
private String jobResponsibilities;
--
Gitblit v1.7.1