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/CommunityApi.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 5f31f64..88f8d53 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -45,8 +45,10 @@
@ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
@PostMapping("pagedynamic")
public R pageDynamic(@RequestBody ComActDynVO comActDynVO){
- Long communityId = this.getCommunityId();
- comActDynVO.setCommunityId(communityId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ comActDynVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
comActDynVO.setIsTopping(null);
comActDynVO.setStatus(1);
return communityService.pageDynamic(comActDynVO);
@@ -56,17 +58,23 @@
@GetMapping("detaildynamic")
@ApiImplicitParam(name ="id",value = "社区动态主键",required = true)
public R detailDynamic(@RequestParam("id") Long id){
- Long userId = this.getUserId();
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = null;
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
R r = communityService.detailDynamic(id);
if (R.isOk(r)) {
- //增加浏览记录
- R r1 = communityService.addDynamicUser(id, userId);
Object data = r.getData();
ComActDynVO comActDynVO=JSONObject.parseObject(JSONObject.toJSONString(data),ComActDynVO.class);
- if (R.isOk(r1)) {
- comActDynVO.setIsAdd(1);
- }else{
- comActDynVO.setIsAdd(0);
+ if(userId != null){
+ //增加浏览记录
+ R r1 = communityService.addDynamicUser(id, userId);
+ if (R.isOk(r1)) {
+ comActDynVO.setIsAdd(1);
+ }else{
+ comActDynVO.setIsAdd(0);
+ }
}
return R.ok(comActDynVO);
}
@@ -76,8 +84,10 @@
@ApiOperation(value = "分页查询社区活动",response = ComActActivityVO.class)
@PostMapping("pageactivity")
public R pageActivity(@RequestBody ComActActivityVO comActActivityVO){
- Long communityId = this.getCommunityId();
- comActActivityVO.setCommunityId(communityId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
comActActivityVO.setIsApplets(1);
Integer status = comActActivityVO.getStatus();
if (null!=status&&status.intValue()==4) {
@@ -90,7 +100,11 @@
@GetMapping("detailactivity")
@ApiImplicitParam(name ="id",value = "社区活动主键",required = true)
public R detailActivity(@RequestParam("id") Long id){
- Long userId = this.getUserId();
+ Long userId = null;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
return communityService.detailActivity(id,userId);
}
@@ -136,7 +150,7 @@
return R.fail("人员类型错误");
}
activitySignVO.setType(type);
- return communityService.listActivitySign(activitySignVO);
+ return communityService.listActivitySigns(activitySignVO);
}
// @ApiOperation(value = "新增社区动态浏览记录")
@@ -162,9 +176,14 @@
@ApiOperation(value = "分页查询志愿者团队",response = ComMngVolunteerMngVO.class)
@PostMapping("pagevolunteer")
public R pageVolunteer(@RequestBody @Validated(PageGroup.class) PageVolunteerDTO pageVolunteerDTO){
- Long communityId = this.getCommunityId();
ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
- comMngVolunteerMngVO.setCommunityId(communityId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ comMngVolunteerMngVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+// Long communityId = this.getCommunityId();
+
+// comMngVolunteerMngVO.setCommunityId(communityId);
comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum());
comMngVolunteerMngVO.setPageSize(pageVolunteerDTO.getPageSize());
return communityService.pageVolunteer(comMngVolunteerMngVO);
--
Gitblit v1.7.1