From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期三, 22 九月 2021 11:30:47 +0800 Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) 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..b573b35 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,String name){ + return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero,name)); } + /** + * 小程序-用户新增话题 + * @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); + } } -- Gitblit v1.7.1