From 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 29 四月 2021 16:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentDO.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborCommentReplyByAdminDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java | 4
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java | 3
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/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 124 ++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 84 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java | 10
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborFabulousAppDTO.java | 33 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 458 +++++++++++++++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java | 10
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java | 31 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborReplyAppDTO.java | 41 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java | 112 +++
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/ComActNeighborCircleAppDTO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 178 +++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborForwardAppDTO.java | 21
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/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java | 9
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentAppDTO.java | 27
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/model/vos/neighbor/ComActNeighborCircleAppVO.java | 12
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java | 3
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 | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java | 57 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java | 3
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/NeighborCircleJobHandler.java | 37 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java | 11
39 files changed, 1,584 insertions(+), 77 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 3b28c81..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
@@ -1,12 +1,12 @@
package com.panzhihua.applets.api;
import com.panzhihua.common.controller.BaseController;
-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.dtos.neighbor.*;
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.*;
@@ -63,11 +63,87 @@
}
@ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
- @PostMapping("neighbor/detail")
+ @PostMapping("detail")
public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
return communityService.neighborDetailByApp(neighborCircleAppDTO);
}
+ @ApiOperation(value = "分页查询用户邻里圈审核列表" , response = ComActNeighborCircleAppVO.class)
+ @PostMapping("user/page")
+ public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ neighborCircleAppDTO.setUserId(userId);
+ return communityService.neighborExamineByApp(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈点赞")
+ @PostMapping("fabulous")
+ public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ fabulousAppDTO.setUserId(userId);
+ return communityService.neighborFabulousByApp(fabulousAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈转发")
+ @PostMapping("forward")
+ public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ forwardAppDTO.setUserId(userId);
+ return communityService.neighborForwardByApp(forwardAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈评论")
+ @PostMapping("comment")
+ public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ commentAppDTO.setUserId(userId);
+ return communityService.neighborCommentByApp(commentAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈回复")
+ @PostMapping("reply")
+ public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ replyAppDTO.setUserId(userId);
+ return communityService.neighborReplyByApp(replyAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈取消点赞")
+ @PostMapping("cancel/fabulous")
+ public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ fabulousAppDTO.setUserId(userId);
+ return communityService.neighborFabulousCancelByApp(fabulousAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈添加浏览记录")
+ @PostMapping("add/browse")
+ public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ addBrowseAppDTO.setUserId(userId);
+ return communityService.neighborAddBrowseByApp(addBrowseAppDTO);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java
new file mode 100644
index 0000000..4a91142
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈新增浏览记录请求参数
+ */
+@Data
+@ApiModel("邻里圈新增浏览记录请求参数")
+public class ComActNeighborAddBrowseAppDTO {
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+}
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/ComActNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
index c9557f7..763aac9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
@@ -25,4 +25,7 @@
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java
index a393d48..be43d33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java
@@ -25,4 +25,7 @@
@ApiModelProperty(value = "评论分页-每页记录数",example = "10")
private Long pageSize = 10L;
+ @ApiModelProperty(value = "评论排序方式（1.倒序 2.顺序）",example = "10")
+ private Integer order = 1;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentAppDTO.java
new file mode 100644
index 0000000..433f602
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentAppDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈评论请求参数
+ */
+@Data
+@ApiModel("邻里圈评论请求参数")
+public class ComActNeighborCommentAppDTO {
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty("邻里圈评论内容")
+ private String content;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户手机号",hidden = true)
+ private String phone;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborFabulousAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborFabulousAppDTO.java
new file mode 100644
index 0000000..be984df
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborFabulousAppDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈点赞请求参数
+ */
+@Data
+@ApiModel("邻里圈点赞请求参数")
+public class ComActNeighborFabulousAppDTO {
+
+ @ApiModelProperty("邻里圈点赞类型（1.邻里圈 2.评论 3.回复）")
+ private Integer type = 1;
+
+ @ApiModelProperty("邻里圈点赞业务id")
+ private Long serviceId;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ /**
+ * 邻里圈点赞类型（1.邻里圈 2.评论 3.回复）
+ */
+ public interface type{
+ int llq = 1;
+ int pl = 2;
+ int hf = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborForwardAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborForwardAppDTO.java
new file mode 100644
index 0000000..734af21
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborForwardAppDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈转发请求参数
+ */
+@Data
+@ApiModel("邻里圈转发请求参数")
+public class ComActNeighborForwardAppDTO {
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborReplyAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborReplyAppDTO.java
new file mode 100644
index 0000000..a2a589d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborReplyAppDTO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈回复请求参数
+ */
+@Data
+@ApiModel("邻里圈回复请求参数")
+public class ComActNeighborReplyAppDTO {
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty("回复类型（1.评论 2.回复）")
+ private Integer type;
+
+ @ApiModelProperty("业务id（当type为1时，这里是评论的id，当type=2时，这里是回复的id）")
+ private Long serviceId;
+
+ @ApiModelProperty("邻里圈回复内容")
+ private String content;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户手机号",hidden = true)
+ private String phone;
+
+ /**
+ * 回复类型（1.评论 2.回复）
+ */
+ public interface type{
+ int pl = 1;
+ int hf = 2;
+ }
+}
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/ComActNeighborCircleAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
index 3027fee..f3ca0e7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -69,4 +69,16 @@
@ApiModelProperty("近3天浏览量")
private Integer lastViewsNum;
+ /**
+ * 驳回原因
+ */
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java
index 1e88476..b63ac11 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java
@@ -27,10 +27,10 @@
private Long userId;
@ApiModelProperty("评论用户名字")
- private Long userName;
+ private String userName;
@ApiModelProperty("评论用户头像")
- private Long userHeadUrl;
+ private String userHeadUrl;
@ApiModelProperty("评论内容")
private String content;
@@ -48,4 +48,10 @@
@ApiModelProperty("邻里圈评论回复列表（默认展示2条）")
private List<ComActNeighborCircleCommentReplyAppVO> circleCommentReplyAppList;
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java
index 48f15a6..44bbf61 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java
@@ -26,7 +26,10 @@
private String parentUserName;
@ApiModelProperty("回复用户名称")
- private Long userName;
+ private String userName;
+
+ @ApiModelProperty("回复用户头像url")
+ private String userHeadUrl;
@ApiModelProperty("回复内容")
private String replyContent;
@@ -41,4 +44,10 @@
@ApiModelProperty("是否是作者回复（1.是 2.否）")
private Integer isRelease;
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
index e2508f7..80f9cc4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -55,4 +55,10 @@
@ApiModelProperty("邻里圈评论列表")
private List<ComActNeighborCircleCommentAppVO> circleCommentAppList;
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign;
+
}
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 4dbf52a..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
@@ -5,6 +5,8 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
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;
@@ -20,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;
@@ -2277,19 +2282,132 @@
/**
* 后台修改邻里圈
- * @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);
+
+
+ /**
+ * 用户查询邻里圈列表
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/neighborExamineByApp")
+ R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 邻里圈点赞
+ * @param fabulousAppDTO 请求参数
+ * @return 点赞结果
+ */
+ @PostMapping("/neighbor/neighborFabulousByApp")
+ R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 邻里圈转发
+ * @param forwardAppDTO 请求参数
+ * @return 转发结果
+ */
+ @PostMapping("/neighbor/neighborForwardByApp")
+ R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO);
+
+ /**
+ * 邻里圈评论
+ * @param commentAppDTO 请求参数
+ * @return 评论结果
+ */
+ @PostMapping("/neighbor/neighborCommentByApp")
+ R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO);
+
+ /**
+ * 邻里圈回复
+ * @param replyAppDTO 请求参数
+ * @return 回复结果
+ */
+ @PostMapping("/neighbor/neighborReplyByApp")
+ R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO);
+
+ /**
+ * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
+ * @return 执行结果
+ */
+ @PostMapping("/neighbor/timeTaskCircleFlow")
+ 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 取消点赞结果
+ */
+ @PostMapping("/neighbor/neighborFabulousCancelByApp")
+ R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 添加邻里圈浏览记录
+ * @param addBrowseAppDTO 请求参数
+ * @return 返回参数
+ */
+ @PostMapping("/neighbor/neighborAddBrowseByApp")
+ R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
}
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 4c1be89..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,11 +1,10 @@
package com.panzhihua.service_community.api;
-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.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.service.ComActNeighborCircleService;
import lombok.extern.slf4j.Slf4j;
@@ -21,7 +20,7 @@
@Slf4j
@RestController
-@RequestMapping("/neighbor")
+@RequestMapping("/neighbor/")
public class NeighborApi {
@Resource
@@ -47,6 +46,11 @@
return comActNeighborCircleService.addNeighborByApp(addNeighborCircleAppDTO);
}
+ /**
+ * 查询邻里圈详情
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈详情
+ */
@PostMapping("neighborDetailByApp")
public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
return comActNeighborCircleService.neighborDetailByApp(neighborCircleAppDTO);
@@ -54,8 +58,8 @@
/**
* 管理后台查询邻里圈列表
- * @param comActNeighborCircleAdminDTO 请求参数
- * @return 邻里圈列表
+ * @param comActNeighborCircleAdminDTO 请求参数
+ * @return 邻里圈列表
*/
@PostMapping("pageNeighborByAdmin")
public R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
@@ -64,8 +68,8 @@
/**
* 后台添加邻里圈
- * @param addNeighborCircleAdminVO 请求参数
- * @return 邻里圈列表
+ * @param addNeighborCircleAdminVO 请求参数
+ * @return 邻里圈列表
*/
@PostMapping("addNeighborByAdmin")
public R pageNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
@@ -74,7 +78,7 @@
/**
* 后台修改邻里圈
- * @param editNeighborCircleAdminVO 请求参数
+ * @param editNeighborCircleAdminVO 请求参数
*/
@PostMapping("changeStatusByAdmin")
public R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
@@ -82,14 +86,160 @@
}
/**
- * 后台修改邻里圈
- * @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);
}
+ /**
+ * 用户查询邻里圈列表
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("neighborExamineByApp")
+ public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ return comActNeighborCircleService.neighborExamineByApp(neighborCircleAppDTO);
+ }
+
+ /**
+ * 邻里圈点赞
+ * @param fabulousAppDTO 请求参数
+ * @return 点赞结果
+ */
+ @PostMapping("neighborFabulousByApp")
+ public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ return comActNeighborCircleService.neighborFabulousByApp(fabulousAppDTO);
+ }
+
+ /**
+ * 邻里圈转发
+ * @param forwardAppDTO 请求参数
+ * @return 转发结果
+ */
+ @PostMapping("neighborForwardByApp")
+ public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
+ return comActNeighborCircleService.neighborForwardByApp(forwardAppDTO);
+ }
+
+ /**
+ * 邻里圈评论
+ * @param commentAppDTO 请求参数
+ * @return 评论结果
+ */
+ @PostMapping("neighborCommentByApp")
+ public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
+ return comActNeighborCircleService.neighborCommentByApp(commentAppDTO);
+ }
+
+ /**
+ * 邻里圈回复
+ * @param replyAppDTO 请求参数
+ * @return 回复结果
+ */
+ @PostMapping("neighborReplyByApp")
+ public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
+ return comActNeighborCircleService.neighborReplyByApp(replyAppDTO);
+ }
+
+ /**
+ * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
+ * @return 执行结果
+ */
+ @PostMapping("timeTaskCircleFlow")
+ public R timeTaskCircleFlow() {
+ return comActNeighborCircleService.timeTaskCircleFlow();
+ }
+
+ /**
+ * 查看邻里圈基础_详情
+ * @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 取消点赞结果
+ */
+ @PostMapping("neighborFabulousCancelByApp")
+ public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ return comActNeighborCircleService.neighborFabulousCancelByApp(fabulousAppDTO);
+ }
+
+ /**
+ * 添加邻里圈浏览记录
+ * @param addBrowseAppDTO 请求参数
+ * @return 返回参数
+ */
+ @PostMapping("neighborAddBrowseByApp")
+ public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
+ return comActNeighborCircleService.neighborAddBrowseByApp(addBrowseAppDTO);
+ }
+
}
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 8b44b9c..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,9 +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;
@@ -24,8 +27,24 @@
",cancc.create_at,cancc.is_release,su.nick_name as userName,su.image_url as userHeadUrl " +
" from com_act_neighbor_circle_comment as cancc " +
" left join sys_user as su on su.user_id = cancc.user_id" +
- " where cancc.circle_id = #{circleId} order by cancc.create_at desc" +
+ " where cancc.circle_id = #{neighborCircleAppDTO.circleId} and cancc.status = 1" +
+ "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 1'>" +
+ " order by cancc.create_at desc" +
+ " </if> " +
+ "<if test='neighborCircleAppDTO.order != null and neighborCircleAppDTO.order == 2'>" +
+ " order by cancc.create_at asc" +
+ " </if> " +
" </script>")
- IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("circleId") Long circleId);
+ 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 11a0af3..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,8 +1,17 @@
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;
+
+import java.util.List;
/**
* @auther lyq
@@ -12,4 +21,26 @@
@Mapper
public interface ComActNeighborCircleCommentReplyDAO extends BaseMapper<ComActNeighborCircleCommentReplyDO> {
+ @Select("<script> " +
+ "select reply.id,reply.comment_id, reply.reply_content,reply.fabulous_num " +
+ ",reply.create_at,reply.is_release,su1.nick_name as userName " +
+ ",su1.image_url as userHeadUrl,su2.nick_name as parentUserName " +
+ " from com_act_neighbor_circle_comment_reply as reply" +
+ " left join sys_user su1 on su1.user_id = reply.user_id " +
+ " left join sys_user su2 on su2.user_id = reply.parent_user_id " +
+ " where reply.comment_id = #{commentId} order by create_at desc limit 2" +
+ " </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 5d1c0da..e642499 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
@@ -43,7 +43,7 @@
" FROM " +
" com_act_neighbor_circle AS canc" +
" left join sys_user as su on su.user_id = canc.release_id" +
- " where canc.status = 2 and canc.community_id = #{communityId} " +
+ " where canc.status = 2 and canc.community_id = #{neighborCircleAppDTO.communityId} " +
"<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 1'>" +
" order by (canc.last_views_num + canc.last_comment_num + canc.last_fabulous_num) desc " +
" </if> " +
@@ -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 " +
@@ -85,4 +86,11 @@
@Select("select * from sys_user where user_id=#{userId}")
AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId);
+ @Select("<script> " +
+ "select id,release_content,release_images,status,create_at,comment_num,fabulous_num,forward_num,views_num,refuse_reason " +
+ " from com_act_neighbor_circle as canc " +
+ " where canc.release_id = #{userId} order by create_at desc" +
+ " </script>")
+ IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page,@Param("userId") Long userId);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentDO.java
index 7a5408b..e05fcfd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentDO.java
@@ -66,6 +66,14 @@
*/
private Integer isRelease;
+ /**
+ * 是否是作者评论（1.是 2.否）
+ */
+ public interface isRelease{
+ int yes = 1;
+ int no = 2;
+ }
+
@Override
public String toString() {
return "ComActNeighborCircleCommentDO{" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java
index db20bed..fd5fb14 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java
@@ -38,7 +38,7 @@
/**
* 上级回复id
*/
- private Long panentId;
+ private Long parentId;
/**
* 上级回复用户id
@@ -71,13 +71,18 @@
*/
private Integer isRelease;
+ /**
+ * 状态（1.显示 2.隐藏）
+ */
+ private Integer status;
+
@Override
public String toString() {
return "ComActNeighborCircleCommentReplyDO{" +
"id=" + id +
", circleId=" + circleId +
", commentId=" + commentId +
- ", panentId=" + panentId +
+ ", parentId=" + parentId +
", parentUserId=" + parentUserId +
", userId=" + userId +
", replyContent=" + replyContent +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
index 574aa16..c1811fd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
@@ -111,6 +111,16 @@
*/
private Integer lastViewsNum;
+ /**
+ * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
+ */
+ public interface status{
+ int dsh = 1;
+ int xs = 2;
+ int yc = 3;
+ int bh = 4;
+ }
+
@Override
public String toString() {
return "ComActNeighborCircleDO{" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java
index 6fbc3e6..9903cb4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java
@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
@@ -33,6 +31,11 @@
private Integer type;
/**
+ * 邻里圈id
+ */
+ private Long circleId;
+
+ /**
* 点赞上级id
*/
private Long parentId;
@@ -50,13 +53,32 @@
/**
* 点赞时间
*/
+ @TableField(fill = FieldFill.INSERT)
private Date createAt;
/**
* 修改时间
*/
+ @TableField(fill = FieldFill.UPDATE)
private Date updateAt;
+ /**
+ * 有效状态（1.有效 2.取消）
+ */
+ public interface isEffective{
+ int yes = 1;
+ int no = 2;
+ }
+
+ /**
+ * 点赞类型（1.邻里圈 2.评论 3.回复）
+ */
+ public interface type{
+ int llq = 1;
+ int pl = 2;
+ int hf = 3;
+ }
+
@Override
public String toString() {
return "ComActNeighborCircleFabulousDO{" +
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 1fad43b..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
@@ -1,12 +1,11 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
+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;
@@ -46,14 +45,14 @@
R pageNeighborByAdmin(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
/**
- * 后台添加邻里圈
+ * 邻里圈_添加
* @param addNeighborCircleAdminVO
* @return
*/
R addNeighborByAdmin(AddNeighborCircleAdminVO addNeighborCircleAdminVO);
/**
- * 后台修改邻里圈
+ * 邻里圈_修改
* @param editNeighborCircleAdminVO
* @return
*/
@@ -66,10 +65,107 @@
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 邻里圈列表
+ */
+ R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 邻里圈点赞
+ * @param fabulousAppDTO 请求参数
+ * @return 点赞结果
+ */
+ R neighborFabulousByApp(ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 邻里圈转发
+ * @param forwardAppDTO 请求参数
+ * @return 转发结果
+ */
+ R neighborForwardByApp(ComActNeighborForwardAppDTO forwardAppDTO);
+
+ /**
+ * 邻里圈评论
+ * @param commentAppDTO 请求参数
+ * @return 评论结果
+ */
+ R neighborCommentByApp(ComActNeighborCommentAppDTO commentAppDTO);
+
+ /**
+ * 邻里圈回复
+ * @param replyAppDTO 请求参数
+ * @return 回复结果
+ */
+ R neighborReplyByApp(ComActNeighborReplyAppDTO replyAppDTO);
+
+ /**
+ * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
+ * @return 执行结果
+ */
+ R timeTaskCircleFlow();
+
+ /**
+ * 邻里圈取消点赞
+ * @param fabulousAppDTO 请求参数
+ * @return 取消点赞结果
+ */
+ R neighborFabulousCancelByApp(ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 添加邻里圈浏览记录
+ * @param addBrowseAppDTO 请求参数
+ * @return 返回参数
+ */
+ R neighborAddBrowseByApp(ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
+
}
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 85799e4..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
@@ -2,26 +2,26 @@
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
+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.ComActNeighborCircleAdminVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentAppVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
+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;
-import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.service_community.dao.ComActNeighborCircleCommentReplyDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
+import com.panzhihua.service_community.dao.ComActNeighborCircleFabulousDAO;
+import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentDO;
+import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyDO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
+import com.panzhihua.service_community.model.dos.ComActNeighborCircleFabulousDO;
import com.panzhihua.service_community.service.ComActNeighborCircleBrowseService;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
@@ -31,8 +31,10 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+
import java.util.List;
/**
@@ -58,6 +60,14 @@
@Resource
ComActNeighborCircleCommentReplyDAO neighborCircleCommentReplyDAO;
+ @Resource
+ private ComActNeighborCircleCommentDAO comActNeighborCircleCommentDAO;
+ @Resource
+ private ComActNeighborCircleCommentReplyDAO comActNeighborCircleCommentReplyDAO;
+ @Resource
+ private ComActNeighborCircleFabulousDAO comActNeighborCircleFabulousDAO;
+ @Resource
+ private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO;
/**
* 分页查询邻里圈列表
@@ -68,6 +78,20 @@
public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
+ if(!doPager.getRecords().isEmpty()){
+ for (ComActNeighborCircleAppVO circleAppVO:doPager.getRecords()) {
+ //查询点赞信息
+ ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleAppVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq));
+ if(circleFabulousDO != null && circleFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
+ circleAppVO.setHaveSign(1);
+ }else{
+ circleAppVO.setHaveSign(2);
+ }
+ }
+ }
return R.ok(doPager);
}
@@ -97,27 +121,66 @@
}
}
+ /**
+ * 查看邻里圈详情
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈详情
+ */
@Override
public R neighborDetailByApp(ComActNeighborCircleDetailAppDTO neighborCircleAppDTO){
- //添加邻里圈浏览记录
- comActNeighborCircleBrowseService.addBrowseRecord(neighborCircleAppDTO.getCircleId(),neighborCircleAppDTO.getUserId());
-
//查询邻里圈详情
ComActNeighborCircleDetailAppVO circleDetailAppVO = this.baseMapper.neighborDetailByApp(neighborCircleAppDTO.getCircleId());
-
- //查询邻里圈下评论列表
- IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage = neighborCircleCommentDAO.pageNeighborCommentByApp(
- new Page(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO.getCircleId());
- if(!circleCommentAppPage.getRecords().isEmpty()){
- for (ComActNeighborCircleCommentAppVO circleCommentVo:circleCommentAppPage.getRecords()) {
- //查询评论下评论回复
-
-
- }
+ if(circleDetailAppVO == null){
+ return R.fail("未找到邻里圈信息");
}
+ //查询邻里圈点赞信息
+ ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleDetailAppVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq));
+ if(circleFabulousDO != null && circleFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
+ circleDetailAppVO.setHaveSign(1);
+ }else{
+ circleDetailAppVO.setHaveSign(2);
+ }
+ //查询邻里圈下评论列表
+ IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage = comActNeighborCircleCommentDAO.pageNeighborCommentByApp(
+ new Page(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO);
+ if(!circleCommentAppPage.getRecords().isEmpty()){
+ for (ComActNeighborCircleCommentAppVO circleCommentVo:circleCommentAppPage.getRecords()) {
+ //查询点赞信息
+ ComActNeighborCircleFabulousDO circleCommentFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleCommentVo.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl));
+ if(circleCommentFabulousDO != null && circleCommentFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
+ circleCommentVo.setHaveSign(1);
+ }else{
+ circleCommentVo.setHaveSign(2);
+ }
+ //查询评论下评论回复
+ List<ComActNeighborCircleCommentReplyAppVO> commentReplyAppVOS = comActNeighborCircleCommentReplyDAO.getCircleCommentReplyList(circleCommentVo.getId());
+ if(!commentReplyAppVOS.isEmpty()){
+ for (ComActNeighborCircleCommentReplyAppVO commentReplyVO:commentReplyAppVOS) {
+ //查询点赞信息
+ ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf));
+ if(circleReplyFabulousDO != null && circleReplyFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
+ commentReplyVO.setHaveSign(1);
+ }else{
+ commentReplyVO.setHaveSign(2);
+ }
+ }
+ circleCommentVo.setCircleCommentReplyAppList(commentReplyAppVOS);
+ }
+ }
+ }
+ circleDetailAppVO.setCircleCommentAppList(circleCommentAppPage.getRecords());
return R.ok(circleDetailAppVO);
}
@@ -132,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());
@@ -157,12 +220,215 @@
@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());
neighborCircleDO.setRefuseReason(editVO.getRefuseReason());
this.baseMapper.updateById(neighborCircleDO);
+ return R.ok();
+ }
+
+ /**
+ * 用户查询邻里圈列表
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈列表
+ */
+ @Override
+ public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
+ IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
+ new Page<>(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO.getUserId());
+ return R.ok(neighborCircleIPage);
+ }
+
+ /**
+ * 邻里圈点赞
+ * @param fabulousAppDTO 请求参数
+ * @return 点赞结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R neighborFabulousByApp(ComActNeighborFabulousAppDTO fabulousAppDTO){
+
+ ComActNeighborCircleFabulousDO circleFabulousDO = new ComActNeighborCircleFabulousDO();
+ circleFabulousDO.setUserId(fabulousAppDTO.getUserId());
+ circleFabulousDO.setType(fabulousAppDTO.getType());
+ circleFabulousDO.setParentId(fabulousAppDTO.getServiceId());
+ //判断点赞类型
+ if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.llq)){
+ //增加邻里圈点赞数量
+ ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(fabulousAppDTO.getServiceId());
+ if(neighborCircleDO != null){
+ neighborCircleDO.setFabulousNum(neighborCircleDO.getFabulousNum() + 1);
+ neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1);
+ this.baseMapper.updateById(neighborCircleDO);
+ circleFabulousDO.setCircleId(neighborCircleDO.getId());
+ }
+ //添加邻里圈浏览记录
+ comActNeighborCircleBrowseService.addBrowseRecord(fabulousAppDTO.getServiceId(),fabulousAppDTO.getUserId());
+ }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)){
+ //增加邻里圈评论点赞数量
+ ComActNeighborCircleCommentDO circleCommentDO = comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
+ if(circleCommentDO != null){
+ circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
+ comActNeighborCircleCommentDAO.updateById(circleCommentDO);
+ circleFabulousDO.setCircleId(circleCommentDO.getCircleId());
+ }
+ }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)){
+ //增加邻里圈评论回复点赞数量
+ ComActNeighborCircleCommentReplyDO circleCommentReplyDO = comActNeighborCircleCommentReplyDAO.selectById(fabulousAppDTO.getServiceId());
+ if(circleCommentReplyDO != null){
+ circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() + 1);
+ comActNeighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
+ circleFabulousDO.setCircleId(circleCommentReplyDO.getCircleId());
+ }
+ }
+ if(comActNeighborCircleFabulousDAO.insert(circleFabulousDO) > 0){
+ return R.ok();
+ }else{
+ return R.fail("点赞失败");
+ }
+ }
+
+ /**
+ * 邻里圈转发
+ * @param forwardAppDTO 请求参数
+ * @return 转发结果
+ */
+ @Override
+ public R neighborForwardByApp(ComActNeighborForwardAppDTO forwardAppDTO){
+
+ //添加邻里圈浏览记录
+ comActNeighborCircleBrowseService.addBrowseRecord(forwardAppDTO.getCircleId(),forwardAppDTO.getUserId());
+
+ ComActNeighborCircleDO circleDO = this.baseMapper.selectById(forwardAppDTO.getCircleId());
+ if(circleDO == null){
+ return R.fail("没有找到邻里圈");
+ }
+ circleDO.setForwardNum(circleDO.getForwardNum() + 1);
+ if(this.baseMapper.updateById(circleDO) > 0){
+ return R.ok();
+ }else{
+ return R.fail("转发失败");
+ }
+ }
+
+ /**
+ * 邻里圈评论
+ * @param commentAppDTO 请求参数
+ * @return 评论结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R neighborCommentByApp(ComActNeighborCommentAppDTO commentAppDTO){
+
+ ComActNeighborCircleCommentDO circleCommentDO = new ComActNeighborCircleCommentDO();
+ //查询邻里圈更新邻里圈评论数量
+ ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(commentAppDTO.getCircleId());
+ if(neighborCircleDO == null){
+ return R.fail("没有找到邻里圈");
+ }
+ neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
+ neighborCircleDO.setReplyAt(new Date());
+ this.baseMapper.updateById(neighborCircleDO);
+
+ circleCommentDO.setCircleId(commentAppDTO.getCircleId());
+ circleCommentDO.setUserId(commentAppDTO.getUserId());
+ circleCommentDO.setUserPhone(commentAppDTO.getPhone());
+ circleCommentDO.setContent(commentAppDTO.getContent());
+ if(neighborCircleDO.getReleaseId().equals(commentAppDTO.getUserId())){
+ circleCommentDO.setIsRelease(ComActNeighborCircleCommentDO.isRelease.yes);
+ }
+
+ if(comActNeighborCircleCommentDAO.insert(circleCommentDO) > 0){
+ return R.ok();
+ }else{
+ return R.fail("评论失败");
+ }
+ }
+
+ /**
+ * 邻里圈回复
+ * @param replyAppDTO 请求参数
+ * @return 回复结果
+ */
+ @Override
+ public R neighborReplyByApp(ComActNeighborReplyAppDTO replyAppDTO){
+
+ ComActNeighborCircleCommentReplyDO circleCommentReplyDO = new ComActNeighborCircleCommentReplyDO();
+ //查询邻里圈更新邻里圈评论数量
+ ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(replyAppDTO.getCircleId());
+ if(neighborCircleDO == null){
+ return R.fail("没有找到邻里圈");
+ }
+ neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
+ neighborCircleDO.setReplyAt(new Date());
+ this.baseMapper.updateById(neighborCircleDO);
+
+ circleCommentReplyDO.setCircleId(replyAppDTO.getCircleId());
+ circleCommentReplyDO.setUserId(replyAppDTO.getUserId());
+ circleCommentReplyDO.setReplyContent(replyAppDTO.getContent());
+ if(neighborCircleDO.getReleaseId().equals(replyAppDTO.getUserId())){
+ circleCommentReplyDO.setIsRelease(1);
+ }
+
+ //判断回复类型
+ if(replyAppDTO.getType().equals(ComActNeighborReplyAppDTO.type.pl)){
+ //查询评论信息
+ ComActNeighborCircleCommentDO circleCommentDO = comActNeighborCircleCommentDAO.selectById(replyAppDTO.getServiceId());
+ if(circleCommentDO != null){
+ circleCommentReplyDO.setCommentId(replyAppDTO.getServiceId());
+ circleCommentReplyDO.setParentId(0L);
+ circleCommentReplyDO.setParentUserId(circleCommentDO.getUserId());
+ }
+ }else if(replyAppDTO.getType().equals(ComActNeighborReplyAppDTO.type.hf)){
+ //查询上级回复信息
+ ComActNeighborCircleCommentReplyDO parentCommentReplyDO = comActNeighborCircleCommentReplyDAO.selectById(replyAppDTO.getServiceId());
+ if(parentCommentReplyDO != null){
+ circleCommentReplyDO.setCommentId(parentCommentReplyDO.getCommentId());
+ circleCommentReplyDO.setParentId(parentCommentReplyDO.getId());
+ circleCommentReplyDO.setParentUserId(parentCommentReplyDO.getUserId());
+ }
+ }
+
+ if(comActNeighborCircleCommentReplyDAO.insert(circleCommentReplyDO) > 0){
+ return R.ok();
+ }else{
+ return R.fail("回复失败");
+ }
+ }
+
+ @Override
+ public R timeTaskCircleFlow(){
+ Date oldDate = DateUtils.addDay(new Date(),-3);
+ //查询所有状态正常的邻里圈
+ List<ComActNeighborCircleDO> circleDOList = this.baseMapper.selectList(
+ new QueryWrapper<ComActNeighborCircleDO>().lambda().eq(ComActNeighborCircleDO::getStatus,ComActNeighborCircleDO.status.xs));
+ if(!circleDOList.isEmpty()){
+ //遍历查询到的邻里圈，更新邻里圈内近3天的评论数,点赞数,浏览量
+ for (ComActNeighborCircleDO neighborCircleDO:circleDOList) {
+ //查询邻里圈近3天的评论数
+ int commentCount = comActNeighborCircleCommentDAO.selectCount(
+ new QueryWrapper<ComActNeighborCircleCommentDO>().lambda().eq(ComActNeighborCircleCommentDO::getCircleId,neighborCircleDO.getId()));
+ //查询邻里圈近3天的评论回复数
+ int commentReplyCount = comActNeighborCircleCommentReplyDAO.selectCount(
+ new QueryWrapper<ComActNeighborCircleCommentReplyDO>().lambda()
+ .eq(ComActNeighborCircleCommentReplyDO::getCircleId,neighborCircleDO.getId()));
+ //查询邻里圈近3天的点赞数
+ int fabulousCount = comActNeighborCircleFabulousDAO.selectCount(new QueryWrapper<ComActNeighborCircleFabulousDO>()
+ .lambda().eq(ComActNeighborCircleFabulousDO::getCircleId,neighborCircleDO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
+ //查询邻里圈近3天的浏览量
+ int browseCount = comActNeighborCircleBrowseDAO.selectCount(
+ new QueryWrapper<ComActNeighborCircleBrowseDO>().lambda().eq(ComActNeighborCircleBrowseDO::getNeighborId,neighborCircleDO.getId()));
+ //更新邻里圈信息
+ neighborCircleDO.setLastCommentNum(commentCount + commentReplyCount);
+ neighborCircleDO.setLastFabulousNum(fabulousCount);
+ neighborCircleDO.setLastViewsNum(browseCount);
+ this.baseMapper.updateById(neighborCircleDO);
+ }
+ }
+
return R.ok();
}
@@ -185,18 +451,148 @@
.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();
+ }
+
+ /**
+ * 邻里圈取消点赞
+ * @param fabulousAppDTO 请求参数
+ * @return 取消点赞结果
+ */
+ @Override
+ public R neighborFabulousCancelByApp(ComActNeighborFabulousAppDTO fabulousAppDTO){
+ ComActNeighborCircleFabulousDO circleFabulousDO = null;
+ //查询邻里圈点赞信息
+ if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.llq)){
+ //查询点赞信息
+ circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq));
+ if(circleFabulousDO == null){
+ return R.fail("未查询到点赞信息");
+ }
+ }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)){
+ circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl));
+ if(circleFabulousDO == null){
+ return R.fail("未查询到点赞信息");
+ }
+ }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)){
+ circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf));
+ if(circleFabulousDO == null){
+ return R.fail("未查询到点赞信息");
+ }
+ }
+ if(circleFabulousDO != null){
+ circleFabulousDO.setIsEffective(ComActNeighborCircleFabulousDO.isEffective.no);
+ comActNeighborCircleFabulousDAO.updateById(circleFabulousDO);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 添加邻里圈浏览记录
+ * @param addBrowseAppDTO 请求参数
+ * @return 返回参数
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R neighborAddBrowseByApp(ComActNeighborAddBrowseAppDTO addBrowseAppDTO){
+ //添加邻里圈浏览记录
+ comActNeighborCircleBrowseService.addBrowseRecord(addBrowseAppDTO.getCircleId(),addBrowseAppDTO.getUserId());
+ //更新邻里圈记录
+ ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(addBrowseAppDTO.getCircleId());
+ if(neighborCircleDO != null){
+ neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1);
+ this.baseMapper.updateById(neighborCircleDO);
+ }
+ 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;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/NeighborCircleJobHandler.java b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/NeighborCircleJobHandler.java
new file mode 100644
index 0000000..c2c05e5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/NeighborCircleJobHandler.java
@@ -0,0 +1,37 @@
+package com.panzhihua.timejob.jobhandler;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @auther lyq
+ * @create 2021-04-28 09:21:45
+ * @describe 邻里圈相关
+ */
+@Slf4j
+@Component
+public class NeighborCircleJobHandler {
+
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
+ * @return 刷新个数
+ * @throws Exception 出现的异常
+ */
+ @XxlJob("timedtaskNeighborCircleCommentJobHandler")
+ public ReturnT<String> timedtaskpartybuildingstatusJobHandler(String param) throws Exception {
+ log.info("定时任务更新邻里圈近3天评论数/点赞数/浏览量");
+ R r=communityService.timedTaskNeighborCircleRecord();
+ log.info("执行结果【{}】",r.toString());
+ return ReturnT.SUCCESS;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
index f3bdfcf..01aa7ee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -79,8 +79,9 @@
boolean wxPay = requestURI.contains("wxNotify");
boolean wxCgi = requestURI.contains("cgi");
boolean isShop = requestURI.contains("isShop");
+ boolean listadvertisement = requestURI.contains("listadvertisement");
SafeboxRequestWrapper safeboxRequestWrapper = new SafeboxRequestWrapper(request);
- if (login||doc||css||js||ui||swagger||ico||docs||error||refreshToken||useragreement||wxPay||wxCgi||isShop) {
+ if (login||doc||css||js||ui||swagger||ico||docs||error||refreshToken||useragreement||wxPay||wxCgi||isShop||listadvertisement) {
//什么也不做
} else {
// 获取请求头中JWT的Token
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java
index be5ad6b..0d13070 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java
@@ -80,7 +80,8 @@
boolean isShop = !requestUrl.contains("isShop");
boolean refreshToken = !requestUrl.contains("refreshToken");
boolean useragreement = !requestUrl.contains("useragreement");
- if (contains&&docs&&login&&refreshToken&&useragreement&&wxNotify&&wxCgi&&isShop) {
+ boolean listadvertisement = !requestUrl.contains("listadvertisement");
+ if (contains&&docs&&login&&refreshToken&&useragreement&&wxNotify&&wxCgi&&isShop&&listadvertisement) {
configAttributes.add(new SecurityConfig(SecurityConstants.ROLE_APPLETS));
}
return configAttributes;
--
Gitblit v1.7.1