From f09fa3541ad18c00f30707f592f16d18a0537f77 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 17 八月 2021 21:54:51 +0800
Subject: [PATCH] [新增]添加监控依赖包
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
index ef2cd14..95f0613 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -4,6 +4,7 @@
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
@@ -75,13 +76,16 @@
@ApiOperation(value = "一起议-分页查询",response = ComActDiscussVO.class)
@PostMapping("pagediscuss")
public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
- Integer isMy = pageComActDiscussDTO.getIsMy();
- if (null!=isMy&&isMy.intValue()==1) {
- pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
+ pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
+
+ Integer isMy = pageComActDiscussDTO.getIsMy();
+ if (null!=isMy&&isMy.intValue()==1) {
+ pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
+ }
}
- pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
return communityService.pageDiscussApplets(pageComActDiscussDTO);
}
@@ -97,6 +101,10 @@
return R.fail("一起议主键不能为空");
}
comActDiscussCommentDTO.setUserId(this.getUserId());
+ //议事投票计算积分
+ AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(discussId,AddComActIntegralUserDTO.integralType.cyystp,this.getCommunityId(),this.getUserId());
+ integralUserDTO.setIsComment(1);
+ communityService.addIntegralTradeAdmin(integralUserDTO);
return communityService.addDiscussComment(comActDiscussCommentDTO);
}
@@ -119,7 +127,11 @@
@GetMapping("discuss")
@ApiImplicitParam(name = "id",value = "一起议主键",required = true)
public R detailDiscuss(@RequestParam("id") Long id) {
- Long userId = this.getUserId();
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
return communityService.detailDiscussApplets(id,userId);
}
@@ -130,7 +142,12 @@
if (null==id||0==id) {
return R.fail("一起议主键不能为空");
}
- pageComActDiscussCommentDTO.setLoginUserId(this.getUserId());
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
+ pageComActDiscussCommentDTO.setLoginUserId(userId);
return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
}
@@ -159,6 +176,10 @@
ComActDiscussOptionUserDTO comActDiscussOptionUserDTO=new ComActDiscussOptionUserDTO();
comActDiscussOptionUserDTO.setDiscussOptionId(id);
comActDiscussOptionUserDTO.setUserId(this.getUserId());
+ //议事投票计算积分
+ AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(id,AddComActIntegralUserDTO.integralType.cyystp,this.getCommunityId(),this.getUserId());
+ integralUserDTO.setIsComment(2);
+ communityService.addIntegralTradeAdmin(integralUserDTO);
return communityService.addDiscussOptionUser(comActDiscussOptionUserDTO);
}
--
Gitblit v1.7.1