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/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index cc4180b..46da1b7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -2,8 +2,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
@@ -16,6 +18,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -33,6 +36,7 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-11-24 12:03
**/
+@Slf4j
@RestController
@RequestMapping("/user/")
@Api(tags = {"我的模块"})
@@ -94,7 +98,26 @@
public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) {
Long userId = this.getUserId();
loginUserInfoVO.setUserId(userId);
- return userService.putUserAuthentication(loginUserInfoVO);
+ R r = userService.putUserAuthentication(loginUserInfoVO);
+ if (R.isOk(r)) {
+ //通过不发通知
+ } else {
+ SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(userId);
+ sysUserNoticeVO.setType(3);
+ sysUserNoticeVO.setTitle("实名制审核未通过");
+ sysUserNoticeVO.setBusinessType(6);
+// sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
+ sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
+// sysUserNoticeVO.setBusinessId(activityId);R
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setBusinessStatus(1);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+ return r;
}
@ApiOperation(value = "修改用户手机号")
@@ -170,13 +193,15 @@
@ApiOperation(value = "我的活动",response =ComActActivityVO.class )
@GetMapping("listactivity")
public R listActivity() {
- Long userId = this.getUserId();
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
List<ComActActivityVO> comActActivityVOS=new ArrayList<>();
R r=communityService.listActivity(userId);
if (R.isOk(r)) {
comActActivityVOS =(List<ComActActivityVO>) r.getData();
}
- R r1=partyBuildingService.listActivity(userId);
+ R r1=partyBuildingService.listActivity(userId,communityId);
if (R.isOk(r1)) {
List<ComActActivityVO> data = (List<ComActActivityVO>) r1.getData();
comActActivityVOS.addAll(data);
@@ -188,6 +213,10 @@
List<ComActActivityVO> collect = comActActivityVOS1.stream().sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList());
comActActivityVOS=collect;
}
+ if (!ObjectUtils.isEmpty(comActActivityVOS)) {
+ List<ComActActivityVO> collect = comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
+ return R.ok(collect);
+ }
return R.ok(comActActivityVOS);
}
@@ -195,10 +224,9 @@
@PostMapping("pageeasyphoto")
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
Long userId = this.getUserId();
- comActEasyPhotoVO.setUserId(userId);
- comActEasyPhotoVO.setLogInUserId(userId);
+ comActEasyPhotoVO.setSponsorId(userId);
comActEasyPhotoVO.setCommunityId(null);
- return communityService.pageEasyPhoto(comActEasyPhotoVO);
+ return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
}
@ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class )
@@ -207,6 +235,13 @@
Long userId = this.getUserId();
comActMicroWishVO.setUserId(userId);
comActMicroWishVO.setCommunityId(null);
+ Integer status = comActMicroWishVO.getStatus();
+ if (null!=status&&status==1) {
+ comActMicroWishVO.setIsPageMyWish(1);
+ }else{
+ comActMicroWishVO.setIsPageMyWish(null);
+ }
+
return communityService.pageMicroWish(comActMicroWishVO);
}
@@ -240,5 +275,21 @@
return userService.deleteUserTest(userId);
}
+ @ApiOperation(value = "意见反馈" )
+ @PostMapping("feedback")
+ public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ Long areaId = loginUserInfo.getAreaId();
+ if (null==communityId||0==communityId) {
+ return R.fail("未绑定社区");
+ }
+ sysUserFeedbackDTO.setCommunityId(communityId);
+ sysUserFeedbackDTO.setAreaId(areaId);
+ sysUserFeedbackDTO.setUserId(userId);
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
}
--
Gitblit v1.7.1