From 96b3cff1b3af96927618cae7cbd69bcb1ad718c5 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 22 二月 2022 15:09:18 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 322 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 212 insertions(+), 110 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 f425801..99ecce8 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,36 +1,67 @@
package com.panzhihua.applets.api;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.panzhihua.applets.weixin.CheckService;
-import com.panzhihua.applets.model.dtos.ComPbMemberCertificationDTO;
-import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
-import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
-import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
-import com.panzhihua.common.model.vos.user.*;
-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.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 lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import static java.util.stream.Collectors.toList;
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.constants.HttpStatus;
+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.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;
+import com.panzhihua.applets.model.dtos.ComPbMemberCertificationDTO;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.SecurityConstants;
+import com.panzhihua.common.constants.UserConstants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
+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.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.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;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -51,6 +82,8 @@
private PartyBuildingService partyBuildingService;
@Resource
private CheckService checkService;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
@ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
@GetMapping("info")
@@ -64,24 +97,41 @@
if (R.isOk(r)) {
Object data = r.getData();
if (!ObjectUtils.isEmpty(data)) {
- LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO) data;
+ LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
+ //是否保存unionid
+// if (Objects.isNull(loginUserInfoVO.getUnionid()) || "无".equals(loginUserInfoVO.getUnionid())) {
+// return R.fail(HttpStatus.UNAUTHORIZED, "token过期");
+// }
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));
+ 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!=areaId&&areaId!=0) {
- R r3=communityService.detailArea(areaId);
+ 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));
+ loginUserInfoVO.setComMngStructAreaVO(
+ JSONObject.parseObject(JSONObject.toJSONString(data1), ComMngStructAreaVO.class));
r.setData(loginUserInfoVO);
}
}
@@ -89,7 +139,7 @@
if (R.isOk(r1)) {
Object data1 = r1.getData();
if (!ObjectUtils.isEmpty(data1)) {
- loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>) data1);
+ loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>)data1);
r.setData(loginUserInfoVO);
}
}
@@ -103,10 +153,11 @@
public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) {
Long userId = this.getUserId();
loginUserInfoVO.setUserId(userId);
+ loginUserInfoVO.setCommunityId(this.getCommunityId());
R r = userService.putUserAuthentication(loginUserInfoVO);
if (R.isOk(r)) {
- //通过发通知
- SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
+ // 通过发通知
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
sysUserNoticeVO.setUserId(userId);
sysUserNoticeVO.setType(3);
sysUserNoticeVO.setTitle("实名制审核通过");
@@ -118,21 +169,19 @@
if (R.isOk(r1)) {
log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
}
+ // 清空缓存
+ String userRoleKey = UserConstants.LOGIN_USER_INFO + this.getLoginUserInfo().getUserId();
+ String userAppletRoleKey = SecurityConstants.ROLE_APPLETS_USER + this.getLoginUserInfo().getUserId();
+ stringRedisTemplate.delete(userRoleKey);
+ stringRedisTemplate.delete(userAppletRoleKey);
} else {
- //未通过发通知
+ // 未通过发通知
/**
- SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
- sysUserNoticeVO.setUserId(userId);
- sysUserNoticeVO.setType(3);
- sysUserNoticeVO.setTitle("实名制审核未通过");
- sysUserNoticeVO.setBusinessType(6);
- sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
- sysUserNoticeVO.setStatus(0);
- sysUserNoticeVO.setBusinessStatus(1);
- R r1 = userService.addNotice(sysUserNoticeVO);
- if (R.isOk(r1)) {
- log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
- }
+ * SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO(); sysUserNoticeVO.setUserId(userId);
+ * sysUserNoticeVO.setType(3); sysUserNoticeVO.setTitle("实名制审核未通过"); sysUserNoticeVO.setBusinessType(6);
+ * sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg())); sysUserNoticeVO.setStatus(0);
+ * sysUserNoticeVO.setBusinessStatus(1); R r1 = userService.addNotice(sysUserNoticeVO); if (R.isOk(r1)) {
+ * log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO)); }
*/
}
return r;
@@ -162,7 +211,7 @@
@PostMapping("editUserTips")
public R putUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
Long userId = this.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登录");
}
userEditTipsDTO.setUserId(userId);
@@ -171,13 +220,13 @@
@ApiOperation(value = "房屋地址下拉列表")
@GetMapping("listhouse")
- @ApiImplicitParam(name = "parentCode",value = "父级地址编码",required = false)
+ @ApiImplicitParam(name = "parentCode", value = "父级地址编码", required = false)
public R listHouses(String parentCode) {
Long areaId = this.getAreaId();
if (ObjectUtils.isEmpty(parentCode)) {
- parentCode="";
+ parentCode = "";
}
- return communityService.listHouses(parentCode,areaId);
+ return communityService.listHouses(parentCode, areaId);
}
@ApiOperation(value = "新增房屋")
@@ -195,9 +244,9 @@
@ApiOperation(value = "家庭成员列表")
@GetMapping("listfamily")
- public R listFamily() {
+ public R listFamily(@RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize) {
Long userId = this.getUserId();
- return userService.listFamily(userId);
+ return userService.listFamily(userId, pageNum, pageSize);
}
@ApiOperation(value = "新增家庭成员")
@@ -212,44 +261,76 @@
@PutMapping("putfamily")
public R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) {
Long id = comMngFamilyInfoVO.getId();
- if (null==id||0==id) {
+ if (null == id || 0 == id) {
return R.fail("成员主键不能为空");
}
comMngFamilyInfoVO.setUserId(this.getUserId());
return userService.putFamily(comMngFamilyInfoVO);
}
- @ApiOperation(value = "我的活动",response =ComActActivityVO.class )
+ @ApiOperation(value = "我的活动", response = ComActActivityVO.class)
+ @ApiImplicitParam(name = "status", value = "活动状态（4 进行中 5 已结束 6 已取消）", required = false)
@GetMapping("listactivity")
- public R listActivity() {
+ public R listActivity(@RequestParam(value = "status", required = false) Integer status) {
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();
+ List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
+ R r = communityService.listActivity(userId, status);
+ if (R.isOk(r)&&r.getData()!=null) {
+ comActActivityVOS = (List<ComActActivityVO>)r.getData();
}
- R r1=partyBuildingService.listActivity(userId,communityId);
- if (R.isOk(r1)) {
- List<ComActActivityVO> data = (List<ComActActivityVO>) r1.getData();
+ R r1 = partyBuildingService.listActivity(userId, communityId, status);
+ if (R.isOk(r1)&&r1.getData()!=null) {
+ 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;
+ 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;
}
if (!ObjectUtils.isEmpty(comActActivityVOS)) {
- List<ComActActivityVO> collect = comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
+ 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);
}
- @ApiOperation(value = "分页查询我的随手拍",response = ComActEasyPhotoVO.class )
+ @ApiOperation(value = "分页查询我的随手拍", response = ComActEasyPhotoVO.class)
@PostMapping("pageeasyphoto")
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
Long userId = this.getUserId();
@@ -258,38 +339,34 @@
return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
}
- @ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class )
+ @ApiOperation(value = "分页查询我的微心愿", response = ComActMicroWishVO.class)
@PostMapping("pagemicrowish")
public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
Long userId = this.getUserId();
comActMicroWishVO.setUserId(userId);
comActMicroWishVO.setCommunityId(null);
Integer status = comActMicroWishVO.getStatus();
- if (null!=status&&status==1) {
+ if (null != status && status == 1) {
comActMicroWishVO.setIsPageMyWish(1);
- }else{
+ } else {
comActMicroWishVO.setIsPageMyWish(null);
}
return communityService.pageMicroWish(comActMicroWishVO);
}
- @ApiOperation(value = "用户确认心愿" )
+ @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) {
+ 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) {
+ if (null == score || 0 == score) {
return R.fail("评分不能为空");
}
comActMicroWishVO.setEvaluateAt(new Date());
@@ -297,17 +374,17 @@
return communityService.putMicroWishConfirm(comActMicroWishVO);
}
- @ApiOperation(value = "调试接口--清除昵称、社区、小区" )
+ @ApiOperation(value = "调试接口--清除昵称、社区、小区")
@DeleteMapping("usertest")
public R deleteUserTest() {
Long userId = this.getUserId();
return userService.deleteUserTest(userId);
}
- @ApiOperation(value = "意见反馈" )
+ @ApiOperation(value = "意见反馈")
@PostMapping("feedback")
public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) {
- // 微信内容审核
+ // 微信内容审核
String msg = sysUserFeedbackDTO.getContent();
if (!checkService.checkMessage(msg)) {
return R.fail("内容违规");
@@ -316,7 +393,7 @@
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
Long areaId = loginUserInfo.getAreaId();
- if (null==communityId||0==communityId) {
+ if (null == communityId || 0 == communityId) {
return R.fail("未绑定社区");
}
sysUserFeedbackDTO.setCommunityId(communityId);
@@ -325,41 +402,52 @@
return userService.addFeedback(sysUserFeedbackDTO);
}
- @ApiOperation(value = "党员认证" )
+ @ApiOperation(value = "党员认证")
@PostMapping("partybuildingembercertification")
- public R partybuildingembercertification(@RequestBody @Validated(AddGroup.class) ComPbMemberCertificationDTO comPbMemberCertificationDTO) {
- //totest 党员认证
+ public R partybuildingembercertification(
+ @RequestBody @Validated(AddGroup.class) ComPbMemberCertificationDTO comPbMemberCertificationDTO) {
+ // 党员认证
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
- if (null==communityId||0==communityId) {
+ if (null == communityId || 0 == communityId) {
return R.fail("未绑定社区");
}
- //判断用户是否已认证成功
+ // 判断用户是否已认证成功
R certUser = partyBuildingService.userCertification(userId);
Object certUserInfo = certUser.getData();
- boolean userCertified = false;
- if(certUserInfo!=null){
- PartyBuildingMemberVO certUserVo = (PartyBuildingMemberVO) certUserInfo;
- //已认证党员身份，直接返回
- userCertified = certUserVo.getAuditResult()==1;
+ AtomicBoolean userCertified = new AtomicBoolean(false);
+ if (R.isOk(certUser) && certUserInfo != null) {
+ try {
+ List<PartyBuildingMemberVO> partyBuildingMemberVOList =
+ JSONArray.parseArray(JSONArray.toJSONString(certUser.getData()), PartyBuildingMemberVO.class);
+ // 已认证党员身份，直接返回
+ if (partyBuildingMemberVOList != null && partyBuildingMemberVOList.size() > 0) {
+ partyBuildingMemberVOList.forEach(vo -> {
+ userCertified.set(vo.getAuditResult() == 1);
+ });
+ }
+ } catch (Exception e) {
+ }
}
- //匹配手机，验证是否进行自动确认
- if(userCertified){
- return R.fail("用户已完成党员认证");
+ // 匹配手机，验证是否进行自动确认
+ if (userCertified.get()) {
+ return R.fail("您已审核通过，无需重复提交");
}
PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
BeanUtils.copyProperties(comPbMemberCertificationDTO, partyBuildingMemberVO);
+ partyBuildingMemberVO.setAuditResult(0);
+ partyBuildingMemberVO.setCommunityId(communityId);
- //用户实名认证信息判断
+ // 用户实名认证信息判断
String idCard = loginUserInfo.getIdCard();
partyBuildingMemberVO.setUserId(userId);
- if(idCard==null) {
+ if (idCard == null) {
return R.fail("用户未完成实名认证");
- }else{
+ } else {
partyBuildingMemberVO.setIdCard(loginUserInfo.getIdCard());
partyBuildingMemberVO.setName(loginUserInfo.getName());
}
@@ -368,21 +456,35 @@
return r;
}
- @ApiOperation(value = "党员认证查询" )
+ @ApiOperation(value = "党员认证查询")
@GetMapping("partybuildingembercertification")
public R partybuildingembercertification() {
- //totest 党员认证查询
+ // 党员认证查询
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
- return partyBuildingService.userCertification(userId);
+ R r = partyBuildingService.userCertification(userId);
+
+ if (R.isOk(r)) {
+ List<PartyBuildingMemberVO> partyBuildingMemberVOList =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), PartyBuildingMemberVO.class);
+ if (partyBuildingMemberVOList != null && partyBuildingMemberVOList.size() > 0) {
+ Optional<PartyBuildingMemberVO> ot = partyBuildingMemberVOList.stream()
+ .filter(partyBuildingMemberVO -> partyBuildingMemberVO.getAuditResult() == 1).findFirst();
+ if (ot.isPresent()) {
+ return R.ok(ot.get());
+ } else {
+ return R.ok(partyBuildingMemberVOList.get(0));
+ }
+ }
+ }
+ return R.ok();
}
-
- @ApiOperation(value = "获取用户电子档案",response = UserArchivesVO.class)
+ @ApiOperation(value = "获取用户电子档案", response = UserArchivesVO.class)
@PostMapping("getUserArchives")
public R getUserArchives() {
Long userId = this.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登录");
}
return userService.getUserArchives(userId);
@@ -392,7 +494,7 @@
@PostMapping("updateUserArchives")
public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO) {
Long userId = this.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登录");
}
userArchivesVO.setUserId(userId);
--
Gitblit v1.7.1