From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
index dd6a607..1637fba 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
@@ -59,6 +59,11 @@
public R addDiscuss(ComActDiscussDTO comActDiscussDTO) {
ComActDiscussDO comActDiscussDO=new ComActDiscussDO();
BeanUtils.copyProperties(comActDiscussDTO,comActDiscussDO);
+ ComActVO comActVO=comActDiscussDAO.selectCommunity(comActDiscussDTO.getCommunityId());
+ String address = comActDiscussDO.getAddress();
+ if (ObjectUtils.isEmpty(address)) {
+ comActDiscussDO.setAddress(comActVO.getAddress());
+ }
int insert = comActDiscussDAO.insert(comActDiscussDO);
if (insert>0) {
ComActDiscussDO comActDiscussDO1 = comActDiscussDAO.selectOne(new QueryWrapper<ComActDiscussDO>().lambda().eq(ComActDiscussDO::getDiscussSubject, comActDiscussDTO.getDiscussSubject()).eq(ComActDiscussDO::getUserId, comActDiscussDTO.getUserId()).last(" order by create_at desc limit 1 "));
@@ -313,6 +318,7 @@
Page page = new Page<>();
Long pageNum = pageComActDiscussDTO.getPageNum();
Long pageSize = pageComActDiscussDTO.getPageSize();
+ Long loginUserId = pageComActDiscussDTO.getLoginUserId();
if (null==pageNum||0==pageNum) {
pageNum = 1l;
}
@@ -340,6 +346,15 @@
});
comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS);
}
+ Integer integer = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getDiscussId, comActDiscussVO.getId()).eq(ComActDiscussUserDO::getUserId, loginUserId));
+ if (integer>0) {
+ comActDiscussVO.setHaveSign(1);
+ }else{
+ comActDiscussVO.setHaveSign(0);
+ }
+// 判断是否已经投票
+ int haveVote=comActDiscussOptionUserDAO.selectHaveVote(id,loginUserId);
+ comActDiscussVO.setHaveVote(haveVote>0?1:0);
});
}
return R.ok(iPage);
@@ -408,9 +423,22 @@
String userName = collect1.get(0).getUserName();
comActDiscussCommentVO1.setUserNameBack(userName);
}
+ Integer integer = comActDiscussCommentUserDAO.selectCount(new QueryWrapper<ComActDiscussCommentUserDO>().lambda().eq(ComActDiscussCommentUserDO::getDisscussCommentId, comActDiscussCommentVO1.getId()).eq(ComActDiscussCommentUserDO::getUserId, pageComActDiscussCommentDTO.getLoginUserId()));
+ if (integer>0) {
+ comActDiscussCommentVO1.setHaveSign(1);
+ }else {
+ comActDiscussCommentVO1.setHaveSign(0);
+ }
});
comActDiscussCommentVO.setComActDiscussCommentVOList(comActDiscussCommentVOList);
}
+ Integer integer = comActDiscussCommentUserDAO.selectCount(new QueryWrapper<ComActDiscussCommentUserDO>().lambda().eq(ComActDiscussCommentUserDO::getDisscussCommentId, comActDiscussCommentVO.getId()).eq(ComActDiscussCommentUserDO::getUserId, pageComActDiscussCommentDTO.getLoginUserId()));
+ if (integer>0) {
+ comActDiscussCommentVO.setHaveSign(1);
+ }else {
+ comActDiscussCommentVO.setHaveSign(0);
+ }
+
});
}
return R.ok(iPage);
@@ -420,10 +448,11 @@
* 一起议-详情 小程序
*
* @param id 主键
+ * @param loginUserId 登录用户主键
* @return ComActDiscussVO
*/
@Override
- public R detailDiscussApplets(Long id) {
+ public R detailDiscussApplets(Long id, Long loginUserId) {
ComActDiscussDO comActDiscussDO = comActDiscussDAO.selectById(id);
if (ObjectUtils.isEmpty(comActDiscussDO)) {
return R.fail("一起议不存在");
@@ -458,6 +487,9 @@
ComActVO comActVO=comActDiscussDAO.selectCommunity(communityId);
comActDiscussVO.setUserName(comActVO.getName());
}
+ ComActDiscussVO comActDiscussVO1=comActDiscussDAO.selectHaveSignAndHaveVote(id,loginUserId);
+ comActDiscussVO.setHaveSign(comActDiscussVO1.getHaveSign());
+ comActDiscussVO.setHaveVote(comActDiscussVO1.getHaveVote());
return R.ok(comActDiscussVO);
}
@@ -491,4 +523,32 @@
}
return R.fail();
}
+
+ /**
+ * 一起议-评论-点赞、取消点赞
+ *
+ * @param comActDiscussCommentUserDTO 评论点赞
+ * @return 点赞结果
+ */
+ @Override
+ public R putDiscussCommentUser(ComActDiscussCommentUserDTO comActDiscussCommentUserDTO) {
+ ComActDiscussCommentDO comActDiscussCommentDO = comActDiscussCommentDAO.selectById(comActDiscussCommentUserDTO.getId());
+ if (ObjectUtils.isEmpty(comActDiscussCommentDO)) {
+ return R.fail("评论不存在");
+ }
+ Integer type = comActDiscussCommentUserDTO.getType();
+ int num=0;
+ if (type.intValue()==1) {
+ ComActDiscussCommentUserDO comActDiscussCommentUserDO=new ComActDiscussCommentUserDO();
+ comActDiscussCommentUserDO.setUserId(comActDiscussCommentUserDTO.getUserId());
+ comActDiscussCommentUserDO.setDisscussCommentId(comActDiscussCommentUserDTO.getId());
+ num=comActDiscussCommentUserDAO.insert(comActDiscussCommentUserDO);
+ } else {
+ num=comActDiscussCommentUserDAO.delete(new QueryWrapper<ComActDiscussCommentUserDO>().lambda().eq(ComActDiscussCommentUserDO::getUserId,comActDiscussCommentUserDTO.getUserId()).eq(ComActDiscussCommentUserDO::getDisscussCommentId,comActDiscussCommentUserDTO.getId()));
+ }
+ if (num>0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
}
--
Gitblit v1.7.1