From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 177 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 114 insertions(+), 63 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 3d57ab8..c055873 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
@@ -71,6 +71,8 @@
private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ComActNeighborCircleTopicMapper comActNeighborCircleTopicMapper;
/**
* 分页查询邻里圈列表
@@ -83,16 +85,18 @@
IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
if(!doPager.getRecords().isEmpty()){
for (ComActNeighborCircleAppVO circleAppVO:doPager.getRecords()) {
- //查询点赞信息
- ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
- new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleAppVO.getId())
- .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
- .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)
- .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
- if(circleFabulousDO != null){
- circleAppVO.setHaveSign(1);
- }else{
- circleAppVO.setHaveSign(2);
+ if(neighborCircleAppDTO.getUserId() != null){
+ //查询点赞信息
+ ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleAppVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
+ if(circleFabulousDO != null){
+ circleAppVO.setHaveSign(1);
+ }else{
+ circleAppVO.setHaveSign(2);
+ }
}
if(circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
@@ -154,56 +158,65 @@
}
}
- //查询邻里圈点赞信息
- ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
- new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleDetailAppVO.getId())
- .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
- .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)
- .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
- if(circleFabulousDO != null){
- circleDetailAppVO.setHaveSign(1);
- }else{
- circleDetailAppVO.setHaveSign(2);
+ if(neighborCircleAppDTO.getUserId() != null){
+ //查询邻里圈点赞信息
+ ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleDetailAppVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
+ if(circleFabulousDO != null){
+ circleDetailAppVO.setHaveSign(1);
+ }else{
+ circleDetailAppVO.setHaveSign(2);
+ }
}
+
//查询邻里圈下评论列表
IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage = comActNeighborCircleCommentDAO.pageNeighborCommentByApp(
new Page(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO);
if(!circleCommentAppPage.getRecords().isEmpty()){
for (ComActNeighborCircleCommentAppVO circleCommentVo:circleCommentAppPage.getRecords()) {
- //查询点赞信息
- ComActNeighborCircleFabulousDO circleCommentFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
- new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleCommentVo.getId())
- .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
- .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl)
- .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
- if(circleCommentFabulousDO != null){
- circleCommentVo.setHaveSign(1);
- }else{
- circleCommentVo.setHaveSign(2);
+
+ if(neighborCircleAppDTO.getUserId() != null){
+ //查询点赞信息
+ ComActNeighborCircleFabulousDO circleCommentFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleCommentVo.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl)
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
+ if(circleCommentFabulousDO != null){
+ circleCommentVo.setHaveSign(1);
+ }else{
+ circleCommentVo.setHaveSign(2);
+ }
}
+
//查询评论下评论回复
List<ComActNeighborCircleCommentReplyAppVO> commentReplyAppVOS = comActNeighborCircleCommentReplyDAO.getCircleCommentReplyList(circleCommentVo.getId());
if(!commentReplyAppVOS.isEmpty()){
List<ComActNeighborCircleCommentReplyAppVO> newCommentReplyAppVOS = new ArrayList<>();
- int i = 0;
- for (ComActNeighborCircleCommentReplyAppVO commentReplyVO:commentReplyAppVOS) {
- if(i >= 2){
- break;
+ if(neighborCircleAppDTO.getUserId() != null){
+ int i = 0;
+ for (ComActNeighborCircleCommentReplyAppVO commentReplyVO:commentReplyAppVOS) {
+ if(i >= 2){
+ break;
+ }
+ //查询点赞信息
+ ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
+ if(circleReplyFabulousDO != null){
+ commentReplyVO.setHaveSign(1);
+ }else{
+ commentReplyVO.setHaveSign(2);
+ }
+ newCommentReplyAppVOS.add(commentReplyVO);
+ i++;
}
- //查询点赞信息
- ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
- new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyVO.getId())
- .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
- .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
- .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
- if(circleReplyFabulousDO != null){
- commentReplyVO.setHaveSign(1);
- }else{
- commentReplyVO.setHaveSign(2);
- }
- newCommentReplyAppVOS.add(commentReplyVO);
- i++;
}
circleCommentVo.setCircleCommentReplyAppList(newCommentReplyAppVOS);
circleCommentVo.setCommentReplyNum(commentReplyAppVOS.size());
@@ -239,7 +252,7 @@
comActNeighborCircleDO.setReleaseContent(addVO.getReleaseContent());
comActNeighborCircleDO.setReleaseImages(addVO.getReleaseImages());
comActNeighborCircleDO.setType(2);
- comActNeighborCircleDO.setStatus(1);
+ comActNeighborCircleDO.setStatus(2);
comActNeighborCircleDO.setCommentNum(0);
comActNeighborCircleDO.setFabulousNum(0);
comActNeighborCircleDO.setForwardNum(0);
@@ -276,6 +289,21 @@
public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
new Page<>(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO.getUserId());
+ if(!neighborCircleIPage.getRecords().isEmpty()) {
+ for (ComActNeighborCircleAppVO circleAppVO : neighborCircleIPage.getRecords()) {
+ //查询点赞信息
+ ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId, circleAppVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId, neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType, ComActNeighborCircleFabulousDO.type.llq)
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective, ComActNeighborCircleFabulousDO.isEffective.yes));
+ if (circleFabulousDO != null) {
+ circleAppVO.setHaveSign(1);
+ } else {
+ circleAppVO.setHaveSign(2);
+ }
+ }
+ }
return R.ok(neighborCircleIPage);
}
@@ -298,7 +326,8 @@
ComActNeighborCircleFabulousDO oldCircleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborFabulousAppDTO.type.llq)
.eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
- .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes)
+ .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId()));
if(oldCircleFabulousDO != null){
return R.fail("您已点赞");
}
@@ -359,8 +388,10 @@
@Override
public R neighborForwardByApp(ComActNeighborForwardAppDTO forwardAppDTO){
- //添加邻里圈浏览记录
- comActNeighborCircleBrowseService.addBrowseRecord(forwardAppDTO.getCircleId(),forwardAppDTO.getUserId());
+ if(forwardAppDTO.getUserId() != null){
+ //添加邻里圈浏览记录
+ comActNeighborCircleBrowseService.addBrowseRecord(forwardAppDTO.getCircleId(),forwardAppDTO.getUserId());
+ }
ComActNeighborCircleDO circleDO = this.baseMapper.selectById(forwardAppDTO.getCircleId());
if(circleDO == null){
@@ -523,13 +554,19 @@
@Override
public R detailNeighborByAdmin(Long id) {
ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(id);
- AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId());
if (comActNeighborCircleDO == null) {
return R.fail("id有误");
}
+ AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId());
DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
BeanUtils.copyProperties(comActNeighborCircleDO, vo);
vo.setReleaseName(user.getName());
+
+ //查询话题名称
+ if(comActNeighborCircleDO.getTopicId() != null){
+ ComActNeighborCircleTopicDO circleTopicDO = comActNeighborCircleTopicMapper.selectById(comActNeighborCircleDO.getTopicId());
+ vo.setTopicName(circleTopicDO.getName());
+ }
return R.ok(vo);
}
@@ -553,6 +590,17 @@
}
commentDO.setStatus(dto.getStatus());
neighborCircleCommentDAO.updateById(commentDO);
+
+ //查询邻里圈更新邻里圈评论数量
+ ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(commentDO.getCircleId());
+ if(neighborCircleDO != null){
+ if(dto.getStatus().equals(2)){
+ neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() - 1);
+ }else{
+ neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
+ }
+ this.baseMapper.updateById(neighborCircleDO);
+ }
return R.ok();
}
@@ -565,7 +613,8 @@
AdministratorsUserVO user = this.baseMapper.selectUserByUserId(commentDO.getUserId());
ComActNeighborCommentByAdminVO vo = new ComActNeighborCommentByAdminVO();
BeanUtils.copyProperties(commentDO,vo);
- vo.setUserName(user.getName());
+ String name = user.getName()==null?user.getNickName():user.getName();
+ vo.setUserName(name);
return R.ok(vo);
}
@@ -699,16 +748,18 @@
new Page<>(commentReplyAppDTO.getPageNum(),commentReplyAppDTO.getPageSize()),commentReplyAppDTO.getCommentId());
if(!neighborCircleIPage.getRecords().isEmpty()){
for (ComActNeighborCommentReplyAppVO commentReplyAppVO:neighborCircleIPage.getRecords()) {
- //查询点赞信息
- ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
- new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyAppVO.getId())
- .eq(ComActNeighborCircleFabulousDO::getUserId,commentReplyAppDTO.getUserId())
- .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
- .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
- if(circleFabulousDO != null){
- commentReplyAppVO.setHaveSign(1);
- }else{
- commentReplyAppVO.setHaveSign(2);
+ if(commentReplyAppDTO.getUserId() != null){
+ //查询点赞信息
+ ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyAppVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId,commentReplyAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
+ if(circleFabulousDO != null){
+ commentReplyAppVO.setHaveSign(1);
+ }else{
+ commentReplyAppVO.setHaveSign(2);
+ }
}
}
}
--
Gitblit v1.7.1