zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

根据登录人密码获取查询人手机号和身份证号

main
zhaokai 2025-11-28 14:21:30 +08:00
parent f2b527d32a
commit c8f344ebe2
10 changed files with 105 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java
View File

@ -143,5 +143,11 @@ public class UserController {
return userService.updatePassword(userUpdatePassWordCmd);
}
@ApiOperation("根据登录人密码获取查询人手机号和身份证号")
@PostMapping("/getEncryInfo")
public SingleResponse<UserCO> getEncryInfo(@Validated @RequestBody UserCheckPassWordCmd userCheckPassWordCmd) {
return userService.getEncryInfo(userCheckPassWordCmd);
}
}

1
web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
View File

@ -83,6 +83,7 @@ public class UserAddExe {
userE.setRoleId(roleId);
}
try {
res = userGateway.add(userE);
if(corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())){
corpName = corpInfoDO.getCorpName();

3
web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
View File

@ -53,6 +53,9 @@ public class DepartmentQueryExe {
if (departmentPageQry.getEqCorpinfoId() == null) {
departmentPageQry.setEqCorpinfoId(AuthContext.getTenantId());
}
if(departmentPageQry.getEqParentId() == null){
departmentPageQry.setEqParentId(AuthContext.getTenantId());
}
Map<String, Object> parmas = PageQueryHelper.toHashMap(departmentPageQry);
PageResponse<DepartmentDO> pageResponse = departmentRepository.listPage(parmas);
List<DepartmentCO> examCenterCOS = departmentCoConvertor.converDOsToCOs(pageResponse.getData());

35
web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java
View File

@ -10,6 +10,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
import com.zcloud.basic.info.command.convertor.UserCoConvertor;
import com.zcloud.basic.info.domain.gateway.UserGateway;
import com.zcloud.basic.info.domain.model.UserE;
import com.zcloud.basic.info.dto.UserCheckPassWordCmd;
import com.zcloud.basic.info.dto.UserPageQry;
import com.zcloud.basic.info.dto.UserQryCmd;
import com.zcloud.basic.info.dto.UserVerifyQryCmd;
@ -17,6 +18,7 @@ import com.zcloud.basic.info.dto.clientobject.UserCO;
import com.zcloud.basic.info.persistence.dataobject.UserDO;
import com.zcloud.basic.info.persistence.repository.UserRepository;
import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
import com.zcloud.gbscommon.utils.DesensitizationUtils;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@ -66,6 +68,9 @@ public class UserQueryExe {
Map<String, Object> params = PageQueryHelper.toHashMap(userQryCmd);
List<UserDO> imgFilesDOList = userRepository.listAll(params);
List<UserCO> imgFilesCOList = userCoConvertor.converDOsToCOs(imgFilesDOList);
//手机号脱敏
//身份照脱敏
imgFilesCOList.forEach(this::desensitize);
return MultiResponse.of(imgFilesCOList);
}
@ -80,6 +85,7 @@ public class UserQueryExe {
UserDO userDO = userRepository.getInfoById(id);
UserCO userCO = new UserCO();
BeanUtils.copyProperties(userDO, userCO);
desensitize(userCO);
return SingleResponse.of(userCO);
}
@ -101,17 +107,28 @@ public class UserQueryExe {
QueryWrapper<UserDO> userDOQueryWrapper = new QueryWrapper<>();
userDOQueryWrapper.in("id",collection);
List<UserDO> list = userRepository.list(userDOQueryWrapper);
return userCoConvertor.converDOsToCOs(list);
List<UserCO> userCOS = userCoConvertor.converDOsToCOs(list);
userCOS.forEach(this::desensitize);
return userCOS;
}
public List<UserCO> getUserList() {
List<UserDO> list = userRepository.list();
return userCoConvertor.converDOsToCOs(list);
List<UserCO> userCOS = userCoConvertor.converDOsToCOs(list);
userCOS.forEach(this::desensitize);
return userCOS;
}
private void desensitize(UserCO userCO) {
userCO.setUserIdCard(DesensitizationUtils.idCardDesensitize(userCO.getUserIdCard()));
userCO.setPhone(DesensitizationUtils.mobileDesensitize(userCO.getPhone()));
}
public UserCO getInfoByUserId(Long aLong) {
UserDO byId = userRepository.getById(aLong);
return userCoConvertor.converDOToCO(byId);
UserCO userCO = userCoConvertor.converDOToCO(byId);
desensitize(userCO);
return userCO;
}
/**
@ -124,6 +141,9 @@ public class UserQueryExe {
params.put("userIdList", Arrays.asList(ids));
}
List<UserDO> userDOList = userRepository.listAll(params);
//手机号脱敏
//身份照脱敏
userDOList.forEach(userDO -> desensitize(userCoConvertor.converDOToCO(userDO)));
List<UserExcelExportEntity> userExcelExportEntities = userCoConvertor.converDOsToExcelEntitys(userDOList);
UserE userE = new UserE();
userE.exportUserTable(httpServletResponse, userExcelExportEntities);
@ -143,7 +163,16 @@ public class UserQueryExe {
UserDO userDO = userRepository.getInfoById(id);
UserCO userCO = new UserCO();
BeanUtils.copyProperties(userDO, userCO);
desensitize(userCO);
return SingleResponse.of(userCO);
}
public SingleResponse<UserCO> getEncryInfo(UserCheckPassWordCmd userCheckPassWordCmd) {
UserE userE = new UserE();
BeanUtils.copyProperties(userCheckPassWordCmd, userE);
userE.encryptionPassword();
UserDO userDO = userRepository.getEncryInfo(userE);
return SingleResponse.of(userCoConvertor.converDOToCO(userDO));
}
}

4
web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java
View File

@ -124,5 +124,9 @@ public class UserServiceImpl implements UserServiceI {
return userUpdateExe.executeUpdatePassword(userUpdatePassWordCmd);
}
@Override
public SingleResponse<UserCO> getEncryInfo(UserCheckPassWordCmd userCheckPassWordCmd) {
return userQueryExe.getEncryInfo(userCheckPassWordCmd);
}
}

2
web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java
View File

@ -50,5 +50,7 @@ public interface UserServiceI {
UserCO getInfoByUserId(Long aLong);
void changePassword(Long id);
Response updatePassword(UserUpdatePassWordCmd userUpdatePassWordCmd);
SingleResponse<UserCO> getEncryInfo(UserCheckPassWordCmd userCheckPassWordCmd);
}

32
web-client/src/main/java/com/zcloud/basic/info/dto/UserCheckPassWordCmd.java Normal file
View File

@ -0,0 +1,32 @@
package com.zcloud.basic.info.dto;
import com.alibaba.cola.dto.Command;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
/**
* web-client
*
* @Author zhangyue
* @Date 2025-11-04 14:07:38
*/
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@AllArgsConstructor
public class UserCheckPassWordCmd extends Command {
@ApiModelProperty(value = "GBS用户id", name = "id", required = true)
@NotNull(message = "GBS用户id不能为空")
private Long id;
@ApiModelProperty(value = "原密码", name = "password")
@NotEmpty(message = "原密码不能为空")
private String password;
}

6
web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
View File

@ -364,8 +364,12 @@ public class UserE extends BaseE {
}
public void encryptionPassword() {
this.setPassword(Sm2Util.encryptHex(MD5.md5(password), publicKey));
this.setNewPassword(Sm2Util.encryptHex(MD5.md5(newPassword), publicKey));
if(StringUtils.isNotEmpty(newPassword)){
this.setNewPassword(Sm2Util.encryptHex(MD5.md5(newPassword), publicKey));
}
}
}

3
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java
View File

@ -11,6 +11,8 @@ import com.zcloud.basic.info.domain.model.UserE;
import com.zcloud.basic.info.persistence.dataobject.UserDO;
import org.apache.catalina.User;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
@ -60,5 +62,6 @@ public interface UserRepository extends BaseRepository<UserDO> {
Response updatePassword(UserDO userDO);
UserDO getEncryInfo(UserE userE);
}

17
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
View File

@ -5,6 +5,7 @@ import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.dto.SingleResponse;
import com.alibaba.cola.exception.BizException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -201,6 +202,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
userDO.setId(gbsResult.getData());
if(userDO.getSort() == null){
userDO.setSort(9999);
}
save(userDO);
}
@ -293,5 +297,18 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
userUpdatePasswordCmd.setPassword(userDO.getNewPassword());
return userFacade.updatePassword(userUpdatePasswordCmd);
}
@Override
public UserDO getEncryInfo(UserE userE) {
// TODO 验证老密码是否正确
AccountPasswordCheckCmd accountPasswordCheckCmd = new AccountPasswordCheckCmd();
accountPasswordCheckCmd.setUserId(AuthContext.getUserId());
accountPasswordCheckCmd.setPassword(userE.getPassword());
SingleResponse<Long> response = accountFacade.checkPassword(accountPasswordCheckCmd);
if(!response.isSuccess()){
throw new BizException("密码错误");
}
return getById(userE.getId());
}
}