From 34e50f2c23ff7cc7f0dbf2a40e3d038b30aec12f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 24 七月 2021 13:47:30 +0800
Subject: [PATCH] 测试社区动态
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 8fb47aa..e2ba422 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
@@ -56,17 +56,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);
}
@@ -136,7 +142,7 @@
return R.fail("人员类型错误");
}
activitySignVO.setType(type);
- return communityService.listActivitySign(activitySignVO);
+ return communityService.listActivitySigns(activitySignVO);
}
// @ApiOperation(value = "新增社区动态浏览记录")
@@ -155,6 +161,7 @@
public R addVolunteer(@RequestBody @Validated(AddGroup.class) ComMngVolunteerMngVO comMngVolunteerMngVO){
comMngVolunteerMngVO.setState(1);
comMngVolunteerMngVO.setCommunityId(this.getCommunityId());
+ comMngVolunteerMngVO.setSubmitUserId(this.getUserId());
return communityService.addVolunteer(comMngVolunteerMngVO);
}
@@ -178,7 +185,7 @@
@ApiOperation(value = "车辆登记")
@PostMapping("car/register")
- public R addComMngCar(@RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {
+ public R addComMngCar(@Validated(AddGroup.class) @RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
if (null!=communityId && 0!=communityId) {
--
Gitblit v1.7.1