From b8c2fca1cb03f9978b10da12059df6051b681b48 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:25:20 +0800
Subject: [PATCH] 1111修改提交
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 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 58bb6ce..47d8e12 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,16 +1,30 @@
package com.panzhihua.applets.api;
-import java.util.*;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -23,9 +37,20 @@
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
+import com.panzhihua.common.model.vos.community.ComActActRegistVO;
+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.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
+import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
-import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
+import com.panzhihua.common.model.vos.user.UserArchivesVO;
+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;
@@ -72,6 +97,17 @@
if (!ObjectUtils.isEmpty(data)) {
LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
R r1 = communityService.detailHouse(userId);
+ if(StringUtils.isNotEmpty(loginUserInfoVO.getIdCard())){
+ //查询实名用户绑定的实有人口地址
+ R r4=communityService.selectByIdCard(loginUserInfoVO.getIdCard());
+ if(R.isOk(r4)){
+ String address= (String) r4.getData();
+ if(StringUtils.isNotEmpty(address)){
+ loginUserInfoVO.setAddress(address);
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
if (null != communityId && 0 != communityId) {
R r2 = communityService.detailCommunity(communityId);
if (R.isOk(r2)) {
@@ -252,6 +288,35 @@
if (!ObjectUtils.isEmpty(comActActivityVOS)) {
List<ComActActivityVO> collect = comActActivityVOS.stream()
.sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
+ //当前用户签到记录列表
+ R r2 = communityService.listSignInActivity(userId);
+ if (R.isOk(r2) && !ObjectUtils.isEmpty(r2.getData())) {
+ List<ComActActRegistVO> comActActRegistVOS = JSONArray.parseArray(JSONArray.toJSONString(r2.getData()), ComActActRegistVO.class).stream()
+ .sorted(Comparator.comparing(ComActActRegistVO::getCreateAt).reversed()).collect(toList());
+ collect.forEach(comActActivityVO -> {
+ ArrayList<ComActActRegistVO> currentList = new ArrayList<>();
+ comActActRegistVOS.forEach(activitySignInVO -> {
+ if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
+ currentList.add(activitySignInVO);
+ }
+ });
+ if (currentList.size() > 10) {
+ comActActivityVO.setActivitySignInList(currentList.subList(0, 10));
+ } else {
+ comActActivityVO.setActivitySignInList(currentList);
+ }
+ });
+ }
+ //当前用户活动评分
+ R r3 = communityService.listEvaluate(userId);
+ if (R.isOk(r3) && !ObjectUtils.isEmpty(r3.getData())) {
+ List<ComActActEvaluateVO> comActActEvaluateVOS = JSONArray.parseArray(JSONArray.toJSONString(r3.getData()), ComActActEvaluateVO.class);
+ collect.forEach(comActActivityVO -> comActActEvaluateVOS.forEach(comActActEvaluateVO -> {
+ if (comActActEvaluateVO.getActivityId().equals(comActActivityVO.getId())) {
+ comActActivityVO.setMyRating(comActActEvaluateVO.getStarLevel());
+ }
+ }));
+ }
return R.ok(collect);
}
return R.ok(comActActivityVOS);
--
Gitblit v1.7.1