wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3488): 调整identityEnum

Browse Source
This commit is contained in:
zhanghonghao 2025-01-02 11:18:37 +08:00
parent 0307b1f41e
commit 2f7e7a4cf9
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/enums/IdentityTypeEnum.java → orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/common/IdentityType.java
View File

@ -1,4 +1,4 @@
package cn.axzo.orgmanax.dto.nodeuser.enums;
package cn.axzo.orgmanax.dto.common;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.AllArgsConstructor;
@ -12,7 +12,7 @@ import lombok.Getter;
*/
@Getter
@AllArgsConstructor
public enum IdentityTypeEnum {
public enum IdentityType {
/*人员身份类型*/
NOT_SUPPORT(0, "NOT_SUPPORT", "无效类型"),
@ -28,9 +28,9 @@ public enum IdentityTypeEnum {
private final String desc;
public static IdentityTypeEnum getIdentityType(Integer code) {
IdentityTypeEnum[] values = values();
for (IdentityTypeEnum item : values) {
public static IdentityType getIdentityType(Integer code) {
IdentityType[] values = values();
for (IdentityType item : values) {
if (item.getCode().equals(code)) {
return item;
}
@ -38,9 +38,9 @@ public enum IdentityTypeEnum {
return null;
}
public static IdentityTypeEnum getIdentityType(String message) {
IdentityTypeEnum[] values = values();
for (IdentityTypeEnum item : values) {
public static IdentityType getIdentityType(String message) {
IdentityType[] values = values();
for (IdentityType item : values) {
if (item.getMessage().equals(message)) {
return item;
}

4
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/profile/dto/ProfileGetIdentityProfileLiteReq.java
View File

@ -1,6 +1,6 @@
package cn.axzo.orgmanax.infra.client.profile.dto;
import cn.axzo.orgmanax.dto.nodeuser.enums.IdentityTypeEnum;
import cn.axzo.orgmanax.dto.common.IdentityType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -47,6 +47,6 @@ public class ProfileGetIdentityProfileLiteReq {
/**
* 身份类型
*/
private IdentityTypeEnum identityType;
private IdentityType identityType;
}
}

4
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/profile/dto/ProfileGetIdentityProfileLiteResp.java
View File

@ -1,6 +1,6 @@
package cn.axzo.orgmanax.infra.client.profile.dto;
import cn.axzo.orgmanax.dto.nodeuser.enums.IdentityTypeEnum;
import cn.axzo.orgmanax.dto.common.IdentityType;
import cn.axzo.orgmanax.infra.client.profile.enums.SexType;
import cn.axzo.orgmanax.infra.client.profile.enums.VerifyStatus;
import lombok.AllArgsConstructor;
@ -28,7 +28,7 @@ public class ProfileGetIdentityProfileLiteResp {
/**
* 身份类型 1工人 2班组长
*/
private IdentityTypeEnum identityType;
private IdentityType identityType;
/**
* 身份描述

4
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/profile/dto/ProfileGetPersonIdListByIdentityReq.java
View File

@ -1,6 +1,6 @@
package cn.axzo.orgmanax.infra.client.profile.dto;
import cn.axzo.orgmanax.dto.nodeuser.enums.IdentityTypeEnum;
import cn.axzo.orgmanax.dto.common.IdentityType;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@ -16,5 +16,5 @@ import lombok.Setter;
@EqualsAndHashCode
public class ProfileGetPersonIdListByIdentityReq {
private Long identityId;
private IdentityTypeEnum identityType;
private IdentityType identityType;
}

4
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/profile/dto/ProfileUserProfileCreateReq.java
View File

@ -1,6 +1,6 @@
package cn.axzo.orgmanax.infra.client.profile.dto;
import cn.axzo.orgmanax.dto.nodeuser.enums.IdentityTypeEnum;
import cn.axzo.orgmanax.dto.common.IdentityType;
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -37,7 +37,7 @@ public class ProfileUserProfileCreateReq implements Serializable {
* 身份类型
*/
@NotNull(message = "identityType can not be blank")
private IdentityTypeEnum identityType;
private IdentityType identityType;
@Override
public String toString() {

4
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/profile/dto/model/AbstractIdentityProfileDto.java
View File

@ -1,6 +1,6 @@
package cn.axzo.orgmanax.infra.client.profile.dto.model;
import cn.axzo.orgmanax.dto.nodeuser.enums.IdentityTypeEnum;
import cn.axzo.orgmanax.dto.common.IdentityType;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -18,7 +18,7 @@ public class AbstractIdentityProfileDto<T extends AbstractProfileDto<T>> extends
private String description = "";
private IdentityTypeEnum identityTypeEnum = IdentityTypeEnum.NOT_SUPPORT;
private IdentityType identityType = IdentityType.NOT_SUPPORT;
private PersonProfileDto personProfile;
}