From 6cee6c4b10cb4bc97f8fb514bb1f55b66d1a84fa Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 03 九月 2021 09:47:59 +0800
Subject: [PATCH] Merge branch 'zzj' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java | 40 +
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/dtos/neighbor/AddNeighborCircleTopicAppDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysConfMapper.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishOperationRecordMapper.xml | 34 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishFeedbackMapper.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 169 ++--
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 69 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java | 38 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 57 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java | 77 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 108 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/SysConfServiceImpl.java | 56 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DeleteNeighborCircleAppDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 272 +++++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java | 11
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishOperationRecordServiceImpl.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishFeedbackMapper.xml | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/SysConfApi.java | 35 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/SysConfService.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java | 7
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborApi.java | 35 +
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 | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishOperationRecordMapper.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/NeighborCircleConstants.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishFeedbackDO.java | 62 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 237 ++++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml | 127 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActMicroWishOperationRecordApi.java | 34 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 54 -
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishUserDAO.java | 9
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishFeedbackVO.java | 37 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishOperationRecordService.java | 19
44 files changed, 1,616 insertions(+), 345 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 4a37f51..6794e09 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,5 +1,7 @@
package com.panzhihua.applets.api;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.NeighborCircleConstants;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +34,8 @@
@Resource
private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
@ApiOperation(value = "分页查询邻里圈列表", response = ComActNeighborCircleAppVO.class)
@PostMapping("pageApp")
@@ -49,16 +53,43 @@
public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
LoginUserInfoVO loginUser = this.getLoginUserInfo();
Long userId = loginUser.getUserId();
- if (userId == null) {
+ Long communityId = loginUser.getCommunityId();
+ if(userId == null){
return R.fail("请重新登录");
}
addNeighborCircleAppDTO.setUserId(userId);
if (StringUtils.isNotEmpty(loginUser.getPhone())) {
addNeighborCircleAppDTO.setPhone(this.getLoginUserInfo().getPhone());
}
- if (loginUser.getCommunityId() != null) {
- addNeighborCircleAppDTO.setCommunityId(loginUser.getCommunityId());
+ if(communityId != null){
+ addNeighborCircleAppDTO.setCommunityId(communityId);
}
+
+ //查询社区自动审核是否开着
+ String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
+ R isOk = communityService.getSysConfValue(key + communityId,communityId);
+ if(R.isOk(isOk)){
+ if(isOk.getData() != null){
+ String value = isOk.getData().toString();
+ if(value.equals("1")){
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ String msg = addNeighborCircleAppDTO.getReleaseContent();
+ if (checkService.checkMessage(msg)) {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }else{
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
+ }
+ }else{
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }
+ }else{
+ communityService.addSysConfValue(key + communityId,communityId,"社区邻里圈自动审核参数","2");
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }
+ }else{
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }
+
return communityService.addNeighborByApp(addNeighborCircleAppDTO);
}
@@ -175,11 +206,39 @@
@ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
@GetMapping("topic/list")
- public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId) {
+ public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam(value = "isZero",defaultValue = "2",required = false) Integer isZero) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
communityId = loginUserInfo.getCommunityId();
}
- return communityService.getNeighborTopicByApp(communityId);
+ if(isZero == null){
+ isZero = 2;
+ }
+ return communityService.getNeighborTopicByApp(communityId,isZero);
+ }
+
+ @ApiOperation(value = "用户新增邻里圈话题")
+ @PostMapping("topic/add")
+ public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo == null){
+ return R.fail(401,"请先登录");
+ }
+ circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
+ circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.addNeighborTopicByApp(circleTopicAppDTO);
+ }
+
+ @ApiOperation(value = "用户删除邻里圈")
+ @PostMapping("delete")
+ public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo == null){
+ return R.fail(401,"请先登录");
+ }
+ circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
+ circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.deleteNeighborByApp(circleTopicAppDTO);
}
}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/NeighborCircleConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/NeighborCircleConstants.java
new file mode 100644
index 0000000..ac6aa96
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/NeighborCircleConstants.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.constants;
+
+/**
+ * 邻里圈常量类
+ */
+public class NeighborCircleConstants {
+
+ /**
+ * 浏览变动热度值
+ */
+ public static final Long VIEW_HOT_NUM = 1L;
+ /**
+ * 点赞变动热度值
+ */
+ public static final Long FABULOUS_HOT_NUM = 2L;
+ /**
+ * 评论变动热度值
+ */
+ public static final Long COMMENT_HOT_NUM = 3L;
+
+ /**
+ * 邻里圈自动审核状态KEY(value：1.自动审核 2.需要社区审核)
+ */
+ public static final String NEIGHBOR_CIRCLE_AUTO_EXAMINE = "NEIGHBOR_CIRCLE_AUTO_EXAMINE_";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
index a1306b5..d00a267 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
@@ -30,4 +30,18 @@
@ApiModelProperty(value = "社区id", hidden = true)
private Long communityId;
+
+ @ApiModelProperty(value = "是否需要审核(1.是 2.否)",hidden = true)
+ private Integer isExamine;
+
+ @ApiModelProperty(value = "微信审核结果(1.通过 2.拒绝)",hidden = true)
+ private Integer wxExamineResult;
+
+ /**
+ * 是否需要审核(1.是 2.否)
+ */
+ public interface isExamine{
+ int yes = 1;
+ int no = 2;
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java
new file mode 100644
index 0000000..866e807
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java
@@ -0,0 +1,24 @@
+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 AddNeighborCircleTopicAppDTO {
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("邻里圈话题名称")
+ private String name;
+}
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 7e4822b..199b98f 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
@@ -42,4 +42,7 @@
@ApiModelProperty("话题名称")
private String topicName;
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
}
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 bef2729..ac1168f 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
@@ -31,4 +31,7 @@
@ApiModelProperty(value = "用户id", hidden = true)
private Long userId;
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DeleteNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DeleteNeighborCircleAppDTO.java
new file mode 100644
index 0000000..ca86ff8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DeleteNeighborCircleAppDTO.java
@@ -0,0 +1,24 @@
+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 DeleteNeighborCircleAppDTO {
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("邻里圈id")
+ private Long id;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishFeedbackVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishFeedbackVO.java
new file mode 100644
index 0000000..fed556a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishFeedbackVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+public class ComActMicroWishFeedbackVO {
+ /**
+ * 反馈内容
+ */
+ @ApiModelProperty("反馈内容")
+ private String content;
+
+ /**
+ * 反馈图片
+ */
+ @ApiModelProperty("反馈图片")
+ private String imgUrl;
+
+ /**
+ * 反馈时间
+ */
+ @ApiModelProperty("反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 反馈人
+ */
+ @ApiModelProperty("反馈人")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java
new file mode 100644
index 0000000..0775409
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel
+public class ComActMicroWishOperationRecordVO {
+ /**
+ * 操作内容
+ */
+ @ApiModelProperty("操作内容")
+ private String content;
+
+ /**
+ * 人员姓名
+ */
+ @ApiModelProperty("人员姓名")
+ private String name;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("记录时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ /**
+ * 操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成
+ */
+ @ApiModelProperty("操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成")
+ private Integer type;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
index 2add8d6..3e413dd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -1,15 +1,16 @@
package com.panzhihua.common.model.vos.community;
-import java.util.Date;
-
-import javax.validation.constraints.NotBlank;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -40,10 +41,10 @@
private String imageUrl;
@ApiModelProperty("微心愿名称")
- @NotBlank(groups = {AddGroup.class}, message = "微心愿名称不能为空")
+// @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空")
private String wishName;
- @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成")
+ @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中")
private Integer status;
@ApiModelProperty("集星数")
@@ -78,15 +79,19 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date distributionAt;
+ @ApiModelProperty("完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date finishAt;
+
@ApiModelProperty("评分")
private Integer score;
@ApiModelProperty("详情")
- @NotBlank(groups = {AddGroup.class}, message = "详情不能为空")
+ @NotBlank(groups = {AddGroup.class},message = "详情不能为空")
private String detail;
@ApiModelProperty("图片路径列表，逗号分隔")
- // @NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
+ //@NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
private String photoPathList;
@ApiModelProperty("当前页数")
@@ -95,7 +100,7 @@
@ApiModelProperty("每页记录数")
private Long pageSize;
- @ApiModelProperty(value = "社区id", hidden = true)
+ @ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
@ApiModelProperty("用户评价")
@@ -105,7 +110,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date evaluateAt;
- @ApiModelProperty("反馈时间")
+ @ApiModelProperty("集心完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date feedbackAt;
@@ -124,22 +129,40 @@
@ApiModelProperty("反馈图片集合，逗号分隔")
private String feedbackPhotoPathList;
- @ApiModelProperty(value = "操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈", example = "1")
+ @ApiModelProperty(value = "操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈",example = "1")
private Integer type;
- @ApiModelProperty(value = "小程序请求 1 是 0 不是", hidden = true)
+ @ApiModelProperty(value = "小程序请求 1 是 0 不是",hidden = true)
private Integer isApplets;
- @ApiModelProperty(value = "是否点赞 1 是 0 不是", example = "1")
+ @ApiModelProperty(value = "是否点赞 1 是 0 不是",example = "1")
private Integer haveGiveThumbsUp = 0;
- @ApiModelProperty(value = "登录用户", hidden = true)
+ @ApiModelProperty(value = "登录用户",hidden = true)
private Long userId;
- @ApiModelProperty(value = "社区后台登录用户", hidden = true)
+ @ApiModelProperty(value = "社区后台登录用户",hidden = true)
private Long backUserId;
- @ApiModelProperty(value = "是否是分页查询微心愿接口调用", hidden = true)
+ @ApiModelProperty(value = "是否是分页查询微心愿接口调用",hidden = true)
private Integer isPageMyWish;
+ @ApiModelProperty(value = "预约社区集心数")
+ private Integer aimNum;
+
+ @ApiModelProperty(value = "反馈列表")
+ private List<ComActMicroWishFeedbackVO> feedbackVOList;
+
+ @ApiModelProperty(value = "操作记录 只有审核和驳回得纪录 其他从当前数据提取")
+ private List<ComActMicroWishOperationRecordVO> operationRecordVOList;
+
+ @ApiModelProperty(value = "下一个id数组")
+ private List<Long> idList;
+
+ @ApiModelProperty(value = "单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty(value = "单张图片高度")
+ private BigDecimal imgHeight;
}
+
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 dc6625e..6c7e0cb 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
@@ -107,4 +107,7 @@
@ApiModelProperty("话题id")
private String topicId;
+
+ @ApiModelProperty("热度")
+ private Long hotNum;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java
index ab8cacd..683a1e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java
@@ -18,4 +18,10 @@
@ApiModelProperty("话题名字")
private String name;
+ @ApiModelProperty("热度")
+ private Long hotNum;
+
+ @ApiModelProperty("邻里圈数量")
+ private Integer count;
+
}
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 721600b..17fef53 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
@@ -3,6 +3,7 @@
import java.util.List;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.community.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
@@ -62,20 +63,6 @@
import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
-import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO;
-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.ComActNeighborCircleTopicAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
@@ -1693,7 +1680,7 @@
*/
@PostMapping("/convenient/serve/import")
R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,
- @RequestParam(value = "communityId", required = false) Long communityId);
+ @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 导出房屋信息
@@ -1809,7 +1796,7 @@
*/
@PostMapping("/common/data/company/import")
R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,
- @RequestParam("communityId") Long communityId);
+ @RequestParam("communityId") Long communityId);
/**
* 实有单位导出
@@ -1864,7 +1851,7 @@
*/
@PostMapping("/common/data/assets/import")
R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,
- @RequestParam("communityId") Long communityId);
+ @RequestParam("communityId") Long communityId);
/**
* 实有单位导出
@@ -2012,7 +1999,7 @@
*/
@PostMapping("/village/import")
R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list,
- @RequestParam(value = "communityId") Long communityId);
+ @RequestParam(value = "communityId") Long communityId);
/**
* 批量导入实有人口
@@ -2025,7 +2012,7 @@
*/
@PostMapping("/common/data/population/import")
R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入吸毒人员
@@ -2038,7 +2025,7 @@
*/
@PostMapping("/common/data/population/importDrug")
R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入社区矫正人员
@@ -2051,7 +2038,7 @@
*/
@PostMapping("/common/data/population/importCorrect")
R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入重精人员
@@ -2064,7 +2051,7 @@
*/
@PostMapping("/common/data/population/importMajor")
R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入邪教人员
@@ -2077,7 +2064,7 @@
*/
@PostMapping("/common/data/population/importCult")
R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入刑释人员
@@ -2090,7 +2077,7 @@
*/
@PostMapping("/common/data/population/importRehabilitation")
R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入重点上访人员
@@ -2103,7 +2090,7 @@
*/
@PostMapping("/common/data/population/importKey")
R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入服刑人员
@@ -2116,7 +2103,7 @@
*/
@PostMapping("/common/data/population/importSentence")
R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入退役军人
@@ -2129,7 +2116,7 @@
*/
@PostMapping("/common/data/population/importVeterans")
R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入残疾人
@@ -2142,7 +2129,7 @@
*/
@PostMapping("/common/data/population/importDisability")
R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入低保户
@@ -2155,7 +2142,7 @@
*/
@PostMapping("/common/data/population/importLowSecurity")
R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 确认导入实有人口（有则更新，无则新建）
@@ -2168,7 +2155,7 @@
*/
@PostMapping("/common/data/population/import/confirm")
R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list,
- @RequestParam(value = "communityId") Long communityId);
+ @RequestParam(value = "communityId") Long communityId);
/**
* 分页查询实有人口
@@ -2328,7 +2315,7 @@
/**
* 小程序-问卷调查详情
- *
+ *
* @param userId
* 用户id
* @param questId
@@ -2340,7 +2327,7 @@
/**
* 小程序-新增问卷调查浏览数量
- *
+ *
* @param questId
* 问卷调查id
* @return 增加结果
@@ -2350,7 +2337,7 @@
/**
* 小程序-用户弹窗添加不在提醒接口
- *
+ *
* @param questId
* 问卷id
* @param userId
@@ -2362,7 +2349,7 @@
/**
* 社区后台-查询问卷调查详情
- *
+ *
* @param questId
* 问卷id
* @return 问卷调查详情
@@ -2886,7 +2873,7 @@
*/
@PostMapping("/common/data/population/edit")
R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,
- @RequestParam("communityId") Long communityId);
+ @RequestParam("communityId") Long communityId);
/**
* 微心愿删除
@@ -3577,7 +3564,7 @@
*/
@PostMapping("/eldersauthelderly/batchSave")
R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,
- @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);
+ @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);
/**
* 批量保存楼栋
@@ -3588,7 +3575,7 @@
*/
@PostMapping("/building/batchSave")
R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,
- @RequestParam("communityId") Long communityId);
+ @RequestParam("communityId") Long communityId);
/**
* 插入字典
@@ -3768,7 +3755,7 @@
*/
@PostMapping("/bigscreen/party/ageGender")
R<BigScreenStatisticAgeGender>
- ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
+ ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
/**
* 党建数据概览
@@ -3793,7 +3780,7 @@
*/
@PostMapping("/bigscreen/party/bigscreenPartyactivity")
R<List<BigScreenStatisticPartyActivity>>
- bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+ bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
/**
* 首页大屏统计接口
@@ -4312,7 +4299,7 @@
/**
* 查询用户交易记录总额
- *
+ *
* @param pageTradeAdminDTO
* 请求参数
* @return 交易记录总额
@@ -4322,7 +4309,7 @@
/**
* 查询用户导出数据
- *
+ *
* @param pageTradeAdminDTO
* 请求参数
* @return 用户导出数据
@@ -4332,7 +4319,7 @@
/**
* 导出奖励台账数据
- *
+ *
* @param pageTradeAdminDTO
* 请求参数
* @return 奖励台账数据
@@ -4342,7 +4329,7 @@
/**
* 查询社区统计数据
- *
+ *
* @param pageTradeAdminDTO
* 查询社区统计数据
* @return 社区统计数据
@@ -4352,7 +4339,7 @@
/**
* 社区随手拍列表统计
- *
+ *
* @param communityId
* 社区id
* @return 统计结果
@@ -4398,7 +4385,7 @@
* @return 邻里圈话题列表
*/
@GetMapping("/neighbor/getNeighborTopicByApp")
- R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);
+ R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero);
/**
* 综治后台-查询社区列表
@@ -4549,7 +4536,7 @@
*/
@GetMapping("/patrolRecord/safetyWorkRecord/detail")
R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId,
- @RequestParam(value = "communityId", required = false) Long communityId);
+ @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 根据巡查记录id查询安全工作记录详情
@@ -4560,7 +4547,7 @@
*/
@GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId,
- @RequestParam(value = "communityId", required = false) Long communityId);
+ @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 分页查询隐患报告
@@ -4631,7 +4618,7 @@
/**
* 小程序-查询积分说明
- *
+ *
* @return 积分说明
*/
@GetMapping("/integral/explain/applets")
@@ -4639,7 +4626,7 @@
/**
* 小程序-用户查询当前社区可领取积分规则列表
- *
+ *
* @param userId
* 用户id
* @param communityId
@@ -4651,7 +4638,7 @@
/**
* 小程序-查询用户积分列表
- *
+ *
* @param userId
* 用户id
* @return 用户积分列表
@@ -4661,7 +4648,7 @@
/**
* 小程序-查询社区积分账户排行榜
- *
+ *
* @param communityRankDTO
* 请求参数
* @return 社区积分账户排行榜
@@ -4671,7 +4658,7 @@
/**
* 小程序-查询用户社区积分明细
- *
+ *
* @param communityTradeDTO
* 请求参数
* @return 用户社区积分明细
@@ -4681,7 +4668,7 @@
/**
* 社区后台-根据社区id查询社区下积分规则列表
- *
+ *
* @param integralRuleDTO
* 请求参数
* @return 社区下积分规则列表
@@ -4691,7 +4678,7 @@
/**
* 社区后台-编辑社区积分规则
- *
+ *
* @param integralRuleDTO
* 请求参数
* @return 编辑结果
@@ -4701,7 +4688,7 @@
/**
* 社区后台-分页查询社区下积分明细记录
- *
+ *
* @param integralRuleDTO
* 请求参数
* @return 社区下积分明细记录
@@ -4711,7 +4698,7 @@
/**
* 给用户添加积分
- *
+ *
* @param integralUserDTO
* 请求参数
* @return 添加积分结果
@@ -4721,7 +4708,7 @@
/**
* 根据社区活动id查询社区活动报名人员列表
- *
+ *
* @param activityId
* 活动id
* @return 社区活动报名人员列表
@@ -4741,7 +4728,7 @@
/**
* 根据id查询值班表
- *
+ *
* @param rotaId
* 值班表id
* @return 值班表详情
@@ -4761,7 +4748,7 @@
/**
* 批量删除值班表
- *
+ *
* @param rotaIds
* 值班ids
* @return 删除结果
@@ -4808,7 +4795,7 @@
/**
* 查询社区所有列表
- *
+ *
* @return 社区列表
*/
@GetMapping("/switch/community/all/list")
@@ -4816,7 +4803,7 @@
/**
* 根据名字查询所有社区列表
- *
+ *
* @param name
* 社区名字
* @return 社区列表
@@ -4826,7 +4813,7 @@
/**
* 根据经纬度以及距离搜索附近社区列表
- *
+ *
* @param communityDTO
* 请求参数
* @return 社区列表
@@ -4836,7 +4823,7 @@
/**
* 问卷调查统计汇总
- *
+ *
* @param summaryDTO
* 请求参数
* @return 统计汇总
@@ -4846,7 +4833,7 @@
/**
* 问卷调查统计汇总导出数据查询
- *
+ *
* @param questId
* 调查问卷id
* @return 调查统计汇总导出数据
@@ -4856,7 +4843,7 @@
/**
* 问卷调查统计汇总表头统计
- *
+ *
* @param questId
* 调查问卷id
* @return 问卷调查统计汇总表头统计数据
@@ -4866,7 +4853,7 @@
/**
* 运营后台-新增随手拍分类
- *
+ *
* @param addPhotoClassify
* 请求参数
* @return 新增结果
@@ -4876,7 +4863,7 @@
/**
* 运营后台-编辑随手拍分类
- *
+ *
* @param addPhotoClassify
* 请求参数
* @return 编辑结果
@@ -4886,7 +4873,7 @@
/**
* 运营后台-分页查询随手拍分类
- *
+ *
* @param addPhotoClassify
* 请求参数
* @return 随手拍分类列表
@@ -4896,7 +4883,7 @@
/**
* 运营后台-随手拍分类详情
- *
+ *
* @param id
* 随手拍分类id
* @return 随手拍分类
@@ -4906,7 +4893,7 @@
/**
* 运营后台-随手拍分类删除
- *
+ *
* @param id
* 随手拍分类id
* @return 删除结果
@@ -4916,7 +4903,7 @@
/**
* 运营后台-查询随手拍分类列表
- *
+ *
* @return 随手拍分类列表
*/
@GetMapping("/classify/admin/list")
@@ -4924,7 +4911,7 @@
/**
* 社区后台-切换随手拍公示状态
- *
+ *
* @param comActEasyPhotoVO
* 请求参数
* @return 切换结果
@@ -4934,7 +4921,7 @@
/**
* 查询社区待处理随手拍id集合
- *
+ *
* @param communityId
* 社区id
* @return 社区待处理随手拍id集合
@@ -5192,4 +5179,40 @@
*/
@PostMapping("/activity/default-praise")
R timedTaskActivityDefaultPraise();
+
+ /**
+ * 小程序-用户新增话题
+ * @param circleTopicAppDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/neighbor/addNeighborTopicByApp")
+ R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO);
+
+ /**
+ * 小程序-删除邻里圈
+ * @param circleTopicAppDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/neighbor/circleTopicAppDTO")
+ R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);
+
+ /**
+ * 获取系统配置value
+ * @param key 系统配置code
+ * @param communityId 社区id
+ * @return 系统配置value
+ */
+ @GetMapping("/sys/conf/getSysConfValue")
+ R getSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增系统配置
+ * @param key 系统配置code
+ * @param communityId 社区id
+ * @param name 系统配置名称
+ * @param value 系统配置value
+ * @return 新增结果
+ */
+ @GetMapping("/sys/conf/addSysConfValue")
+ R addSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId,@RequestParam("name") String name,@RequestParam("value") String value);
}
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
index 60842af..ca4cab7 100644
--- 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
@@ -5,6 +5,7 @@
import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.NeighborCircleConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -176,4 +177,38 @@
return communityService.editNeighborTopicByAdmin(addCircleTopicAdminDTO);
}
+ @ApiOperation(value = "获取社区审核状态")
+ @GetMapping("getCircleExamineStatus")
+ public R getCircleExamineStatus(){
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ if(loginUserInfo == null){
+ return R.fail("请先登录");
+ }
+ Long communityId = loginUserInfo.getCommunityId();
+ //查询社区自动审核是否开着
+ String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
+ R isOk = communityService.getSysConfValue(key + communityId,communityId);
+ if(R.isOk(isOk)){
+ if(isOk.getData() != null){
+ return isOk;
+ }else{
+ communityService.addSysConfValue(key + communityId,communityId,"社区邻里圈自动审核参数","2");
+ isOk.setData("2");
+ return isOk;
+ }
+ }
+ return R.ok();
+ }
+
+ @ApiOperation(value = "编辑社区审核状态")
+ @GetMapping("editCircleExamineStatus")
+ public R editCircleExamineStatus(@RequestParam("status") Integer status){
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ if(loginUserInfo == null){
+ return R.fail("请先登录");
+ }
+ Long communityId = loginUserInfo.getCommunityId();
+ return communityService.editSysConfValue(communityId,status);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActMicroWishOperationRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActMicroWishOperationRecordApi.java
new file mode 100644
index 0000000..7c23991
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActMicroWishOperationRecordApi.java
@@ -0,0 +1,34 @@
+package com.panzhihua.service_community.api;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService;
+import com.panzhihua.service_community.service.ComActMicroWishService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @auther lyq
+ * @create 2021-08-27 10:28:04
+ * @describe 前端控制器
+ */
+@RestController
+@RequestMapping("/comActMicroWishOperationRecord")
+public class ComActMicroWishOperationRecordApi {
+ @Resource
+ private ComActMicroWishOperationRecordService comActMicroWishOperationRecordService;
+
+ /**
+ * 根据心愿id查询操作记录
+ * @param id
+ * @return
+ */
+ @GetMapping("/getByWishId")
+ public R getByWishId(@RequestParam("id") Long id){
+ return comActMicroWishOperationRecordService.getByWishId(id);
+ }
+}
+
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 ce8de0a..7d14775 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
@@ -340,8 +340,28 @@
* @return 邻里圈话题列表
*/
@GetMapping("getNeighborTopicByApp")
- public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId) {
- return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId);
+ public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero) {
+ return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId,isZero);
+ }
+
+ /**
+ * 小程序-用户新增话题
+ * @param circleTopicAppDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("addNeighborTopicByApp")
+ public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO){
+ return comActNeighborCircleTopicService.addNeighborTopicByApp(circleTopicAppDTO);
+ }
+
+ /**
+ * 小程序-删除邻里圈
+ * @param circleTopicAppDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("deleteNeighborByApp")
+ public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO){
+ return comActNeighborCircleService.deleteNeighborByApp(circleTopicAppDTO);
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/SysConfApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/SysConfApi.java
index 59ab1e9..6cbe36b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/SysConfApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/SysConfApi.java
@@ -33,4 +33,39 @@
}
return R.ok(value);
}
+
+ /**
+ * 根据系统code以及社区id查询配置表value值
+ *
+ * @param key 系统code
+ * @param communityId 社区id
+ * @return 系统配置value值
+ */
+ @GetMapping("getSysConfValue")
+ public R getSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId) {
+ return sysConfService.getSysConfValue(key,communityId);
+ }
+
+ /**
+ * 新增系统code配置数据
+ *
+ * @param key 系统code
+ * @param communityId 社区id
+ * @return 新增结果
+ */
+ @GetMapping("addSysConfValue")
+ public R addSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId,@RequestParam("name") String name,@RequestParam("value") String value) {
+ return sysConfService.addSysConfValue(key,communityId,name,value);
+ }
+
+ /**
+ * 编辑系统配置
+ * @param communityId 社区id
+ * @param status 配置值
+ * @return 编辑结果
+ */
+ @GetMapping("editSysConfValue")
+ public R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status) {
+ return sysConfService.editSysConfValue(communityId,status);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index 3d648c0..bd1ec69 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -1,13 +1,5 @@
package com.panzhihua.service_community.dao;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +8,13 @@
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+import java.util.Map;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -26,88 +25,199 @@
@Mapper
public interface ComActMicroWishDAO extends BaseMapper<ComActMicroWishDO> {
- @Select("<script> " + "SELECT " + "w.id, " + "u.name sponsor_name, " + "u.nick_name userNickName, "
- + "u.image_url , " + "w.sponsor_phone, " + "w.wish_name, " + "w.`status`, " + "w.`feedback_at`, "
- + "w.`examine_at`, " + "w.`distribution_at`, " + "w.`evaluate_at`, " + "w.`photo_path_list`, "
- + "count(wu.id)star_num, " + "w.`detail`, " + "w.form, " + "w.reject_reason, " + "su.`name` responsible_name, "
- + "w.score, " + "w.create_at " + "FROM " + "com_act_micro_wish w "
- + "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "
- + "JOIN sys_user u ON w.sponsor_id = u.user_id "
- + "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>"
- + "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " + " </if> "
- + "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>"
- + "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " + " </if> "
- + "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>"
- + " JOIN com_pb_service_team su ON w.responsible_id = su.id "
- + "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') " + " </if> " + " <where>"
- + "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>"
- + " and w.community_id=#{comActMicroWishVO.communityId} " + " </if> "
- + "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>"
- + "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%') " + " </if> "
- + "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.status!=3 and comActMicroWishVO.isPageMyWish==null'>"
- + "AND w.`status` = #{comActMicroWishVO.status} " + " </if> "
- + "<if test='comActMicroWishVO.status == 3 and comActMicroWishVO.isPageMyWish==null'>" + "AND w.`status` = 3 "
- + " </if> "
- + "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>"
- + "AND w.`status` =1 " + " </if> "
- + "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status==3 and comActMicroWishVO.isPageMyWish!=null '>"
- + "AND w.`status` in (2, 3) " + " </if> " + "<if test='comActMicroWishVO.createBegin != null '>"
- + "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} " + "AND #{comActMicroWishVO.createEnd}"
- + " </if> " + "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>"
- + "AND w.status in (3, 5, 6) " + " </if> "
- + "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>"
- + "AND w.sponsor_id =#{comActMicroWishVO.userId} " + " </if> "
- + "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==3 '>"
- + "AND w.responsible_id =#{comActMicroWishVO.backUserId} " + " </if> "
- + "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==0 '>"
- + "and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id =#{comActMicroWishVO.backUserId})) "
- + " </if> " + " </where>" + " group by w.id " + "ORDER BY w.create_at desc " + "</script>")
+ @Select("<script> " +
+ "SELECT " +
+ "w.id, " +
+ "u.name sponsor_name, " +
+ "u.nick_name userNickName, " +
+ "u.image_url , " +
+ "w.sponsor_phone, " +
+ "w.wish_name, " +
+ "w.`status`, " +
+ "w.`feedback_at`, " +
+ "w.`examine_at`, " +
+ "w.`distribution_at`, " +
+ "w.`evaluate_at`, " +
+ "w.`photo_path_list`, " +
+ "count(wu.id)star_num, " +
+ "w.`detail`, " +
+ "w.form, " +
+ "w.reject_reason, " +
+ "su.`name` responsible_name, " +
+ "w.score, " +
+ "w.img_width, " +
+ "w.finish_at, " +
+ "w.aim_num, " +
+ "w.img_height, " +
+ "w.create_at " +
+ "FROM " +
+ "com_act_micro_wish w " +
+ "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
+ "JOIN sys_user u ON w.sponsor_id = u.user_id " +
+ "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
+ "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " +
+ " </if> " +
+ "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" +
+ "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " +
+ " </if> " +
+ "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" +
+ " JOIN com_pb_service_team su ON w.responsible_id = su.id " +
+ "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') " +
+ " </if> " +
+ " <where>" +
+ "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
+ " and w.community_id=#{comActMicroWishVO.communityId} " +
+ " </if> " +
+ "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>" +
+ "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%') " +
+ " </if> " +
+ "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.status!=3 and comActMicroWishVO.isPageMyWish==null'>" +
+ "AND w.`status` = #{comActMicroWishVO.status} " +
+ " </if> " +
+ "<if test='comActMicroWishVO.status == 3 and comActMicroWishVO.isPageMyWish==null'>" +
+ "AND w.`status` = 3 " +
+ " </if> " +
+ "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
+ "AND w.`status` =1 " +
+ " </if> " +
+ "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status==3 and comActMicroWishVO.isPageMyWish!=null '>" +
+ "AND w.`status` in (2, 3) " +
+ " </if> " +
+ "<if test='comActMicroWishVO.createBegin != null '>" +
+ "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} " +
+ "AND #{comActMicroWishVO.createEnd}" +
+ " </if> " +
+ "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0 and comActMicroWishVO.status != null and comActMicroWishVO.status != 7'>" +
+ "AND w.status in (3, 5, 6) " +
+ " </if> " +
+ "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
+ "AND w.sponsor_id =#{comActMicroWishVO.userId} " +
+ " </if> " +
+ "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==3 '>" +
+ "AND w.responsible_id =#{comActMicroWishVO.backUserId} " +
+ " </if> " +
+ "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==0 '>" +
+ "and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id =#{comActMicroWishVO.backUserId})) " +
+ " </if> " +
+ " </where>" +
+ " group by w.id "+
+ "ORDER BY w.create_at desc "+
+ "</script>")
IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
-
- @Select("SELECT " + "w.id, " + "u.name sponsor_name, " + "u.nick_name userNickName, " + "w.create_at, "
- + "u.image_url, " + "w.sponsor_phone, " + "w.`status`, " + "w.`sponsor_id`, " + "w.wish_name, "
- + "count(wu.id)starNum, " + "w.detail, " + "w.photo_path_list, " + "su.`name` responsible_name, " + "w.form, "
- + "w.reject_reason, " + "w.examine_at, " + "w.finish, " + "w.finish_photo_path_list, " + "w.finish_at, "
- + "w.score, " + "w.feedback, " + "w.feedback_at, " + "w.feedback_photo_path_list, " + "w.distribution_at, "
- + "w.evaluate_at, " + "w.evaluate " + "FROM " + "com_act_micro_wish w "
- + "JOIN sys_user u ON w.sponsor_id = u.user_id "
- + "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id "
- + "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id " + "WHERE " + "w.id =#{id}"
- + " group by w.id " + "order by w.create_at desc")
+ @Select("SELECT " +
+ "w.id, " +
+ "u.name sponsor_name, " +
+ "u.nick_name userNickName, " +
+ "w.create_at, " +
+ "w.aim_num, " +
+ "u.image_url, " +
+ "w.sponsor_phone, " +
+ "w.`status`, " +
+ "w.`sponsor_id`, " +
+ "w.wish_name, " +
+ "count(wu.id)starNum, " +
+ "w.detail, " +
+ "w.photo_path_list, " +
+ "su.`name` responsible_name, " +
+ "w.form, " +
+ "w.reject_reason, " +
+ "w.examine_at, " +
+ "w.finish, " +
+ "w.finish_photo_path_list, " +
+ "w.finish_at, " +
+ "w.score, " +
+ "w.feedback, " +
+ "w.feedback_at, " +
+ "w.feedback_photo_path_list, " +
+ "w.distribution_at, " +
+ "w.evaluate_at, " +
+ "w.img_width, " +
+ "w.img_height, " +
+ "w.evaluate " +
+ "FROM " +
+ "com_act_micro_wish w " +
+ "JOIN sys_user u ON w.sponsor_id = u.user_id " +
+ "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " +
+ "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id " +
+ "WHERE " +
+ "w.id =#{id}"+
+ " group by w.id " +
+ "order by w.create_at desc"
+ )
ComActMicroWishVO detailMicroWish(Long id);
-
- @Select("SELECT " + "'2' type " + "FROM " + "com_act_micro_wish w " + "WHERE "
- + "w.community_id = #{communityId} " + "AND w.`status` = 1 " + " " + "union all " + " " + "SELECT "
- + "'2' type " + "FROM " + " com_act_micro_wish w " + "WHERE " + " w.community_id = #{communityId} "
- + " AND w.`status` = 3 " + " AND w.form = 1 " + " AND w.responsible_id = #{userId} " + "GROUP BY "
- + " w.community_id ")
+ @Select("SELECT " +
+ "'2' type " +
+ "FROM " +
+ "com_act_micro_wish w " +
+ "WHERE " +
+ "w.community_id = #{communityId} " +
+ "AND w.`status` = 1 " +
+ " " +
+ "union all " +
+ " " +
+ "SELECT " +
+ "'2' type " +
+ "FROM " +
+ " com_act_micro_wish w " +
+ "WHERE " +
+ " w.community_id = #{communityId} " +
+ " AND w.`status` = 3 " +
+ " AND w.form = 1 " +
+ " AND w.responsible_id = #{userId} " +
+ "GROUP BY " +
+ " w.community_id ")
List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
@Update("update com_act_micro_wish set `status`=6, evaluate_at=now() where `status`=5 and TIMESTAMPDIFF(HOUR, feedback_at, SYSDATE())>=72")
int updateStatusAutoConfirm();
- @Select("SELECT COUNT(id) AS completedNum,"
- + "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5)) AS willNum ,"
- + "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum "
- + "FROM com_act_micro_wish WHERE community_id = #{communityId} AND status = 6 ")
- Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);
+ @Select("SELECT COUNT(id) AS completedNum," +
+ "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5)) AS willNum ," +
+ "(SELECT COUNT(id) FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) AND create_at LIKE CONCAT(#{nowDate},'%')) AS currentNum " +
+ "FROM com_act_micro_wish WHERE community_id = #{communityId} AND status = 6 ")
+ Map<String, Long> countByCommunityId(@Param("communityId") Long communityId,@Param("nowDate") String nowDate);
@Select("SELECT photo_path_list FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) ORDER BY create_at DESC limit #{pageSize}")
- List<String> getAllImgs(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
+ List<String> getAllImgs(@Param("communityId") Long communityId,@Param("pageSize") Integer pageSize);
- @Select("<script> " + "SELECT " + " camw.id, " + " su.`name` AS userName, " + " camw.sponsor_id, "
- + " su.image_url, " + " su.phone, " + " camw.`status`, " + " camw.create_at, " + " camw.wish_name, "
- + " camw.finish, " + " camw.finish_photo_path_list, " + " camw.form, " + " camw.evaluate_at, "
- + " su1.name as responsibleName, " + " camw.score, " + " camw.distribution_at, " + " camw.detail, "
- + " camw.photo_path_list " + "FROM " + " com_act_micro_wish AS camw "
- + " LEFT JOIN sys_user AS su ON su.user_id = camw.sponsor_id "
- + " LEFT JOIN com_pb_service_team AS su1 ON su1.id = camw.responsible_id " + " <where> "
- + "<if test='microListDTO.status != null'>" + "AND camw.`status` =#{microListDTO.status} " + " </if> "
- + "<if test='microListDTO.communityId != null'>" + "AND camw.community_id =#{microListDTO.communityId} "
- + " </if> " + "<if test='microListDTO.startTime!=null and microListDTO.startTime != ""'>"
- + " AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{microListDTO.startTime} " + " </if> "
- + "<if test='microListDTO.endTime!=null and microListDTO.endTime != ""'>"
- + " AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{microListDTO.endTime} " + " </if> "
- + " </where>" + "ORDER BY camw.create_at desc " + " </script>")
+ @Select("<script> " +
+ "SELECT " +
+ " camw.id, " +
+ " su.`name` AS userName, " +
+ " camw.sponsor_id, " +
+ " su.image_url, " +
+ " su.phone, " +
+ " camw.`status`, " +
+ " camw.create_at, " +
+ " camw.wish_name, " +
+ " camw.finish, " +
+ " camw.finish_photo_path_list, " +
+ " camw.form, " +
+ " camw.evaluate_at, " +
+ " su1.name as responsibleName, " +
+ " camw.score, " +
+ " camw.distribution_at, " +
+ " camw.detail, " +
+ " camw.photo_path_list " +
+ "FROM " +
+ " com_act_micro_wish AS camw " +
+ " LEFT JOIN sys_user AS su ON su.user_id = camw.sponsor_id " +
+ " LEFT JOIN com_pb_service_team AS su1 ON su1.id = camw.responsible_id " +
+ " <where> " +
+ "<if test='microListDTO.status != null'>" +
+ "AND camw.`status` =#{microListDTO.status} " +
+ " </if> " +
+ "<if test='microListDTO.communityId != null'>" +
+ "AND camw.community_id =#{microListDTO.communityId} " +
+ " </if> " +
+ "<if test='microListDTO.startTime!=null and microListDTO.startTime != ""'>" +
+ " AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{microListDTO.startTime} " +
+ " </if> " +
+ "<if test='microListDTO.endTime!=null and microListDTO.endTime != ""'>" +
+ " AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{microListDTO.endTime} " +
+ " </if> " +
+ " </where>" +
+ "ORDER BY camw.create_at desc "+
+ " </script>")
IPage<MicroListVO> getScreenMicroList(Page page, @Param("microListDTO") ScreenMicroListDTO microListDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishFeedbackMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishFeedbackMapper.java
new file mode 100644
index 0000000..5bd79c4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishFeedbackMapper.java
@@ -0,0 +1,23 @@
+package com.panzhihua.service_community.dao;
+
+import com.panzhihua.common.model.vos.community.ComActMicroWishFeedbackVO;
+import com.panzhihua.service_community.model.dos.ComActMicroWishFeedbackDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @auther lyq
+ * @create 2021-08-26 14:26:50
+ * @describe mapper类
+ */
+@Mapper
+public interface ComActMicroWishFeedbackMapper extends BaseMapper<ComActMicroWishFeedbackDO> {
+ /**
+ * 根据心愿Id查询反馈列表
+ * @param id
+ * @return
+ */
+ List<ComActMicroWishFeedbackVO> selectByWishId(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishOperationRecordMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishOperationRecordMapper.java
new file mode 100644
index 0000000..39da319
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishOperationRecordMapper.java
@@ -0,0 +1,31 @@
+package com.panzhihua.service_community.dao;
+
+import com.panzhihua.common.model.vos.community.ComActMicroWishOperationRecordVO;
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @auther lyq
+ * @create 2021-08-27 10:28:04
+ * @describe mapper类
+ */
+@Mapper
+public interface ComActMicroWishOperationRecordMapper extends BaseMapper<ComActMicroWishOperationRecordDO> {
+ /**
+ * 根据心愿Id查询操作记录
+ * @param id
+ * @return
+ */
+ List<ComActMicroWishOperationRecordVO> getByWishId(Long id);
+
+ /**
+ * 查询下一个Id数组
+ * @param comActMicroWishVO
+ * @return
+ */
+ List<Long> selectId(ComActMicroWishVO comActMicroWishVO);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishUserDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishUserDAO.java
index 064a053..7f12a59 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishUserDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishUserDAO.java
@@ -1,9 +1,10 @@
package com.panzhihua.service_community.dao;
-import org.apache.ibatis.annotations.Mapper;
-
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +13,6 @@
* @create: 2020-12-10 16:19
**/
@Mapper
-public interface ComActMicroWishUserDAO extends BaseMapper<ComActMicroWishUserDO> {}
+public interface ComActMicroWishUserDAO extends BaseMapper<ComActMicroWishUserDO> {
+ List<Long> select(Integer id);
+}
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 2cb0ac5..4200c9b 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
@@ -29,23 +29,13 @@
@Mapper
public interface ComActNeighborCircleDAO extends BaseMapper<ComActNeighborCircleDO> {
- @Select("<script> " + "SELECT " + "canc.id," + "canc.release_content," + "canc.release_images,"
- + "canc.comment_num," + "canc.fabulous_num," + "canc.forward_num," + "canc.views_num," + "canc.is_boutique,"
- + "canc.create_at," + "canc.reply_at," + "canc.last_comment_num," + "canc.last_fabulous_num,"
- + "canc.last_views_num," + "canc.type," + "canc.topic_id," + "su.nick_name as name," + "su.community_id,"
- + "canct.name as topicName," + "su.image_url as headUrl " + " FROM " + " com_act_neighbor_circle AS canc"
- + " left join sys_user as su on su.user_id = canc.release_id "
- + " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id "
- + " where canc.status = 2 and canc.community_id = #{neighborCircleAppDTO.communityId} "
- + "<if test='neighborCircleAppDTO.topicId != null '>" + " and canc.topic_id = #{neighborCircleAppDTO.topicId} "
- + " </if> " + "<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> "
- + "<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 2'>"
- + " order by canc.create_at desc " + " </if> "
- + "<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 3'>"
- + " order by (canc.views_num + canc.comment_num + canc.fabulous_num) desc " + " </if> " + " </script>")
- IPage<ComActNeighborCircleAppVO> pageNeighborByApp(Page page,
- @Param("neighborCircleAppDTO") ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 分页查询邻里圈列表
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈列表
+ */
+ IPage<ComActNeighborCircleAppVO> pageNeighborByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleAppDTO neighborCircleAppDTO);
@Select("<script> " + "select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content "
+ ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canct.name as topicName "
@@ -55,23 +45,7 @@
+ " </script>")
ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
- @Select("<script> \n" + "SELECT\n" + "nc.*,\n"
- + "u.`nick_name` AS releaseName,u.image_url,canct.`name` as topicName ,u.`type` as userType\n"
- + ",u.name as communityName\n" + "FROM\n" + "com_act_neighbor_circle nc\n"
- + "LEFT JOIN sys_user u ON nc.release_id = u.user_id \n"
- + "LEFT JOIN com_act_neighbor_circle_topic as canct ON canct.id = nc.topic_id \n" + "<where>"
- + "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.topicName != null and neighborCircleAdminDTO.topicName != ""'>"
- + "and canct.`name` = #{neighborCircleAdminDTO.topicName} " + " </if> "
- + "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>"
- + "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} \n"
- + " </if> " + "<if test='neighborCircleAdminDTO.status != null '>"
- + "and nc.status = #{neighborCircleAdminDTO.status} \n" + " </if> " + "</where>" + "order by "
- + "case when nc.`status`=1 then 0 else 1 end, \n" + "nc.`status` asc,nc.create_at desc " + "</script>")
- IPage<ComActNeighborCircleAdminVO> pageNeighborByAdmin(Page page,
- @Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO);
+ IPage<ComActNeighborCircleAdminVO> pageNeighborByAdmin(Page page,@Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO);
@Select("select * from sys_user where user_id=#{userId}")
AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId);
@@ -134,8 +108,12 @@
List<PieElementVO> countAllNoneCompletedWorkByCommunityId(@Param("communityId") Long communityId);
@Select(" SELECT AVG(b.t)AS avgTime "
- + " FROM (SELECT TIMESTAMPDIFF(MINUTE,create_at,feedback_at) AS t FROM com_act_easy_photo WHERE community_id = #{communityId} and STATUS = 4 "
- + " UNION ALL SELECT TIMESTAMPDIFF(MINUTE,create_at,finish_at) AS t FROM com_act_micro_wish WHERE community_id = #{communityId} and STATUS = 6 "
- + " )AS b ")
- Map<String, Object> countAvgByCommunityId(@Param("communityId") Long communityId);
+ + " FROM (SELECT TIMESTAMPDIFF(MINUTE,create_at,feedback_at) AS t FROM com_act_easy_photo WHERE community_id = #{communityId} and STATUS = 4 "
+ + " UNION ALL SELECT TIMESTAMPDIFF(MINUTE,create_at,finish_at) AS t FROM com_act_micro_wish WHERE community_id = #{communityId} and STATUS = 6 "
+ + " )AS b ")
+ Map<String, Object> countAvgByCommunityId(@Param("communityId")Long communityId);
+
+ void addHotNum(@Param("circleId") Long circleId,@Param("hotNum") Long hotNum);
+
+ void addTopicHotNum(@Param("circleId") Long circleId,@Param("hotNum") Long hotNum);
}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java
index 2ddf054..2335a68 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java
@@ -38,5 +38,18 @@
* 社区id
* @return 邻里圈话题列表
*/
- List<ComActNeighborCircleTopicAppVO> getNeighborTopicByApp(@Param("communityId") Long communityId);
+ List<ComActNeighborCircleTopicAppVO> getNeighborTopicByApp(@Param("communityId") Long communityId,@Param("isZero") Integer isZero);
+
+ /**
+ * 添加邻里圈话题热度
+ * @param circleTopicId 邻里圈话题id
+ * @param hotNum 热度值
+ */
+ void addHotNum(@Param("circleTopicId") Long circleTopicId,@Param("hotNum") Long hotNum);
+
+ /**
+ * 添加邻里圈话题邻里圈数量
+ * @param circleTopicId 邻里圈话题id
+ */
+ void addCount(@Param("circleTopicId") Long circleTopicId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysConfMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysConfMapper.java
index 6807c96..220a4f0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysConfMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysConfMapper.java
@@ -29,4 +29,6 @@
*/
IPage<SysConfVO> findByPage(Page page, @Param("pageSysConfDTO") PageSysConfDTO pageSysConfDTO);
+ String getSysConfValue(@Param("key")String key,@Param("communityId") Long communityId);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java
index 7ab7b55..5f2b01b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java
@@ -1,11 +1,11 @@
package com.panzhihua.service_community.model.dos;
-import java.io.Serializable;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
-
import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -40,12 +40,13 @@
private String wishName;
/**
- * 状态 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成
+ * 状态
+ * 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成
*/
private Integer status;
/**
- * 形式 1分配人员 2发起活动
+ * 形式 1分配人员 2发起活动
*/
private Integer form;
@@ -130,5 +131,32 @@
* 反馈图片集合，逗号分隔
*/
private String feedbackPhotoPathList;
+ /**
+ * 目标集心数
+ */
+ private Integer aimNum;
+
+ /**
+ * 单张图片宽度
+ */
+ private BigDecimal imgWidth;
+
+ /**
+ * 单张图片高度
+ */
+ private BigDecimal imgHeight;
+
+ /**
+ * 状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中
+ */
+ public interface status{
+ int dsh=1;
+ int dfp=2;
+ int jxz=3;
+ int ybh=4;
+ int dqr=5;
+ int ywc=6;
+ int jx=7;
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishFeedbackDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishFeedbackDO.java
new file mode 100644
index 0000000..2c09976
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishFeedbackDO.java
@@ -0,0 +1,62 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+
+
+/**
+ * @auther lyq
+ * @create 2021-08-26 14:26:50
+ * @describe 实体类
+ */
+
+@Data
+@TableName("com_act_micro_wish_feedback")
+public class ComActMicroWishFeedbackDO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 微心愿Id
+ */
+ private Long microId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 反馈内容
+ */
+ private String content;
+
+ /**
+ * 反馈图片
+ */
+ private String imgUrl;
+
+ /**
+ * 反馈时间
+ */
+ private Date createTime;
+
+ @Override
+ public String toString() {
+ return "ComActMicroWishFeedbackDO{" +
+ "id=" + id +
+ ", microId=" + microId +
+ ", userId=" + userId +
+ ", content=" + content +
+ ", imgUrl=" + imgUrl +
+ ", createTime=" + createTime +
+ "}";
+ }
+ }
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java
new file mode 100644
index 0000000..3c8f7f0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java
@@ -0,0 +1,77 @@
+package com.panzhihua.service_community.model.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+
+/**
+ * @auther lyq
+ * @create 2021-08-27 10:28:04
+ * @describe 实体类
+ */
+
+@Data
+@TableName("com_act_micro_wish_operation_record")
+public class ComActMicroWishOperationRecordDO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 操作内容
+ */
+ private String content;
+
+ /**
+ * 人员id
+ */
+ private Long userId;
+
+ /**
+ * 心愿Id
+ */
+ private Long wishId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成
+ */
+ private Integer type;
+
+ @Override
+ public String toString() {
+ return "ComActMicroWishOperationRecordDO{" +
+ "id=" + id +
+ ", content='" + content + '\'' +
+ ", userId=" + userId +
+ ", wishId=" + wishId +
+ ", createTime=" + createTime +
+ ", type=" + type +
+ '}';
+ }
+ /**
+ *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成
+ */
+ public interface type{
+ int ytj=1;
+ int sh=2;
+ int bh=3;
+ int jx=4;
+ int fp=5;
+ int wc=6;
+ }
+}
\ No newline at end of file
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 78e659c..2a12a65 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
@@ -121,6 +121,16 @@
*/
private Integer type;
+ /**
+ * 热度
+ */
+ private Long hotNum;
+
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ private Integer isDel;
+
@Override
public String toString() {
return "ComActNeighborCircleDO{" + "id=" + id + ", releaseId=" + releaseId + ", releasePhone=" + releasePhone
@@ -147,4 +157,12 @@
int mini = 1;
int admin = 2;
}
+
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ public interface isDel{
+ int yes = 1;
+ int no = 2;
+ }
}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java
index 9ec55cc..34749bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java
@@ -52,6 +52,24 @@
*/
private Long createBy;
+ /**
+ * 热度
+ */
+ private Long hotNum;
+
+ /**
+ * 邻里圈数量
+ */
+ private Integer count;
+
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ public interface status{
+ int yes = 1;
+ int no = 2;
+ }
+
@Override
public String toString() {
return "ComActNeighborCircleTopicDO{" + "id=" + id + ", name=" + name + ", status=" + status + ", createAt="
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishOperationRecordService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishOperationRecordService.java
new file mode 100644
index 0000000..dc590e1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishOperationRecordService.java
@@ -0,0 +1,19 @@
+package com.panzhihua.service_community.service;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @auther lyq
+ * @create 2021-08-27 10:28:04
+ * @describe 服务类
+ */
+public interface ComActMicroWishOperationRecordService extends IService<ComActMicroWishOperationRecordDO> {
+ /**
+ * 根据心愿id查询操作记录
+ * @param id
+ * @return
+ */
+ R getByWishId(Long id);
+}
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 22f0c97..fff9a1d 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
@@ -212,4 +212,11 @@
*/
R neighborCommentReplyByApp(ComActNeighborCommentReplyAppDTO commentReplyAppDTO);
+ /**
+ * 小程序-删除邻里圈
+ * @param circleTopicAppDTO 请求参数
+ * @return 删除结果
+ */
+ R deleteNeighborByApp(DeleteNeighborCircleAppDTO circleTopicAppDTO);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
index 766f53f..76790bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO;
@@ -47,6 +49,13 @@
* 社区id
* @return 邻里圈话题列表
*/
- R getNeighborTopicByApp(Long communityId);
+ R getNeighborTopicByApp(Long communityId,Integer isZero);
+
+ /**
+ * 小程序-用户新增话题
+ * @param circleTopicAppDTO 请求参数
+ * @return 新增结果
+ */
+ R addNeighborTopicByApp(AddNeighborCircleTopicAppDTO circleTopicAppDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/SysConfService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/SysConfService.java
index 29d8e63..dbd0f20 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/SysConfService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/SysConfService.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.SysConfDO;
/**
@@ -10,4 +11,30 @@
*/
public interface SysConfService extends IService<SysConfDO> {
+ /**
+ * 根据系统code以及社区id查询配置表value值
+ *
+ * @param key 系统code
+ * @param communityId 社区id
+ * @return 系统配置value值
+ */
+ R getSysConfValue(String key, Long communityId);
+
+ /**
+ * 新增系统code配置数据
+ *
+ * @param key 系统code
+ * @param communityId 社区id
+ * @return 新增结果
+ */
+ R addSysConfValue(String key, Long communityId, String name, String value);
+
+ /**
+ * 编辑系统配置
+ * @param communityId 社区id
+ * @param status 配置值
+ * @return 编辑结果
+ */
+ R editSysConfValue(Long communityId, Integer status);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishOperationRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishOperationRecordServiceImpl.java
new file mode 100644
index 0000000..92d662a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishOperationRecordServiceImpl.java
@@ -0,0 +1,27 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO;
+import com.panzhihua.service_community.dao.ComActMicroWishOperationRecordMapper;
+import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @auther lyq
+ * @create 2021-08-27 10:28:04
+ * @describe 服务实现类
+ */
+@Slf4j
+@Service
+public class ComActMicroWishOperationRecordServiceImpl extends ServiceImpl<ComActMicroWishOperationRecordMapper, ComActMicroWishOperationRecordDO> implements ComActMicroWishOperationRecordService {
+ @Resource
+ private ComActMicroWishOperationRecordMapper comActMicroWishOperationRecordMapper;
+ @Override
+ public R getByWishId(Long id) {
+ return R.ok(comActMicroWishOperationRecordMapper.getByWishId(id));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
index 5d7a6aa..6a8d37f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -1,13 +1,6 @@
package com.panzhihua.service_community.service.impl;
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,17 +8,30 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActMicroWishFeedbackVO;
+import com.panzhihua.common.model.vos.community.ComActMicroWishOperationRecordVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
+import com.panzhihua.service_community.dao.ComActMicroWishFeedbackMapper;
+import com.panzhihua.service_community.dao.ComActMicroWishOperationRecordMapper;
import com.panzhihua.service_community.dao.ComActMicroWishUserDAO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
+import com.panzhihua.service_community.model.dos.ComActMicroWishFeedbackDO;
+import com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO;
import com.panzhihua.service_community.service.ComActMicroWishService;
-
import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -35,18 +41,19 @@
**/
@Service
@Slf4j
-public class ComActMicroWishServiceImpl extends ServiceImpl<ComActMicroWishDAO, ComActMicroWishDO>
- implements ComActMicroWishService {
+public class ComActMicroWishServiceImpl extends ServiceImpl<ComActMicroWishDAO, ComActMicroWishDO> implements ComActMicroWishService {
@Resource
private ComActMicroWishDAO comActMicroWishDAO;
@Resource
private ComActMicroWishUserDAO comActMicroWishUserDAO;
-
+ @Resource
+ private ComActMicroWishFeedbackMapper comActMicroWishFeedbackMapper;
+ @Resource
+ private ComActMicroWishOperationRecordMapper comActMicroWishOperationRecordMapper;
/**
* 分页查询微心愿
*
- * @param comActMicroWishVO
- * 查询参数
+ * @param comActMicroWishVO 查询参数
* @return 心愿列表
*/
@Override
@@ -55,10 +62,10 @@
Page page = new Page<>();
Long pageNum = comActMicroWishVO.getPageNum();
Long pageSize = comActMicroWishVO.getPageSize();
- if (null == pageNum || 0 == pageNum) {
+ if (null==pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (null == pageSize || 0 == pageSize) {
+ if (null==pageSize || 0 == pageSize) {
pageSize = 10l;
}
page.setSize(pageSize);
@@ -68,10 +75,9 @@
List<ComActMicroWishVO> records = iPage.getRecords();
if (!ObjectUtils.isEmpty(records)) {
records.forEach(comActMicroWishVO1 -> {
- if (userId != null) {
+ if(userId != null){
Long id = comActMicroWishVO1.getId();
- ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(
- new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id)
+ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id)
.eq(ComActMicroWishUserDO::getUserId, userId));
if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
comActMicroWishVO1.setHaveGiveThumbsUp(0);
@@ -79,8 +85,7 @@
comActMicroWishVO1.setHaveGiveThumbsUp(1);
}
}
- comActMicroWishVO1
- .setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone()));
+ comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone()));
});
iPage.setRecords(records);
}
@@ -90,10 +95,8 @@
/**
* 心愿详情
*
- * @param id
- * 查询主键
- * @param userId
- * 登录用户id
+ * @param id 查询主键
+ * @param userId 登录用户id
* @return 心愿内容
*/
@Override
@@ -103,34 +106,47 @@
return R.fail("微心愿不存在");
}
Integer starNum = comActMicroWishVO.getStarNum();
- if (null == starNum) {
+ if (null==starNum) {
comActMicroWishVO.setStarNum(0);
}
if (ObjectUtils.isEmpty(comActMicroWishVO)) {
return R.fail("心愿不存在");
}
- if (userId != null) {
- ComActMicroWishUserDO comActMicroWishUserDO =
- comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda()
- .eq(ComActMicroWishUserDO::getUserId, userId).eq(ComActMicroWishUserDO::getMicroWishId, id));
+ if(userId != null){
+ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getUserId, userId).eq(ComActMicroWishUserDO::getMicroWishId, id));
if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
comActMicroWishVO.setHaveGiveThumbsUp(0);
- } else {
+ }else {
comActMicroWishVO.setHaveGiveThumbsUp(1);
}
}
+ //查询反馈列表
+ List<ComActMicroWishFeedbackVO> feedList=comActMicroWishFeedbackMapper.selectByWishId(id);
+ if(!feedList.isEmpty()){
+ comActMicroWishVO.setFeedbackVOList(feedList);
+ }
+ //查询操作记录
+ List<ComActMicroWishOperationRecordVO> operationList=comActMicroWishOperationRecordMapper.getByWishId(id);
+ if(!operationList.isEmpty()){
+ comActMicroWishVO.setOperationRecordVOList(operationList);
+ }
comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
+ //查询同类型id数组
+ List<Long> idList=comActMicroWishOperationRecordMapper.selectId(comActMicroWishVO);
+ if(!idList.isEmpty()){
+ comActMicroWishVO.setIdList(idList);
+ }
return R.ok(comActMicroWishVO);
}
/**
* 审核、分配、反馈心愿
*
- * @param comActMicroWishVO
- * 具体操作
+ * @param comActMicroWishVO 具体操作
* @return 操作结果
*/
@Override
+ @Transactional
public R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
Long id = comActMicroWishVO.getId();
int type = comActMicroWishVO.getType().intValue();
@@ -138,49 +154,80 @@
Long responsibleId = comActMicroWishVO.getResponsibleId();
String feedback = comActMicroWishVO.getFeedback();
String feedbackPhotoPathList = comActMicroWishVO.getFeedbackPhotoPathList();
- ComActMicroWishDO comActMicroWishDO = new ComActMicroWishDO();
+ ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
comActMicroWishDO.setId(id);
Date date = new Date();
- // 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
- switch (type) {
+ ComActMicroWishOperationRecordDO comActMicroWishOperationRecordDO=new ComActMicroWishOperationRecordDO();
+ comActMicroWishOperationRecordDO.setCreateTime(date);
+ comActMicroWishOperationRecordDO.setUserId(comActMicroWishVO.getUserId());
+ comActMicroWishOperationRecordDO.setWishId(comActMicroWishVO.getId());
+ ComActMicroWishDO microWishDO = this.baseMapper.selectById(id);
+ if(microWishDO == null){
+ return R.fail("未查询到该微心愿记录");
+ }
+// 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
+ switch (type){
case 1:
+ if(!microWishDO.getStatus().equals(ComActMicroWishDO.status.dsh)){
+ return R.fail("该微心愿已审核，不可重复审核");
+ }
comActMicroWishDO.setExamineAt(date);
- comActMicroWishDO.setStatus(2);// 待分配
+ comActMicroWishDO.setAimNum(comActMicroWishVO.getAimNum());
+ comActMicroWishDO.setStatus(7);//集心中
+ comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.sh);
+ comActMicroWishOperationRecordDO.setContent("审核通过");
+ comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
break;
case 2:
+ if(!microWishDO.getStatus().equals(ComActMicroWishDO.status.dsh)){
+ return R.fail("该微心愿已审核，不可重复审核");
+ }
comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setRejectReason(rejectReason);
- comActMicroWishDO.setStatus(4);// 驳回
+ comActMicroWishDO.setStatus(4);//驳回
+ comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.bh);
+ comActMicroWishOperationRecordDO.setContent(rejectReason);
+ comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
break;
case 3:
comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
- comActMicroWishDO.setStatus(3);// 进行中
+ comActMicroWishDO.setStatus(3);//进行中
comActMicroWishDO.setForm(1);
break;
case 4:
comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
- comActMicroWishDO.setStatus(3);// 待确认
+ comActMicroWishDO.setStatus(3);//待确认
comActMicroWishDO.setForm(2);
break;
case 5:
- if (comActMicroWishVO.getFeedback().length() > 200) {
+ if(comActMicroWishVO.getFeedback().length() > 200){
return R.fail("反馈字数不得超过200字");
}
- comActMicroWishDO.setFeedbackAt(date);
- comActMicroWishDO.setStatus(5);// 待确认
- comActMicroWishDO.setFeedback(feedback);
- comActMicroWishDO.setFinish(feedback);
- comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList);
- comActMicroWishDO.setFinishAt(date);
- comActMicroWishDO.setFeedbackPhotoPathList(feedbackPhotoPathList);
- break;
+ //新增反馈记录
+ ComActMicroWishFeedbackDO comActMicroWishFeedbackDO=new ComActMicroWishFeedbackDO();
+ comActMicroWishFeedbackDO.setCreateTime(date);
+ comActMicroWishFeedbackDO.setContent(feedback);
+ comActMicroWishFeedbackDO.setImgUrl(feedbackPhotoPathList);
+ comActMicroWishFeedbackDO.setMicroId(comActMicroWishVO.getId());
+ comActMicroWishFeedbackDO.setUserId(comActMicroWishVO.getUserId());
+ if(comActMicroWishVO.getStatus() != null && comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){
+ comActMicroWishDO.setStatus(comActMicroWishVO.getStatus());
+ comActMicroWishDO.setFinishAt(date);
+ comActMicroWishDO.setFinish(feedback);
+ comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList);
+ }
+// else {
+// comActMicroWishDO.setStatus(3);
+// }
+ comActMicroWishFeedbackMapper.insert(comActMicroWishFeedbackDO);
+ return R.ok();
default:
break;
}
int update = comActMicroWishDAO.updateById(comActMicroWishDO);
- if (update > 0) {
+ if (update>0) {
return R.ok();
}
return R.fail();
@@ -189,47 +236,47 @@
/**
* 点赞/取消点赞微心愿
*
- * @param comActMicroWishVO
- * 操作参数
+ * @param comActMicroWishVO 操作参数
* @return 操作结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R comActMicroWishVO(ComActMicroWishVO comActMicroWishVO) {
- Integer haveGiveThumbsUp = comActMicroWishVO.getHaveGiveThumbsUp();
Long userId = comActMicroWishVO.getSponsorId();
Long microWishId = comActMicroWishVO.getId();
- ComActMicroWishUserDO comActMicroWishUserDO =
- comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda()
- .eq(ComActMicroWishUserDO::getMicroWishId, microWishId).eq(ComActMicroWishUserDO::getUserId, userId));
- boolean empty = ObjectUtils.isEmpty(comActMicroWishUserDO);
- int num = 0;
- if (haveGiveThumbsUp.intValue() == 1) {
- if (empty) {
- ComActMicroWishUserDO comActMicroWishUserDO1 = new ComActMicroWishUserDO();
- comActMicroWishUserDO1.setMicroWishId(microWishId);
- comActMicroWishUserDO1.setUserId(userId);
- num = comActMicroWishUserDAO.insert(comActMicroWishUserDO1);
- } else {
- return R.ok();
- }
- } else {
- if (empty) {
- return R.ok();
- } else {
- num = comActMicroWishUserDAO.deleteById(comActMicroWishUserDO.getId());
+ //查询微心愿集心数并判断修改微心愿状态
+ ComActMicroWishDO comActMicroWishDO=comActMicroWishDAO.selectById(microWishId);
+ Integer count=comActMicroWishUserDAO.selectCount(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, microWishId));
+ if(comActMicroWishDO!=null&&comActMicroWishDO.getAimNum()!=null&&count<comActMicroWishDO.getAimNum()){
+ if(comActMicroWishDO.getStatus()==ComActMicroWishDO.status.jx){
+ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, microWishId).eq(ComActMicroWishUserDO::getUserId, userId));
+ boolean empty = ObjectUtils.isEmpty(comActMicroWishUserDO);
+ int num=0;
+ if (empty) {
+ ComActMicroWishUserDO comActMicroWishUserDO1=new ComActMicroWishUserDO();
+ comActMicroWishUserDO1.setMicroWishId(microWishId);
+ comActMicroWishUserDO1.setUserId(userId);
+ num=comActMicroWishUserDAO.insert(comActMicroWishUserDO1);
+ }else{
+ return R.fail("无法重新点心");
+ }
+ if (num>0) {
+ if(count>=comActMicroWishDO.getAimNum()-1){
+ comActMicroWishDO.setStatus(ComActMicroWishDO.status.dfp);
+ comActMicroWishDO.setFeedbackAt(DateUtil.date());
+ comActMicroWishDAO.updateById(comActMicroWishDO);
+ }
+ return R.ok();
+ }
}
}
- if (num > 0) {
- return R.ok();
- }
- return R.fail();
+ return R.fail("该微心愿不可点心");
}
/**
* 用户确认心愿
*
- * @param comActMicroWishVO
- * 用户评价
+ * @param comActMicroWishVO 用户评价
* @return 确认结果
*/
@Override
@@ -239,17 +286,17 @@
return R.fail("心愿不存在");
}
Integer status = comActMicroWishDO1.getStatus();
- if (status.intValue() != 5) {
- return R.fail("心愿状态不是待确认");
+ if (!status.equals(ComActMicroWishDO.status.ywc)) {
+ return R.fail("心愿状态不是已完成状态");
}
- ComActMicroWishDO comActMicroWishDO = new ComActMicroWishDO();
+ ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
comActMicroWishDO.setId(comActMicroWishVO.getId());
comActMicroWishDO.setEvaluateAt(comActMicroWishVO.getEvaluateAt());
comActMicroWishDO.setStatus(comActMicroWishVO.getStatus());
comActMicroWishDO.setScore(comActMicroWishVO.getScore());
comActMicroWishDO.setEvaluate(comActMicroWishVO.getEvaluate());
int update = comActMicroWishDAO.updateById(comActMicroWishDO);
- if (update > 0) {
+ if (update>0) {
return R.ok();
}
return R.fail();
@@ -258,45 +305,41 @@
/**
* 社区首页代办事件集合
*
- * @param communityId
- * 社区id
- * @param userId
- * 登录用户
+ * @param communityId 社区id
+ * @param userId 登录用户
* @return 代办事件集合
*/
@Override
public List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId) {
- List<TodoEventsVO> todoEventsVOS = comActMicroWishDAO.selectNeedToDo(communityId, userId);
+ List<TodoEventsVO> todoEventsVOS=comActMicroWishDAO.selectNeedToDo(communityId,userId);
return todoEventsVOS;
}
@Override
public R deleteMicroWish(Long id) {
ComActMicroWishDO comActMicroWishDO = comActMicroWishDAO.selectById(id);
- if (comActMicroWishDO == null) {
+ if(comActMicroWishDO==null){
return R.fail("id有误!");
}
comActMicroWishDAO.deleteById(id);
- comActMicroWishUserDAO
- .delete(new LambdaQueryWrapper<ComActMicroWishUserDO>().eq(ComActMicroWishUserDO::getMicroWishId, id));
+ comActMicroWishUserDAO.delete(new LambdaQueryWrapper<ComActMicroWishUserDO>().eq(ComActMicroWishUserDO::getMicroWishId,id));
return R.ok();
}
@Override
public R timedTaskActMicroWishAll() {
- int num = comActMicroWishDAO.updateStatusAutoConfirm();
- log.info("定时任务--修改待自动确认微心愿状态数量【{}】", num);
+ int num=comActMicroWishDAO.updateStatusAutoConfirm();
+ log.info("定时任务--修改待自动确认微心愿状态数量【{}】",num);
return R.ok();
}
@Override
- public R getScreenMicroList(ScreenMicroListDTO microListDTO) {
- IPage<MicroListVO> microListVOIPage = comActMicroWishDAO
- .getScreenMicroList(new Page(microListDTO.getPageNum(), microListDTO.getPageSize()), microListDTO);
- if (!microListVOIPage.getRecords().isEmpty()) {
+ public R getScreenMicroList(ScreenMicroListDTO microListDTO){
+ IPage<MicroListVO> microListVOIPage = comActMicroWishDAO.getScreenMicroList(new Page(microListDTO.getPageNum(),microListDTO.getPageSize()),microListDTO);
+ if(!microListVOIPage.getRecords().isEmpty()){
microListVOIPage.getRecords().forEach(microListVO -> {
Integer count = comActMicroWishUserDAO.selectCount(new QueryWrapper<ComActMicroWishUserDO>().lambda()
- .eq(ComActMicroWishUserDO::getMicroWishId, microListVO.getId()));
+ .eq(ComActMicroWishUserDO::getMicroWishId,microListVO.getId()));
microListVO.setStarNum(count);
});
}
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 c904152..2139a1d 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
@@ -15,6 +15,7 @@
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.constants.NeighborCircleConstants;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.*;
@@ -63,7 +64,7 @@
/**
* 分页查询邻里圈列表
- *
+ *
* @param neighborCircleAppDTO
* 请求参数
* @return 邻里圈列表
@@ -104,7 +105,7 @@
/**
* 用户发布邻里圈审核
- *
+ *
* @param addNeighborCircleAppDTO
* 邻里圈请求参数
* @return 发布结果
@@ -123,7 +124,23 @@
if (StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())) {
neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone());
}
- if (this.baseMapper.insert(neighborCircleDO) > 0) {
+ //判断当前邻里圈是否需要审核
+ if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){
+ //当邻里圈不需要审核才进入自动审核
+ //判断邻里圈自动审核结果
+ if(addNeighborCircleAppDTO.getWxExamineResult().equals(AddComActNeighborCircleAppDTO.isExamine.yes)){
+ neighborCircleDO.setStatus(ComActNeighborCircleDO.status.xs);
+ if(neighborCircleDO.getTopicId() != null){
+ //给邻里圈话题添加邻里圈数量
+ comActNeighborCircleTopicMapper.addCount(neighborCircleDO.getTopicId());
+ }
+ }else{
+ neighborCircleDO.setStatus(ComActNeighborCircleDO.status.bh);
+ neighborCircleDO.setRefuseReason("内容违规");
+ }
+ }
+
+ if(this.baseMapper.insert(neighborCircleDO) > 0){
return R.ok();
} else {
return R.fail("发布失败");
@@ -132,7 +149,7 @@
/**
* 查看邻里圈详情
- *
+ *
* @param neighborCircleAppDTO
* 请求参数
* @return 邻里圈详情
@@ -281,12 +298,17 @@
neighborCircleDO.setRefuseReason(editVO.getRefuseReason());
}
this.baseMapper.updateById(neighborCircleDO);
+
+ if(editVO.getStatus().equals(EditNeighborCircleAdminVO.status.xs) && neighborCircleDO.getTopicId() != null){
+ //给邻里圈话题添加邻里圈数量
+ comActNeighborCircleTopicMapper.addCount(neighborCircleDO.getTopicId());
+ }
return R.ok(neighborCircleDO.getReleaseId());
}
/**
* 用户查询邻里圈列表
- *
+ *
* @param neighborCircleAppDTO
* 请求参数
* @return 邻里圈列表
@@ -318,7 +340,7 @@
/**
* 邻里圈点赞
- *
+ *
* @param fabulousAppDTO
* 请求参数
* @return 点赞结果
@@ -349,7 +371,11 @@
if (neighborCircleDO != null) {
neighborCircleDO.setFabulousNum(neighborCircleDO.getFabulousNum() + 1);
neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1);
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM + NeighborCircleConstants.VIEW_HOT_NUM;
+ neighborCircleDO.setHotNum(neighborCircleDO.getHotNum() + hotNum);
this.baseMapper.updateById(neighborCircleDO);
+ comActNeighborCircleTopicMapper.addHotNum(neighborCircleDO.getTopicId(),hotNum);
circleFabulousDO.setCircleId(neighborCircleDO.getId());
}
// 添加邻里圈浏览记录
@@ -371,6 +397,10 @@
if (circleCommentDO != null) {
circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
comActNeighborCircleCommentDAO.updateById(circleCommentDO);
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM + NeighborCircleConstants.VIEW_HOT_NUM;
+ this.baseMapper.addTopicHotNum(circleCommentDO.getCircleId(),hotNum);
+ this.baseMapper.addHotNum(circleCommentDO.getCircleId(),hotNum);
circleFabulousDO.setCircleId(circleCommentDO.getCircleId());
}
} else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)) {
@@ -389,6 +419,10 @@
if (circleCommentReplyDO != null) {
circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() + 1);
comActNeighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM + NeighborCircleConstants.VIEW_HOT_NUM;
+ this.baseMapper.addTopicHotNum(circleCommentReplyDO.getCircleId(),hotNum);
+ this.baseMapper.addHotNum(circleCommentReplyDO.getCircleId(),hotNum);
circleFabulousDO.setCircleId(circleCommentReplyDO.getCircleId());
}
}
@@ -401,7 +435,7 @@
/**
* 邻里圈转发
- *
+ *
* @param forwardAppDTO
* 请求参数
* @return 转发结果
@@ -419,7 +453,11 @@
return R.fail("没有找到邻里圈");
}
circleDO.setForwardNum(circleDO.getForwardNum() + 1);
- if (this.baseMapper.updateById(circleDO) > 0) {
+ if (this.baseMapper.updateById(circleDO) > 0){
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.VIEW_HOT_NUM;
+ this.baseMapper.addHotNum(forwardAppDTO.getCircleId(),hotNum);
+ this.baseMapper.addTopicHotNum(forwardAppDTO.getCircleId(),hotNum);
return R.ok();
} else {
return R.fail("转发失败");
@@ -428,7 +466,7 @@
/**
* 邻里圈评论
- *
+ *
* @param commentAppDTO
* 请求参数
* @return 评论结果
@@ -447,6 +485,11 @@
neighborCircleDO.setReplyAt(new Date());
this.baseMapper.updateById(neighborCircleDO);
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.COMMENT_HOT_NUM;
+ this.baseMapper.addHotNum(commentAppDTO.getCircleId(),hotNum);
+ this.baseMapper.addTopicHotNum(commentAppDTO.getCircleId(),hotNum);
+
circleCommentDO.setCircleId(commentAppDTO.getCircleId());
circleCommentDO.setUserId(commentAppDTO.getUserId());
circleCommentDO.setUserPhone(commentAppDTO.getPhone());
@@ -464,7 +507,7 @@
/**
* 邻里圈回复
- *
+ *
* @param replyAppDTO
* 请求参数
* @return 回复结果
@@ -481,6 +524,11 @@
neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
neighborCircleDO.setReplyAt(new Date());
this.baseMapper.updateById(neighborCircleDO);
+
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.COMMENT_HOT_NUM;
+ this.baseMapper.addHotNum(replyAppDTO.getCircleId(),hotNum);
+ this.baseMapper.addTopicHotNum(replyAppDTO.getCircleId(),hotNum);
circleCommentReplyDO.setCircleId(replyAppDTO.getCircleId());
circleCommentReplyDO.setUserId(replyAppDTO.getUserId());
@@ -691,12 +739,13 @@
/**
* 邻里圈取消点赞
- *
+ *
* @param fabulousAppDTO
* 请求参数
* @return 取消点赞结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R neighborFabulousCancelByApp(ComActNeighborFabulousAppDTO fabulousAppDTO) {
ComActNeighborCircleFabulousDO circleFabulousDO = null;
// 查询邻里圈点赞信息
@@ -718,6 +767,10 @@
if (neighborCircleDO != null) {
neighborCircleDO.setFabulousNum(neighborCircleDO.getFabulousNum() - 1);
this.baseMapper.updateById(neighborCircleDO);
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
+ this.baseMapper.addHotNum(neighborCircleDO.getId(),-hotNum);
+ this.baseMapper.addTopicHotNum(neighborCircleDO.getId(),-hotNum);
}
} else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)) {
circleFabulousDO =
@@ -737,6 +790,10 @@
if (circleCommentDO != null) {
circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() - 1);
comActNeighborCircleCommentDAO.updateById(circleCommentDO);
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
+ this.baseMapper.addHotNum(circleCommentDO.getCircleId(),-hotNum);
+ this.baseMapper.addTopicHotNum(circleCommentDO.getCircleId(),-hotNum);
}
} else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)) {
circleFabulousDO =
@@ -755,6 +812,10 @@
if (circleCommentReplyDO != null) {
circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() - 1);
comActNeighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
+ this.baseMapper.addHotNum(circleCommentReplyDO.getCircleId(),-hotNum);
+ this.baseMapper.addTopicHotNum(circleCommentReplyDO.getCircleId(),-hotNum);
}
}
if (circleFabulousDO != null) {
@@ -766,7 +827,7 @@
/**
* 添加邻里圈浏览记录
- *
+ *
* @param addBrowseAppDTO
* 请求参数
* @return 返回参数
@@ -781,13 +842,18 @@
if (neighborCircleDO != null) {
neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1);
this.baseMapper.updateById(neighborCircleDO);
+
+ //计算需要增加的热度值
+ Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
+ this.baseMapper.addHotNum(neighborCircleDO.getId(),hotNum);
+ this.baseMapper.addTopicHotNum(neighborCircleDO.getId(),hotNum);
}
return R.ok();
}
/**
* 分页查询评论下所有回复
- *
+ *
* @param commentReplyAppDTO
* 请求参数
* @return 回复列表
@@ -818,4 +884,20 @@
}
return R.ok(neighborCircleIPage);
}
+
+ /**
+ * 小程序-删除邻里圈
+ * @param circleTopicAppDTO 请求参数
+ * @return 删除结果
+ */
+ @Override
+ public R deleteNeighborByApp(DeleteNeighborCircleAppDTO circleTopicAppDTO){
+ ComActNeighborCircleDO neighborCircleDO = new ComActNeighborCircleDO();
+ neighborCircleDO.setId(circleTopicAppDTO.getId());
+ neighborCircleDO.setIsDel(ComActNeighborCircleDO.isDel.yes);
+ if(this.baseMapper.updateById(neighborCircleDO) > 0){
+ return R.ok();
+ }
+ return R.fail();
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
index cb78a4b..b915deb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java
@@ -9,7 +9,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActNeighborCircleTopicMapper;
@@ -31,7 +33,7 @@
/**
* 分页查询邻里圈话题列表
- *
+ *
* @param circleTopicAdminDTO
* 请求参数
* @return 邻里圈话题列表
@@ -44,7 +46,7 @@
/**
* 添加邻里圈话题
- *
+ *
* @param addCircleTopicAdminDTO
* 请求参数
* @return 添加结果
@@ -72,7 +74,7 @@
/**
* 编辑邻里圈话题
- *
+ *
* @param addCircleTopicAdminDTO
* 请求参数
* @return 编辑结果
@@ -105,14 +107,37 @@
/**
* 小程序查询邻里圈话题列表
- *
+ *
* @param communityId
* 社区id
* @return 邻里圈话题列表
*/
@Override
- public R getNeighborTopicByApp(Long communityId) {
- return R.ok(this.baseMapper.getNeighborTopicByApp(communityId));
+ public R getNeighborTopicByApp(Long communityId,Integer isZero){
+ return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero));
}
+ /**
+ * 小程序-用户新增话题
+ * @param circleTopicAppDTO 请求参数
+ * @return 新增结果
+ */
+ @Override
+ public R addNeighborTopicByApp(AddNeighborCircleTopicAppDTO circleTopicAppDTO){
+ ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
+ .lambda().eq(ComActNeighborCircleTopicDO::getCommunityId,circleTopicAppDTO.getCommunityId())
+ .eq(ComActNeighborCircleTopicDO::getName,circleTopicAppDTO.getName()));
+ if(circleTopicDO == null){
+ circleTopicDO = new ComActNeighborCircleTopicDO();
+ circleTopicDO.setCommunityId(circleTopicAppDTO.getCommunityId());
+ circleTopicDO.setName(circleTopicAppDTO.getName());
+ circleTopicDO.setCreateBy(circleTopicAppDTO.getUserId());
+ circleTopicDO.setCreateAt(new Date());
+ circleTopicDO.setCount(0);
+ circleTopicDO.setHotNum(0L);
+ circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes);
+ this.baseMapper.insert(circleTopicDO);
+ }
+ return R.ok(circleTopicDO);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
index 4ed591c..36461f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -563,6 +563,7 @@
public R getById(Long id,Long userId,Long recordId,Integer isBack) {
ComActReserveDO comActReserveDO=comActReserveMapper.selectById(id);
if(comActReserveDO!=null){
+ comActReserveDO.setViewNum(comActReserveDO.getViewNum()+1);
ComActReserveDetailVO comActReserveDetailVO=new ComActReserveDetailVO();
if(isBack!=1){
comActReserveDO.setViewNum(comActReserveDO.getViewNum()+1);
@@ -595,6 +596,8 @@
if(comActReserveRecordDO!=null){
BeanUtils.copyProperties(comActReserveRecordDO,comActReserveDetailVO);
}
+ //更新浏览量
+ comActReserveMapper.updateById(comActReserveDO);
return R.ok(comActReserveDetailVO);
}
return R.fail("未查询到数据");
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/SysConfServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/SysConfServiceImpl.java
index 34ff0c0..b8b4395 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/SysConfServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/SysConfServiceImpl.java
@@ -1,13 +1,18 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.panzhihua.common.constants.NeighborCircleConstants;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.SysConfMapper;
import com.panzhihua.service_community.model.dos.SysConfDO;
import com.panzhihua.service_community.service.SysConfService;
import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
/**
* @auther lyq
@@ -18,4 +23,55 @@
@Service
public class SysConfServiceImpl extends ServiceImpl<SysConfMapper, SysConfDO> implements SysConfService {
+ /**
+ * 根据系统code以及社区id查询配置表value值
+ * @param key 系统code
+ * @param communityId 社区id
+ * @return 系统配置value值
+ */
+ @Override
+ public R getSysConfValue(String key, Long communityId){
+ return R.ok(this.baseMapper.getSysConfValue(key,communityId));
+ }
+
+ /**
+ * 新增系统code配置数据
+ * @param key 系统code
+ * @param communityId 社区id
+ * @return 新增结果
+ */
+ @Override
+ public R addSysConfValue(String key, Long communityId,String name,String value){
+ SysConfDO confDO = new SysConfDO();
+ confDO.setCode(key);
+ confDO.setCreateAt(new Date());
+ confDO.setCommunityId(communityId);
+ confDO.setValue(value);
+ confDO.setName(name);
+ if(this.baseMapper.insert(confDO) > 0){
+ return R.ok(confDO.getValue());
+ }else{
+ return R.fail();
+ }
+ }
+
+ /**
+ * 编辑系统配置
+ * @param communityId 社区id
+ * @param status 配置值
+ * @return 编辑结果
+ */
+ @Override
+ public R editSysConfValue(Long communityId, Integer status){
+ SysConfDO confDO = new SysConfDO();
+ confDO.setCommunityId(communityId);
+ confDO.setCode(NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE + communityId);
+ confDO.setValue(status+"");
+ if(this.baseMapper.updateById(confDO) > 0){
+ return R.ok(confDO.getValue());
+ }else{
+ return R.fail();
+ }
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishFeedbackMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishFeedbackMapper.xml
new file mode 100644
index 0000000..59dd54c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishFeedbackMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActMicroWishFeedbackMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActMicroWishFeedbackDO">
+ <id column="id" property="id"/>
+ <result column="micro_id" property="microId"/>
+ <result column="user_id" property="userId"/>
+ <result column="content" property="content"/>
+ <result column="img_url" property="imgUrl"/>
+ <result column="create_time" property="createTime"/>
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id
+ , micro_id, user_id, content, img_url, create_time
+ </sql>
+
+ <select id="selectByWishId" resultType="com.panzhihua.common.model.vos.community.ComActMicroWishFeedbackVO">
+ select t.*,t1.name from com_act_micro_wish_feedback t left join sys_user t1 on t.user_id =t1.user_id where t.micro_id =#{id} order by t.create_time desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishOperationRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishOperationRecordMapper.xml
new file mode 100644
index 0000000..25295b1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishOperationRecordMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActMicroWishOperationRecordMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActMicroWishOperationRecordDO">
+ <id column="id" property="id" />
+ <result column="content" property="content" />
+ <result column="user_id" property="userId" />
+ <result column="wish_id" property="wishId" />
+ <result column="create_time" property="createTime" />
+ <result column="type" property="type"/>
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, content, user_id, wish_id, create_time
+ </sql>
+
+ <select id="getByWishId" resultType="com.panzhihua.common.model.vos.community.ComActMicroWishOperationRecordVO">
+ select t.*,t1.name from com_act_micro_wish_operation_record t left join sys_user t1 on t.user_id =t1.user_id where t.wish_id =#{id} order by t.create_time desc
+ </select>
+
+ <select id="selectId" resultType="Long">
+ select id from com_act_micro_wish
+ <where>
+ 1=1
+ <if test="status !=null">
+ and status=#{status}
+ </if>
+ </where>
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
new file mode 100644
index 0000000..3da4fec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActNeighborCircleDAO">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActNeighborCircleDO">
+ <id column="id" property="id"/>
+ <result column="release_id" property="releaseId"/>
+ <result column="release_phone" property="releasePhone"/>
+ <result column="community_id" property="communityId"/>
+ <result column="release_content" property="releaseContent"/>
+ <result column="release_images" property="releaseImages"/>
+ <result column="status" property="status"/>
+ <result column="refuse_reason" property="refuseReason"/>
+ <result column="comment_num" property="commentNum"/>
+ <result column="fabulous_num" property="fabulousNum"/>
+ <result column="forward_num" property="forwardNum"/>
+ <result column="views_num" property="viewsNum"/>
+ <result column="is_boutique" property="isBoutique"/>
+ <result column="create_at" property="createAt"/>
+ <result column="reply_at" property="replyAt"/>
+ <result column="last_comment_num" property="lastCommentNum"/>
+ <result column="last_fabulous_num" property="lastFabulousNum"/>
+ <result column="last_views_num" property="lastViewsNum"/>
+ <result column="type" property="type"/>
+ <result column="topic_id" property="topicId"/>
+ <result column="hot_num" property="hotNum"/>
+ <result column="is_del" property="isDel"/>
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, release_id, release_phone, community_id, release_content, release_images, status, refuse_reason, comment_num, fabulous_num, forward_num, views_num, is_boutique, create_at, reply_at, last_comment_num, last_fabulous_num, last_views_num, type, topic_id, hot_num, is_del
+ </sql>
+
+ <select id="pageNeighborByApp" parameterType="com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO"
+ resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO">
+ SELECT
+ canc.id,
+ canc.release_content,
+ canc.release_images,
+ canc.comment_num,
+ canc.fabulous_num,
+ canc.forward_num,
+ canc.views_num,
+ canc.is_boutique,
+ canc.create_at,
+ canc.refuse_reason,
+ canc.reply_at,
+ canc.last_comment_num,
+ canc.last_fabulous_num,
+ canc.last_views_num,
+ canc.type,
+ canc.topic_id,
+ canc.hot_num,
+ su.nick_name as name,
+ su.community_id,
+ canct.name as topicName,
+ su.image_url as headUrl
+ FROM
+ com_act_neighbor_circle AS canc
+ left join sys_user as su on su.user_id = canc.release_id
+ left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id
+ where canc.status = 2 and is_del = 2 and canc.community_id = #{neighborCircleAppDTO.communityId}
+ <if test='neighborCircleAppDTO.topicId != null '>
+ and canc.topic_id = #{neighborCircleAppDTO.topicId}
+ </if>
+ <if test='neighborCircleAppDTO.keyWord != null and neighborCircleAppDTO.keyWord != ""'>
+ and (canct.`name` like concat (#{neighborCircleAppDTO.keyWord},'%') or
+ su.nick_name like concat (#{neighborCircleAppDTO.keyWord},'%') or
+ canc.release_content like concat (#{neighborCircleAppDTO.keyWord},'%'))
+ </if>
+ <if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 1'>
+ order by canc.hot_num desc
+ </if>
+ <if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 2'>
+ order by canc.create_at desc
+ </if>
+ <if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 3'>
+ order by canc.is_boutique asc
+ </if>
+ </select>
+
+ <update id="addHotNum">
+ update com_act_neighbor_circle set hot_num = hot_num + #{hotNum} where id = #{circleId}
+ </update>
+
+ <update id="addTopicHotNum">
+ update com_act_neighbor_circle_topic set hot_num = hot_num + 1 where id = (select topic_id from com_act_neighbor_circle where id = #{circleId})
+ </update>
+
+ <select id="pageNeighborByAdmin" parameterType="com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO"
+ resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO">
+ SELECT
+ nc.*,
+ u.`nick_name` AS releaseName,u.image_url,canct.`name` as topicName ,u.`type` as userType
+ ,u.name as communityName
+ FROM
+ com_act_neighbor_circle nc
+ LEFT JOIN sys_user u ON nc.release_id = u.user_id
+ LEFT JOIN com_act_neighbor_circle_topic as canct ON canct.id = nc.topic_id
+ <where>
+ nc.community_id = #{neighborCircleAdminDTO.communityId}
+ <if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'>
+ and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%')
+ </if>
+ <if test='neighborCircleAdminDTO.topicName != null and neighborCircleAdminDTO.topicName != ""'>
+ and canct.`name` = #{neighborCircleAdminDTO.topicName}
+ </if>
+ <if test='neighborCircleAdminDTO.keyWord != null and neighborCircleAdminDTO.keyWord != ""'>
+ and (canct.`name` like concat(#{neighborCircleAdminDTO.keyWord},'%') or
+ u.`nick_name` like concat(#{neighborCircleAdminDTO.keyWord},'%') or
+ nc.`release_content` like concat(#{neighborCircleAdminDTO.keyWord},'%') )
+ </if>
+ <if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>
+ and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt}
+ </if>
+ <if test='neighborCircleAdminDTO.status != null '>
+ and nc.status = #{neighborCircleAdminDTO.status}
+ </if>
+ </where>
+ order by
+ case when nc.`status`=1 then 0 else 1 end,
+ nc.`status` asc,nc.create_at desc
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml
index 906c3c8..f64791d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml
@@ -10,11 +10,13 @@
<result column="status" property="status" />
<result column="create_at" property="createAt" />
<result column="create_by" property="createBy" />
+ <result column="count" property="count" />
+ <result column="hot_num" property="hotNum" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, community_id, name, status, create_at, create_by
+ id, community_id, name, status, create_at, create_by, count, hot_num
</sql>
<select id="pageNeighborTopicByAdmin" parameterType="com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO"
@@ -43,6 +45,18 @@
</select>
<select id="getNeighborTopicByApp" resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO">
- select id,`name` from com_act_neighbor_circle_topic where `status` = 1 and community_id = #{communityId}
+ select id,`name`,hot_num,`count` from com_act_neighbor_circle_topic where `status` = 1 and community_id = #{communityId}
+ <if test="isZero != null and isZero == 1">
+ and `count` > 0
+ </if>
+ order by hot_num desc
</select>
+
+ <update id="addHotNum">
+ update com_act_neighbor_circle_topic set hot_num = hot_num + #{hotNum} where id = #{circleTopicId}
+ </update>
+
+ <update id="addCount">
+ update com_act_neighbor_circle_topic set `count` = `count` + 1 where id = #{circleTopicId}
+ </update>
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml
index aa57d75..0f1b595 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml
@@ -60,4 +60,9 @@
</if>
</select>
+ <select id="getSysConfValue" resultType="string">
+ SELECT `value` FROM `sys_conf` where `code` = #{key}
+ <if test="communityId != null"> and community_id = #{communityId} </if>
+ </select>
+
</mapper>
--
Gitblit v1.7.1