zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-02-25 18:14:10 +08:00
parent 293560e4a3
commit 6a27cccc3c
7 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppPersonalBasicInformationRes.java
View File

@ -1,7 +1,6 @@
package com.ruoyi.wgz.bo.res;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -34,6 +33,9 @@ public class WgzAppPersonalBasicInformationRes implements Serializable {
@ApiModelProperty("出生日期")
private String birthdate;
@ApiModelProperty("年龄")
private Integer age;
@ApiModelProperty("身份证号码")
private String identityCard;
@ -69,4 +71,7 @@ public class WgzAppPersonalBasicInformationRes implements Serializable {
@ApiModelProperty("工种，多个逗号分隔")
private String typeOfWork;
@ApiModelProperty("工种名")
private String typeOfWorkName;
}

23
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzUserServiceImpl.java
View File

@ -5,18 +5,21 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.domain.Annex;
import com.ruoyi.common.domain.dto.AnnexDTO;
import com.ruoyi.common.service.IAnnexService;
import com.ruoyi.common.util.DataUtil;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.wgz.bo.WgzUserQueryBo;
import com.ruoyi.wgz.bo.req.WgzAppModifyingUserProfilePictureReq;
import com.ruoyi.wgz.bo.req.WgzAppPersonalBasicInformationReq;
import com.ruoyi.wgz.bo.req.WgzAppRegisterReq;
import com.ruoyi.wgz.bo.req.WgzAppRealNameAuthenticationReq;
import com.ruoyi.wgz.bo.req.WgzAppRegisterReq;
import com.ruoyi.wgz.bo.res.WgzAppPersonalBasicInformationRes;
import com.ruoyi.wgz.common.SnowflakeIdUtil;
import com.ruoyi.wgz.domain.WgzUser;
@ -27,11 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -46,6 +46,9 @@ public class WgzUserServiceImpl extends ServicePlusImpl<WgzUserMapper, WgzUser>
@Autowired
private IAnnexService iAnnexService;
@Autowired
private ISysDictTypeService dictTypeService;
@Override
public WgzUser queryById(String id){
return getById(id);
@ -168,7 +171,13 @@ public class WgzUserServiceImpl extends ServicePlusImpl<WgzUserMapper, WgzUser>
//2、copy数据返回
WgzAppPersonalBasicInformationRes wgzAppPersonalBasicInformationRes = new WgzAppPersonalBasicInformationRes();
BeanUtils.copyProperties(wgzUser,wgzAppPersonalBasicInformationRes);
return wgzAppPersonalBasicInformationRes;
wgzAppPersonalBasicInformationRes.setAge(DataUtil.calculateAge(wgzAppPersonalBasicInformationRes.getBirthdate()));
List<SysDictData> typeOfWork = dictTypeService.selectDictDataByType("type_of_work");
List<String> split = Arrays.asList(wgzAppPersonalBasicInformationRes.getTypeOfWork().split(","));
String typeOfWorkName = typeOfWork.stream().filter(dictData -> split.contains(dictData.getDictValue())).map(SysDictData::getDictLabel)
.collect(Collectors.joining(","));
wgzAppPersonalBasicInformationRes.setTypeOfWorkName(typeOfWorkName);
return wgzAppPersonalBasicInformationRes;
}
//实名认证