From 37f55403e7573d8c15b6b0f957b7cb1baf6be4ea Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 29 十二月 2020 14:47:15 +0800
Subject: [PATCH] 攀枝花项目服务层异常捕获统一返回给视图层服务
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 94 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 85 insertions(+), 9 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 78f253e..fc15e02 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
@@ -1,23 +1,33 @@
package com.panzhihua.applets.api;
+import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.exceptions.UnAuthenticationException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -33,15 +43,13 @@
private UserService userService;
@Resource
private CommunityService communityService;
+ @Resource
+ private PartyBuildingService partyBuildingService;
@ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
@GetMapping("info")
public R getUserInfo() {
Long userId = this.getUserId();
- boolean empty = ObjectUtils.isEmpty(userId);
- if (empty) {
- throw new UnAuthenticationException();
- }
R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
if (R.isOk(r)) {
Object data = r.getData();
@@ -62,7 +70,7 @@
@ApiOperation(value = "用户实名认证")
@PutMapping("putuserauthentication")
- public R putUserAuthentication(@RequestBody LoginUserInfoVO loginUserInfoVO) {
+ public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) {
Long userId = this.getUserId();
loginUserInfoVO.setUserId(userId);
return userService.putUserAuthentication(loginUserInfoVO);
@@ -80,7 +88,7 @@
return r;
}
- @ApiOperation(value = "修改用户手机号")
+ @ApiOperation(value = "修改用户信息")
@PutMapping("user")
public R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
Long userId = this.getUserId();
@@ -101,7 +109,7 @@
@ApiOperation(value = "新增房屋")
@PostMapping("houses")
- public R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO) {
+ public R addHouses(@RequestBody @Validated(AddGroup.class) ComMngStructHouseVO comMngStructHouseVO) {
String houseCode = comMngStructHouseVO.getHouseCode();
if (ObjectUtils.isEmpty(houseCode)) {
return R.fail("房屋地址编码不能为空");
@@ -120,8 +128,8 @@
}
@ApiOperation(value = "新增家庭成员")
- @GetMapping("addfamily")
- public R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) {
+ @PostMapping("addfamily")
+ public R addFamily(@RequestBody @Validated(AddGroup.class) ComMngFamilyInfoVO comMngFamilyInfoVO) {
Long userId = this.getUserId();
comMngFamilyInfoVO.setUserId(userId);
return userService.addFamily(comMngFamilyInfoVO);
@@ -134,6 +142,74 @@
if (null==id||0==id) {
return R.fail("成员主键不能为空");
}
+ comMngFamilyInfoVO.setUserId(this.getUserId());
return userService.putFamily(comMngFamilyInfoVO);
}
+
+ @ApiOperation(value = "我的活动",response =ComActActivityVO.class )
+ @GetMapping("listactivity")
+ public R listActivity() {
+ Long userId = this.getUserId();
+ List<ComActActivityVO> comActActivityVOS=new ArrayList<>();
+ R r=communityService.listActivity(userId);
+ if (R.isOk(r)) {
+ comActActivityVOS =(List<ComActActivityVO>) r.getData();
+ }
+ R r1=partyBuildingService.listActivity(userId);
+ if (R.isOk(r1)) {
+ List<ComActActivityVO> data = (List<ComActActivityVO>) r1.getData();
+ comActActivityVOS.addAll(data);
+ }
+ if (!ObjectUtils.isEmpty(comActActivityVOS)) {
+ String s = JSONArray.toJSONString(comActActivityVOS);
+ List<ComActActivityVO>comActActivityVOS1=new ArrayList<>();
+ comActActivityVOS1=JSONArray.parseArray(s,ComActActivityVO.class);
+ List<ComActActivityVO> collect = comActActivityVOS1.stream().sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList());
+ comActActivityVOS=collect;
+ }
+ return R.ok(comActActivityVOS);
+ }
+
+ @ApiOperation(value = "分页查询我的随手拍",response = ComActEasyPhotoVO.class )
+ @PostMapping("pageeasyphoto")
+ public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ Long userId = this.getUserId();
+ comActEasyPhotoVO.setUserId(userId);
+ comActEasyPhotoVO.setCommunityId(null);
+ return communityService.pageEasyPhoto(comActEasyPhotoVO);
+ }
+
+ @ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class )
+ @PostMapping("pagemicrowish")
+ public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ Long userId = this.getUserId();
+ comActMicroWishVO.setUserId(userId);
+ comActMicroWishVO.setCommunityId(null);
+ return communityService.pageMicroWish(comActMicroWishVO);
+ }
+
+ @ApiOperation(value = "用户确认心愿" )
+ @PutMapping("microwishconfirm")
+ public R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ Long userId = this.getUserId();
+ comActMicroWishVO.setUserId(userId);
+ comActMicroWishVO.setCommunityId(null);
+ Long id = comActMicroWishVO.getId();
+ if (null==id||0==id) {
+ return R.fail("心愿主键不能为空");
+ }
+ String evaluate = comActMicroWishVO.getEvaluate();
+ if (ObjectUtils.isEmpty(evaluate)) {
+ return R.fail("用户评价不能为空");
+ }
+ Integer score = comActMicroWishVO.getScore();
+ if (null==score||0==score) {
+ return R.fail("评分不能为空");
+ }
+ comActMicroWishVO.setEvaluateAt(new Date());
+ comActMicroWishVO.setStatus(6);
+ return communityService.putMicroWishConfirm(comActMicroWishVO);
+ }
+
+
}
--
Gitblit v1.7.1