From d9eee1919dbff7ffddc48b1f4fee2ec41a54a2a2 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 05 一月 2021 18:19:52 +0800
Subject: [PATCH] 运营后台完成
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 131 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 insertions(+), 4 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 0c7f171..5aa0757 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,10 +1,13 @@
package com.panzhihua.applets.api;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+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.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;
@@ -19,7 +22,11 @@
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
@@ -35,17 +42,42 @@
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();
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ Long userId = loginUserInfo.getUserId();
+ Long areaId = loginUserInfo.getAreaId();
R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
if (R.isOk(r)) {
Object data = r.getData();
if (!ObjectUtils.isEmpty(data)) {
LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO) data;
R r1 = communityService.detailHouse(userId);
+ if (null!=communityId&&0!=communityId) {
+ R r2=communityService.detailCommunity(communityId);
+ if (R.isOk(r2)) {
+ Object data1 = r2.getData();
+ if (!ObjectUtils.isEmpty(data1)) {
+ loginUserInfoVO.setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComActVO.class));
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
+ if (null!=areaId&&areaId!=0) {
+ R r3=communityService.detailArea(areaId);
+ if (R.isOk(r3)) {
+ Object data1 = r3.getData();
+ if (!ObjectUtils.isEmpty(data1)) {
+ loginUserInfoVO.setComMngStructAreaVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComMngStructAreaVO.class));
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
if (R.isOk(r1)) {
Object data1 = r1.getData();
if (!ObjectUtils.isEmpty(data1)) {
@@ -60,7 +92,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);
@@ -135,4 +167,95 @@
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.setLogInUserId(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);
+ }
+
+ @ApiOperation(value = "调试接口--清除昵称、社区、小区" )
+ @DeleteMapping("usertest")
+ public R deleteUserTest() {
+ Long userId = this.getUserId();
+ 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