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

Merge remote-tracking branch 'origin/feature/REQ-1102' into feature/REQ-1204

Browse Source
This commit is contained in:
zhansihu 2023-09-08 13:50:24 +08:00
commit ad02d292c2
11 changed files with 184 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/IEnum.java Normal file
View File

@ -0,0 +1,27 @@
package cn.axzo.tyr.client.model.enums;
/**
* 项目名称：pudge
* 类 名 称：AbstractEnum
* 类 描 述：TODO
* 创建时间：2022/7/14 12:26
* 创 建 人：xuyaozuo
*/
public interface IEnum {
Integer getCode();
String getMessage();
static <T extends Enum<T> & IEnum> T enumFromCode(Class<T> enumType, Integer code) {
T defaultEnum = null;
for (T c : enumType.getEnumConstants()) {
if (c.getCode().equals(code)) {
return c;
}
if (c.getCode().equals(0)) {
defaultEnum = c;
}
}
return defaultEnum;
}
}

53
tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/IdentityType.java Normal file
View File

@ -0,0 +1,53 @@
package cn.axzo.tyr.client.model.enums;
import cn.axzo.basics.common.exception.ServiceException;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 人员身份类型枚举
*
* @author xuyaozuo
* @since 2022/5/9 21:59
*/
@Getter
@AllArgsConstructor
public enum IdentityType implements IEnum{
/*人员身份类型*/
NOT_SUPPORT(0, "NOT_SUPPORT", "无效类型"),
WORKER(1, "WORKER", "工人"),
WORKER_LEADER(2, "WORKER_LEADER", "班组长"),
PRACTITIONER(3, "PRACTITIONER", "从业人员"),
REGULATOR(4, "REGULATOR", "监管人员"),
OPERATOR(5, "OPERATOR", "运营人员"),
;
@EnumValue
@JsonValue
private final Integer code;
private final String message;
private final String desc;
public static IdentityType getIdentityType(Integer code) {
IdentityType[] values = values();
for (IdentityType item : values) {
if (item.getCode().equals(code)) {
return item;
}
}
throw new ServiceException("档案身份类型不匹配 code:" + code);
}
public static IdentityType getIdentityType(String message) {
IdentityType[] values = values();
for (IdentityType item : values) {
if (item.getMessage().equals(message)) {
return item;
}
}
throw new ServiceException("档案身份类型不匹配 message:" + message);
}
}

5
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductAddReq.java
View File

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
@ -16,9 +17,7 @@ import javax.validation.constraints.NotNull;
* @since 2023/9/6 15:13
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
public class ProductAddReq {
/**

5
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductFeatureRelationSearchReq.java
View File

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
@ -14,9 +15,7 @@ import javax.validation.constraints.NotNull;
* @since 2023/9/6 15:48
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
public class ProductFeatureRelationSearchReq {
/**

5
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductFeatureRelationUpdateReq.java
View File

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
@ -16,9 +17,7 @@ import java.util.List;
* @since 2023/9/7 18:53
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
public class ProductFeatureRelationUpdateReq {
/**

5
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductFeatureRelationVO.java
View File

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
* 产品与权限点的关联关系响应模型
@ -12,9 +13,7 @@ import lombok.NoArgsConstructor;
* @since 2023/9/6 15:44
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
public class ProductFeatureRelationVO {
/**

5
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchListReq.java
View File

@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
* 产品分页搜索
@ -13,9 +14,7 @@ import lombok.NoArgsConstructor;
* @since 2023/9/6 14:58
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
public class ProductSearchListReq{
/**

5
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchPageReq.java
View File

@ -7,6 +7,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
* 产品分页搜索
@ -16,9 +17,7 @@ import lombok.NoArgsConstructor;
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
public class ProductSearchPageReq extends PageRequest {
/**

5
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductUpdateReq.java
View File

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
@ -16,9 +17,7 @@ import javax.validation.constraints.NotNull;
* @since 2023/9/6 15:13
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
public class ProductUpdateReq {
/**
* 产品 ID

9
tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductVO.java
View File

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Date;
@ -14,15 +15,13 @@ import java.util.Date;
* @since 2023/9/6 14:51
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
public class ProductVO {
/**
* 产品 ID
*/
private String id;
private Long id;
/**
* 产品名称
@ -38,7 +37,7 @@ public class ProductVO {
* 产品所属工作台类型
*/
private Long dictWorkspaceTypeId;
/**
* 产品所属工作类型名称
*/

86
tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRoleUserRelation.java Normal file
View File

@ -0,0 +1,86 @@
package cn.axzo.tyr.server.repository.entity;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import cn.axzo.tyr.client.model.enums.IdentityType;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
/**
* saas-角色用户关联表(SaasRoleUserRelation)表实体类
*
* @author makejava
* @since 2022-05-24 11:18:41
*/
@Getter
@Setter
@ToString
@EqualsAndHashCode(callSuper = true)
@TableName("saas_role_user_relation")
public class SaasRoleUserRelation extends BaseEntity<SaasRoleUserRelation> {
/**
* 身份Id
*/
private Long identityId;
/**
* 身份类型 1:工人 2:从业人员 3:班组长 4:运营人员 5:政务人员
*/
private IdentityType identityType;
/**
* 角色Id
*/
private Long roleId;
/**
* 自然人Id
*/
private Long naturalPersonId;
/**
* 创建者
*/
private Long createBy;
/**
* 更新者
*/
private Long updateBy;
/**
* 所属单位Id 用户在当前工作台的所属单位
*/
private Long ouId;
/**
* 工作台Id
*/
private Long workspaceId;
/**
* 资源类型
*/
private Integer resourceType;
/**
* 资源Id
*/
private Long resourceId;
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.id;
}
}