Commit aed280e3 authored by caotao's avatar caotao

1、新引入hutool依赖。

2、基础管理-获取人员新增接口增加type参数用于区分是查看还是编辑页面调用。 3、人员身份证信息、密码、二次密码根据实际情况返回。
parent 00840374
......@@ -47,6 +47,11 @@
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.7.22</version>
</dependency>
</dependencies>
<build>
......
......@@ -140,8 +140,8 @@ public class PersonBasicController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个人员基本信息", notes = "根据sequenceNbr查询单个人员基本信息")
public ResponseModel<PersonDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(personBasicServiceImpl.getPerson(sequenceNbr));
public ResponseModel<PersonDto> selectOne(@RequestParam Long sequenceNbr,@RequestParam String type) {
return ResponseHelper.buildResponse(personBasicServiceImpl.getPerson(sequenceNbr,type));
}
/**
......
package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
import cn.hutool.core.util.DesensitizedUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -545,7 +546,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
}
@Transactional
public PersonDto getPerson(Long sequenceNbr) {
public PersonDto getPerson(Long sequenceNbr,String type) {
PersonDto personDto = new PersonDto();
PersonUser personUser = new PersonUser();
QueryWrapper<PersonBasic> wrapper1 = new QueryWrapper();
......@@ -574,8 +575,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
PersonAccount personAccount = personAccountService.getOne(wrapper4);
personAccount.setPhoneNum(personBasic.getPhone());
//对于密码进行解密
personAccount.setPassword(DesUtil.decode(personAccount.getPassword(), secretKey));
personAccount.setSecondaryPassword(DesUtil.decode(personAccount.getSecondaryPassword(), secretKey));
if("look".equals(type)){
personAccount.setIdNumber(DesensitizedUtil.idCardNum(personAccount.getIdNumber(),0,4));
}else{
personAccount.setPassword(DesUtil.decode(personAccount.getPassword(), secretKey));
personAccount.setSecondaryPassword(DesUtil.decode(personAccount.getSecondaryPassword(), secretKey));
}
if (personBasic.getNativePlace() != null) {
personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment