From d8e5c69213259a06f412845313dca8f71b12967d Mon Sep 17 00:00:00 2001 From: xudawei Date: Wed, 8 Jan 2025 17:06:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20(REQ-3457)=20IM=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8-=E6=9B=B4=E6=8D=A2UserRoleRelation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/payload/SaasRoleUserRelation.java | 90 +++++++++++++++++++ .../SaasRoleUserRelationRemovePayload.java | 1 - .../SaasRoleUserRelationUpsertPayload.java | 1 - .../ChatGroupChangeOwnerEventHandler.java | 2 +- 4 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelation.java diff --git a/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelation.java b/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelation.java new file mode 100644 index 0000000..54d7d5a --- /dev/null +++ b/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelation.java @@ -0,0 +1,90 @@ +package cn.axzo.im.event.payload; + +import cn.axzo.basics.profiles.common.enums.IdentityType; +import cn.axzo.tyr.client.model.enums.SaasJobTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class SaasRoleUserRelation implements Serializable { + + /** + * 身份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; + + /** + * 岗位类型 1:主岗 2:兼岗 + * 一个人在一个工作台内,除非 特殊的角色(超管,无权限角色等)必定有且只有一个主岗,可以有N个兼岗 + */ + private SaasJobTypeEnum jobType; + + /** + * id + */ + private Long id; + + /** + * 创建时间 + */ + private Date createAt; + + /** + * 修改时间 + */ + private Date updateAt; + + /** + * 是否删除 0正常,1删除 + */ + private Long isDelete = 0L; + +} diff --git a/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelationRemovePayload.java b/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelationRemovePayload.java index 9b53f02..617126b 100644 --- a/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelationRemovePayload.java +++ b/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelationRemovePayload.java @@ -1,6 +1,5 @@ package cn.axzo.im.event.payload; -import cn.axzo.basics.auth.dto.SaasRoleUserRelation; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelationUpsertPayload.java b/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelationUpsertPayload.java index 1b099f5..fb05f4a 100644 --- a/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelationUpsertPayload.java +++ b/im-center-server/src/main/java/cn/axzo/im/event/payload/SaasRoleUserRelationUpsertPayload.java @@ -1,6 +1,5 @@ package cn.axzo.im.event.payload; -import cn.axzo.basics.auth.dto.SaasRoleUserRelation; import cn.axzo.tyr.client.model.roleuser.dto.SaasRoleUserV2DTO; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/im-center-server/src/main/java/cn/axzo/im/handler/chatgroup/ChatGroupChangeOwnerEventHandler.java b/im-center-server/src/main/java/cn/axzo/im/handler/chatgroup/ChatGroupChangeOwnerEventHandler.java index 8a2f68c..692cc74 100644 --- a/im-center-server/src/main/java/cn/axzo/im/handler/chatgroup/ChatGroupChangeOwnerEventHandler.java +++ b/im-center-server/src/main/java/cn/axzo/im/handler/chatgroup/ChatGroupChangeOwnerEventHandler.java @@ -1,6 +1,5 @@ package cn.axzo.im.handler.chatgroup; -import cn.axzo.basics.auth.dto.SaasRoleUserRelation; import cn.axzo.basics.common.exception.ServiceException; import cn.axzo.framework.rocketmq.Event; import cn.axzo.framework.rocketmq.EventConsumer; @@ -11,6 +10,7 @@ import cn.axzo.im.center.common.enums.AppTypeEnum; import cn.axzo.im.center.common.enums.ChatGroupUserDataSourceEnum; import cn.axzo.im.entity.ChatGroup; import cn.axzo.im.event.inner.EventTypeEnum; +import cn.axzo.im.event.payload.SaasRoleUserRelation; import cn.axzo.im.event.payload.SaasRoleUserRelationUpsertPayload; import cn.axzo.im.gateway.TyrApiGateway; import cn.axzo.im.service.ChatGroupService;