From 7ea43dac46900dab7535bdd3ec957b45e43b5270 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 28 四月 2021 17:38:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 6 deletions(-)
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 3f51d39..c290807 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
@@ -6,21 +6,34 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.dao.ComActNeighborCircleCommentDAO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
+import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
+import com.panzhihua.service_community.service.ComActNeighborCircleBrowseService;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* @auther lyq
@@ -29,6 +42,12 @@
*/
@Slf4j
@Service
+public class ComActNeighborCircleServiceImpl extends ServiceImpl<ComActNeighborCircleDAO, ComActNeighborCircleDO> implements ComActNeighborCircleService {
+
+ @Resource
+ private ComActNeighborCircleBrowseService comActNeighborCircleBrowseService;
+ @Resource
+ private ComActNeighborCircleCommentDAO comActNeighborCircleCommentDAO;
public abstract class ComActNeighborCircleServiceImpl extends ServiceImpl<ComActNeighborCircleDAO, ComActNeighborCircleDO> implements ComActNeighborCircleService {
@Resource
ComActNeighborCircleFabulousDAO neighborCircleFabulousDAO;
@@ -44,14 +63,64 @@
/**
* 分页查询邻里圈列表
- *
- * @param neighborCircleAppDTO 请求参数
- * @return 邻里圈列表
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈列表
*/
- public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ @Override
+ public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
return R.ok(doPager);
+ }
+
+ /**
+ * 用户发布邻里圈审核
+ * @param addNeighborCircleAppDTO 邻里圈请求参数
+ * @return 发布结果
+ */
+ @Override
+ public R addNeighborByApp(AddComActNeighborCircleAppDTO addNeighborCircleAppDTO){
+ //新增邻里圈审核
+ ComActNeighborCircleDO neighborCircleDO = new ComActNeighborCircleDO();
+ BeanUtils.copyProperties(addNeighborCircleAppDTO,neighborCircleDO);
+ if(addNeighborCircleAppDTO.getUserId() != null){
+ neighborCircleDO.setReleaseId(addNeighborCircleAppDTO.getUserId());
+ }
+ if(addNeighborCircleAppDTO.getCommunityId() != null){
+ neighborCircleDO.setCommunityId(addNeighborCircleAppDTO.getCommunityId());
+ }
+ if(StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())){
+ neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone());
+ }
+ if(this.baseMapper.insert(neighborCircleDO) > 0){
+ return R.ok();
+ }else{
+ return R.fail("发布失败");
+ }
+ }
+
+ @Override
+ public R neighborDetailByApp(ComActNeighborCircleDetailAppDTO neighborCircleAppDTO){
+
+ //添加邻里圈浏览记录
+ comActNeighborCircleBrowseService.addBrowseRecord(neighborCircleAppDTO.getCircleId(),neighborCircleAppDTO.getUserId());
+
+ //查询邻里圈详情
+ ComActNeighborCircleDetailAppVO circleDetailAppVO = this.baseMapper.neighborDetailByApp(neighborCircleAppDTO.getCircleId());
+
+ //查询邻里圈下评论列表
+ IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage = comActNeighborCircleCommentDAO.pageNeighborCommentByApp(
+ new Page(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO.getCircleId());
+ if(!circleCommentAppPage.getRecords().isEmpty()){
+ for (ComActNeighborCircleCommentAppVO circleCommentVo:circleCommentAppPage.getRecords()) {
+ //查询评论下评论回复
+
+
+ }
+ }
+
+
+ return R.ok(circleDetailAppVO);
}
@Override
@@ -65,7 +134,7 @@
public R addNeighborByAdmin(AddNeighborCircleAdminVO addVO) {
ComActNeighborCircleDO comActNeighborCircleDO = new ComActNeighborCircleDO();
AdministratorsUserVO adminUser = this.baseMapper.selectUserByUserId(addVO.getUserId());
- if (adminUser == null) {
+ if(adminUser==null){
return R.fail("请登录重试");
}
comActNeighborCircleDO.setReleaseId(addVO.getUserId());
@@ -90,7 +159,7 @@
@Override
public R changeStatusByAdmin(EditNeighborCircleAdminVO editVO) {
ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(editVO.getId());
- if (neighborCircleDO == null) {
+ if(neighborCircleDO==null){
return R.fail("id有误！");
}
neighborCircleDO.setStatus(editVO.getStatus());
--
Gitblit v1.7.1