From acbcdca058d71c7d175c72ad5ac7451b5d17053b Mon Sep 17 00:00:00 2001 From: La123123 <617330105@qq.com> Date: Wed, 1 Apr 2026 15:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 + .idea/admin.iml | 9 + .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/prettier.xml | 6 + .idea/vcs.xml | 6 + im-admin-ui/src/api/im/userGroup/index.ts | 63 +++++ im-admin-ui/src/api/im/userGroup/types.ts | 66 +++++ im-admin-ui/src/api/im/userLable/index.ts | 63 +++++ im-admin-ui/src/api/im/userLable/types.ts | 66 +++++ im-admin-ui/src/views/im/userGroup/index.vue | 234 ++++++++++++++++++ im-admin-ui/src/views/im/userLable/index.vue | 234 ++++++++++++++++++ im-admin/.idea/encodings.xml | 2 - .../vo/SysTenantVoToTenantListVoMapper.class | Bin 586 -> 586 bytes .../vo/TenantListVoToSysTenantVoMapper.class | Bin 586 -> 586 bytes .../vo/SysTenantVoToTenantListVoMapper.java | 4 +- .../SysTenantVoToTenantListVoMapperImpl.java | 2 +- .../vo/TenantListVoToSysTenantVoMapper.java | 4 +- .../TenantListVoToSysTenantVoMapperImpl.java | 2 +- .../im/controller/ImUserGroupController.java | 105 ++++++++ .../im/controller/ImUserLableController.java | 105 ++++++++ .../org/dromara/im/domain/ImUserGroup.java | 43 ++++ .../org/dromara/im/domain/ImUserLable.java | 43 ++++ .../dromara/im/domain/bo/ImUserGroupBo.java | 48 ++++ .../dromara/im/domain/bo/ImUserLableBo.java | 48 ++++ .../dromara/im/domain/vo/ImUserGroupVo.java | 56 +++++ .../dromara/im/domain/vo/ImUserLableVo.java | 56 +++++ .../dromara/im/mapper/ImUserGroupMapper.java | 15 ++ .../dromara/im/mapper/ImUserLableMapper.java | 15 ++ .../im/service/IImUserGroupService.java | 68 +++++ .../im/service/IImUserLableService.java | 68 +++++ .../service/impl/ImUserGroupServiceImpl.java | 133 ++++++++++ .../service/impl/ImUserLableServiceImpl.java | 133 ++++++++++ .../resources/mapper/im/ImUserGroupMapper.xml | 7 + .../resources/mapper/im/ImUserLableMapper.xml | 7 + .../target/classes/META-INF/mps/autoMapper | 14 +- ...ImGroupMemberToImGroupMemberVoMapper.class | Bin 659 -> 659 bytes ...GroupMessageToImGroupMessageVoMapper.class | Bin 669 -> 669 bytes .../im/domain/ImGroupToImGroupVoMapper.class | Bin 599 -> 599 bytes ...ateMessageToImPrivateMessageVoMapper.class | Bin 689 -> 689 bytes ...nsitiveWordToImSensitiveWordVoMapper.class | Bin 679 -> 679 bytes .../im/domain/ImUserToImUserVoMapper.class | Bin 589 -> 589 bytes .../domain/bo/ImGroupBoToImGroupMapper.class | Bin 488 -> 488 bytes ...ImGroupMemberBoToImGroupMemberMapper.class | Bin 524 -> 524 bytes ...GroupMessageBoToImGroupMessageMapper.class | Bin 530 -> 530 bytes ...ateMessageBoToImPrivateMessageMapper.class | Bin 542 -> 542 bytes ...nsitiveWordBoToImSensitiveWordMapper.class | Bin 536 -> 536 bytes .../im/domain/bo/ImUserBoToImUserMapper.class | Bin 482 -> 482 bytes ...ImGroupMemberVoToImGroupMemberMapper.class | Bin 590 -> 590 bytes ...GroupMessageVoToImGroupMessageMapper.class | Bin 598 -> 598 bytes .../domain/vo/ImGroupVoToImGroupMapper.class | Bin 542 -> 542 bytes ...ateMessageVoToImPrivateMessageMapper.class | Bin 614 -> 614 bytes ...nsitiveWordVoToImSensitiveWordMapper.class | Bin 606 -> 606 bytes .../im/domain/vo/ImUserVoToImUserMapper.class | Bin 534 -> 534 bytes .../ImGroupMemberToImGroupMemberVoMapper.java | 6 +- ...roupMemberToImGroupMemberVoMapperImpl.java | 2 +- ...mGroupMessageToImGroupMessageVoMapper.java | 4 +- ...upMessageToImGroupMessageVoMapperImpl.java | 2 +- .../im/domain/ImGroupToImGroupVoMapper.java | 4 +- .../domain/ImGroupToImGroupVoMapperImpl.java | 2 +- ...vateMessageToImPrivateMessageVoMapper.java | 4 +- ...MessageToImPrivateMessageVoMapperImpl.java | 2 +- ...ensitiveWordToImSensitiveWordVoMapper.java | 4 +- ...tiveWordToImSensitiveWordVoMapperImpl.java | 2 +- .../im/domain/ImUserToImUserVoMapper.java | 4 +- .../im/domain/ImUserToImUserVoMapperImpl.java | 2 +- .../domain/bo/ImGroupBoToImGroupMapper.java | 4 +- .../bo/ImGroupBoToImGroupMapperImpl.java | 2 +- .../ImGroupMemberBoToImGroupMemberMapper.java | 4 +- ...roupMemberBoToImGroupMemberMapperImpl.java | 2 +- ...mGroupMessageBoToImGroupMessageMapper.java | 4 +- ...upMessageBoToImGroupMessageMapperImpl.java | 2 +- ...vateMessageBoToImPrivateMessageMapper.java | 4 +- ...MessageBoToImPrivateMessageMapperImpl.java | 2 +- ...ensitiveWordBoToImSensitiveWordMapper.java | 4 +- ...tiveWordBoToImSensitiveWordMapperImpl.java | 2 +- .../im/domain/bo/ImUserBoToImUserMapper.java | 4 +- .../domain/bo/ImUserBoToImUserMapperImpl.java | 2 +- .../ImGroupMemberVoToImGroupMemberMapper.java | 4 +- ...roupMemberVoToImGroupMemberMapperImpl.java | 2 +- ...mGroupMessageVoToImGroupMessageMapper.java | 4 +- ...upMessageVoToImGroupMessageMapperImpl.java | 2 +- .../domain/vo/ImGroupVoToImGroupMapper.java | 4 +- .../vo/ImGroupVoToImGroupMapperImpl.java | 2 +- ...vateMessageVoToImPrivateMessageMapper.java | 4 +- ...MessageVoToImPrivateMessageMapperImpl.java | 2 +- ...ensitiveWordVoToImSensitiveWordMapper.java | 4 +- ...tiveWordVoToImSensitiveWordMapperImpl.java | 2 +- .../im/domain/vo/ImUserVoToImUserMapper.java | 4 +- .../domain/vo/ImUserVoToImUserMapperImpl.java | 2 +- 91 files changed, 1795 insertions(+), 68 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/admin.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/prettier.xml create mode 100644 .idea/vcs.xml create mode 100644 im-admin-ui/src/api/im/userGroup/index.ts create mode 100644 im-admin-ui/src/api/im/userGroup/types.ts create mode 100644 im-admin-ui/src/api/im/userLable/index.ts create mode 100644 im-admin-ui/src/api/im/userLable/types.ts create mode 100644 im-admin-ui/src/views/im/userGroup/index.vue create mode 100644 im-admin-ui/src/views/im/userLable/index.vue create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserGroupController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserLableController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUserGroup.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUserLable.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserGroupBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserLableBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserGroupVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserLableVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserGroupMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserLableMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserGroupService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserLableService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserGroupServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserLableServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/resources/mapper/im/ImUserGroupMapper.xml create mode 100644 im-admin/ruoyi-im/src/main/resources/mapper/im/ImUserLableMapper.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/admin.iml b/.idea/admin.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/admin.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..03d9549 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..42cb54d --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/prettier.xml b/.idea/prettier.xml new file mode 100644 index 0000000..b0c1c68 --- /dev/null +++ b/.idea/prettier.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/im-admin-ui/src/api/im/userGroup/index.ts b/im-admin-ui/src/api/im/userGroup/index.ts new file mode 100644 index 0000000..eea4910 --- /dev/null +++ b/im-admin-ui/src/api/im/userGroup/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { UserGroupVO, UserGroupForm, UserGroupQuery } from '@/api/im/userGroup/types'; + +/** + * 查询用户分组列表 + * @param query + * @returns {*} + */ + +export const listUserGroup = (query?: UserGroupQuery): AxiosPromise => { + return request({ + url: '/im/userGroup/list', + method: 'get', + params: query + }); +}; + +/** + * 查询用户分组详细 + * @param id + */ +export const getUserGroup = (id: string | number): AxiosPromise => { + return request({ + url: '/im/userGroup/' + id, + method: 'get' + }); +}; + +/** + * 新增用户分组 + * @param data + */ +export const addUserGroup = (data: UserGroupForm) => { + return request({ + url: '/im/userGroup', + method: 'post', + data: data + }); +}; + +/** + * 修改用户分组 + * @param data + */ +export const updateUserGroup = (data: UserGroupForm) => { + return request({ + url: '/im/userGroup', + method: 'put', + data: data + }); +}; + +/** + * 删除用户分组 + * @param id + */ +export const delUserGroup = (id: string | number | Array) => { + return request({ + url: '/im/userGroup/' + id, + method: 'delete' + }); +}; diff --git a/im-admin-ui/src/api/im/userGroup/types.ts b/im-admin-ui/src/api/im/userGroup/types.ts new file mode 100644 index 0000000..a0e76f7 --- /dev/null +++ b/im-admin-ui/src/api/im/userGroup/types.ts @@ -0,0 +1,66 @@ +export interface UserGroupVO { + /** + * id + */ + id: string | number; + + /** + * 分组名称 + */ + groupName: string; + + /** + * 排序 + */ + sort: number; + + /** + * 备注 + */ + remark: string; + +} + +export interface UserGroupForm extends BaseEntity { + /** + * id + */ + id?: string | number; + + /** + * 分组名称 + */ + groupName?: string; + + /** + * 排序 + */ + sort?: number; + + /** + * 备注 + */ + remark?: string; + +} + +export interface UserGroupQuery extends PageQuery { + + /** + * 分组名称 + */ + groupName?: string; + + /** + * 排序 + */ + sort?: number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/im-admin-ui/src/api/im/userLable/index.ts b/im-admin-ui/src/api/im/userLable/index.ts new file mode 100644 index 0000000..d2155d0 --- /dev/null +++ b/im-admin-ui/src/api/im/userLable/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { UserLableVO, UserLableForm, UserLableQuery } from '@/api/im/userLable/types'; + +/** + * 查询用户分组列表 + * @param query + * @returns {*} + */ + +export const listUserLable = (query?: UserLableQuery): AxiosPromise => { + return request({ + url: '/im/userLable/list', + method: 'get', + params: query + }); +}; + +/** + * 查询用户分组详细 + * @param id + */ +export const getUserLable = (id: string | number): AxiosPromise => { + return request({ + url: '/im/userLable/' + id, + method: 'get' + }); +}; + +/** + * 新增用户分组 + * @param data + */ +export const addUserLable = (data: UserLableForm) => { + return request({ + url: '/im/userLable', + method: 'post', + data: data + }); +}; + +/** + * 修改用户分组 + * @param data + */ +export const updateUserLable = (data: UserLableForm) => { + return request({ + url: '/im/userLable', + method: 'put', + data: data + }); +}; + +/** + * 删除用户分组 + * @param id + */ +export const delUserLable = (id: string | number | Array) => { + return request({ + url: '/im/userLable/' + id, + method: 'delete' + }); +}; diff --git a/im-admin-ui/src/api/im/userLable/types.ts b/im-admin-ui/src/api/im/userLable/types.ts new file mode 100644 index 0000000..af787e2 --- /dev/null +++ b/im-admin-ui/src/api/im/userLable/types.ts @@ -0,0 +1,66 @@ +export interface UserLableVO { + /** + * id + */ + id: string | number; + + /** + * 标签名称 + */ + lableName: string; + + /** + * 排序 + */ + sort: number; + + /** + * 备注 + */ + remark: string; + +} + +export interface UserLableForm extends BaseEntity { + /** + * id + */ + id?: string | number; + + /** + * 标签名称 + */ + lableName?: string; + + /** + * 排序 + */ + sort?: number; + + /** + * 备注 + */ + remark?: string; + +} + +export interface UserLableQuery extends PageQuery { + + /** + * 标签名称 + */ + lableName?: string; + + /** + * 排序 + */ + sort?: number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/im-admin-ui/src/views/im/userGroup/index.vue b/im-admin-ui/src/views/im/userGroup/index.vue new file mode 100644 index 0000000..108821f --- /dev/null +++ b/im-admin-ui/src/views/im/userGroup/index.vue @@ -0,0 +1,234 @@ + + + diff --git a/im-admin-ui/src/views/im/userLable/index.vue b/im-admin-ui/src/views/im/userLable/index.vue new file mode 100644 index 0000000..10d1fbf --- /dev/null +++ b/im-admin-ui/src/views/im/userLable/index.vue @@ -0,0 +1,234 @@ + + + diff --git a/im-admin/.idea/encodings.xml b/im-admin/.idea/encodings.xml index 8f516f1..39f61b7 100644 --- a/im-admin/.idea/encodings.xml +++ b/im-admin/.idea/encodings.xml @@ -47,8 +47,6 @@ - - diff --git a/im-admin/ruoyi-admin/target/classes/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapper.class b/im-admin/ruoyi-admin/target/classes/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapper.class index 6d4ef680f91df600c764d953e7eb2b74792041ca..e23a88470a824f734571a647f11b789f7b657358 100644 GIT binary patch delta 14 VcmX@ba*AccE=DGEgUNds`v57t1y29~ delta 14 VcmX@ba*AccE=DFZv&nlH`v57_1yle4 diff --git a/im-admin/ruoyi-admin/target/classes/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapper.class b/im-admin/ruoyi-admin/target/classes/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapper.class index f931d660a169b4a4fc392ba7076ba4839dc07882..173962f0158bfb0833d3b14f9ea1d62f0f554df6 100644 GIT binary patch delta 14 WcmX@ba*Accc19+1gULG?CjtN|n*~e& delta 14 WcmX@ba*Accc19*Mv&lOdCjtN|vjtHA diff --git a/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapper.java b/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapper.java index 62bf623..da473fa 100644 --- a/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapper.java +++ b/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapper.java @@ -1,13 +1,13 @@ package org.dromara.system.domain.vo; -import io.github.linpeilie.AutoMapperConfig__166; +import io.github.linpeilie.AutoMapperConfig__170; import io.github.linpeilie.BaseMapper; import org.dromara.web.domain.vo.TenantListVo; import org.dromara.web.domain.vo.TenantListVoToSysTenantVoMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__166.class, + config = AutoMapperConfig__170.class, uses = {TenantListVoToSysTenantVoMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapperImpl.java b/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapperImpl.java index 3795d09..bba6ef6 100644 --- a/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapperImpl.java +++ b/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/system/domain/vo/SysTenantVoToTenantListVoMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T15:17:33+0800", + date = "2026-04-01T15:40:14+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapper.java b/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapper.java index 49f05ea..ab6fffc 100644 --- a/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapper.java +++ b/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapper.java @@ -1,13 +1,13 @@ package org.dromara.web.domain.vo; -import io.github.linpeilie.AutoMapperConfig__166; +import io.github.linpeilie.AutoMapperConfig__170; import io.github.linpeilie.BaseMapper; import org.dromara.system.domain.vo.SysTenantVo; import org.dromara.system.domain.vo.SysTenantVoToTenantListVoMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__166.class, + config = AutoMapperConfig__170.class, uses = {SysTenantVoToTenantListVoMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapperImpl.java b/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapperImpl.java index 1bcd344..2eefc73 100644 --- a/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapperImpl.java +++ b/im-admin/ruoyi-admin/target/generated-sources/annotations/org/dromara/web/domain/vo/TenantListVoToSysTenantVoMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T15:17:33+0800", + date = "2026-04-01T15:40:14+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserGroupController.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserGroupController.java new file mode 100644 index 0000000..3038e01 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserGroupController.java @@ -0,0 +1,105 @@ +package org.dromara.im.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.im.domain.vo.ImUserGroupVo; +import org.dromara.im.domain.bo.ImUserGroupBo; +import org.dromara.im.service.IImUserGroupService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 用户分组 + * + * @author Blue + * @date 2026-04-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/im/userGroup") +public class ImUserGroupController extends BaseController { + + private final IImUserGroupService imUserGroupService; + + /** + * 查询用户分组列表 + */ + @SaCheckPermission("im:userGroup:list") + @GetMapping("/list") + public TableDataInfo list(ImUserGroupBo bo, PageQuery pageQuery) { + return imUserGroupService.queryPageList(bo, pageQuery); + } + + /** + * 导出用户分组列表 + */ + @SaCheckPermission("im:userGroup:export") + @Log(title = "用户分组", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ImUserGroupBo bo, HttpServletResponse response) { + List list = imUserGroupService.queryList(bo); + ExcelUtil.exportExcel(list, "用户分组", ImUserGroupVo.class, response); + } + + /** + * 获取用户分组详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("im:userGroup:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(imUserGroupService.queryById(id)); + } + + /** + * 新增用户分组 + */ + @SaCheckPermission("im:userGroup:add") + @Log(title = "用户分组", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ImUserGroupBo bo) { + return toAjax(imUserGroupService.insertByBo(bo)); + } + + /** + * 修改用户分组 + */ + @SaCheckPermission("im:userGroup:edit") + @Log(title = "用户分组", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ImUserGroupBo bo) { + return toAjax(imUserGroupService.updateByBo(bo)); + } + + /** + * 删除用户分组 + * + * @param ids 主键串 + */ + @SaCheckPermission("im:userGroup:remove") + @Log(title = "用户分组", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(imUserGroupService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserLableController.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserLableController.java new file mode 100644 index 0000000..73b16b9 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImUserLableController.java @@ -0,0 +1,105 @@ +package org.dromara.im.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.im.domain.vo.ImUserLableVo; +import org.dromara.im.domain.bo.ImUserLableBo; +import org.dromara.im.service.IImUserLableService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 用户分组 + * + * @author Blue + * @date 2026-04-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/im/userLable") +public class ImUserLableController extends BaseController { + + private final IImUserLableService imUserLableService; + + /** + * 查询用户分组列表 + */ + @SaCheckPermission("im:userLable:list") + @GetMapping("/list") + public TableDataInfo list(ImUserLableBo bo, PageQuery pageQuery) { + return imUserLableService.queryPageList(bo, pageQuery); + } + + /** + * 导出用户分组列表 + */ + @SaCheckPermission("im:userLable:export") + @Log(title = "用户分组", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ImUserLableBo bo, HttpServletResponse response) { + List list = imUserLableService.queryList(bo); + ExcelUtil.exportExcel(list, "用户分组", ImUserLableVo.class, response); + } + + /** + * 获取用户分组详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("im:userLable:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(imUserLableService.queryById(id)); + } + + /** + * 新增用户分组 + */ + @SaCheckPermission("im:userLable:add") + @Log(title = "用户分组", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ImUserLableBo bo) { + return toAjax(imUserLableService.insertByBo(bo)); + } + + /** + * 修改用户分组 + */ + @SaCheckPermission("im:userLable:edit") + @Log(title = "用户分组", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ImUserLableBo bo) { + return toAjax(imUserLableService.updateByBo(bo)); + } + + /** + * 删除用户分组 + * + * @param ids 主键串 + */ + @SaCheckPermission("im:userLable:remove") + @Log(title = "用户分组", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(imUserLableService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUserGroup.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUserGroup.java new file mode 100644 index 0000000..cc8e568 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUserGroup.java @@ -0,0 +1,43 @@ +package org.dromara.im.domain; + +import com.fhs.core.trans.vo.TransPojo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 用户分组对象 im_user_group + * + * @author Blue + * @date 2026-04-01 + */ +@Data +@TableName("im_user_group") +public class ImUserGroup implements TransPojo { + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 排序 + */ + private Long sort; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUserLable.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUserLable.java new file mode 100644 index 0000000..f0d9837 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImUserLable.java @@ -0,0 +1,43 @@ +package org.dromara.im.domain; + +import com.fhs.core.trans.vo.TransPojo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 用户分组对象 im_user_lable + * + * @author Blue + * @date 2026-04-01 + */ +@Data +@TableName("im_user_lable") +public class ImUserLable implements TransPojo { + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 标签名称 + */ + private String lableName; + + /** + * 排序 + */ + private Long sort; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserGroupBo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserGroupBo.java new file mode 100644 index 0000000..1160e28 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserGroupBo.java @@ -0,0 +1,48 @@ +package org.dromara.im.domain.bo; + +import org.dromara.im.domain.ImUserGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 用户分组业务对象 im_user_group + * + * @author Blue + * @date 2026-04-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ImUserGroup.class, reverseConvertGenerate = false) +public class ImUserGroupBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 分组名称 + */ + @NotBlank(message = "分组名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String groupName; + + /** + * 排序 + */ + @NotNull(message = "排序不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long sort; + + /** + * 备注 + */ + @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + private String remark; + + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserLableBo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserLableBo.java new file mode 100644 index 0000000..bc57fe9 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserLableBo.java @@ -0,0 +1,48 @@ +package org.dromara.im.domain.bo; + +import org.dromara.im.domain.ImUserLable; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 用户分组业务对象 im_user_lable + * + * @author Blue + * @date 2026-04-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ImUserLable.class, reverseConvertGenerate = false) +public class ImUserLableBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 标签名称 + */ + @NotBlank(message = "标签名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String lableName; + + /** + * 排序 + */ + @NotNull(message = "排序不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long sort; + + /** + * 备注 + */ + @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + private String remark; + + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserGroupVo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserGroupVo.java new file mode 100644 index 0000000..7cf9587 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserGroupVo.java @@ -0,0 +1,56 @@ +package org.dromara.im.domain.vo; + +import org.dromara.im.domain.ImUserGroup; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 用户分组视图对象 im_user_group + * + * @author Blue + * @date 2026-04-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ImUserGroup.class) +public class ImUserGroupVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 分组名称 + */ + @ExcelProperty(value = "分组名称") + private String groupName; + + /** + * 排序 + */ + @ExcelProperty(value = "排序") + private Long sort; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserLableVo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserLableVo.java new file mode 100644 index 0000000..b7cacd8 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserLableVo.java @@ -0,0 +1,56 @@ +package org.dromara.im.domain.vo; + +import org.dromara.im.domain.ImUserLable; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 用户分组视图对象 im_user_lable + * + * @author Blue + * @date 2026-04-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ImUserLable.class) +public class ImUserLableVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 标签名称 + */ + @ExcelProperty(value = "标签名称") + private String lableName; + + /** + * 排序 + */ + @ExcelProperty(value = "排序") + private Long sort; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserGroupMapper.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserGroupMapper.java new file mode 100644 index 0000000..6276cbe --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserGroupMapper.java @@ -0,0 +1,15 @@ +package org.dromara.im.mapper; + +import org.dromara.im.domain.ImUserGroup; +import org.dromara.im.domain.vo.ImUserGroupVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 用户分组Mapper接口 + * + * @author Blue + * @date 2026-04-01 + */ +public interface ImUserGroupMapper extends BaseMapperPlus { + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserLableMapper.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserLableMapper.java new file mode 100644 index 0000000..1b3224c --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserLableMapper.java @@ -0,0 +1,15 @@ +package org.dromara.im.mapper; + +import org.dromara.im.domain.ImUserLable; +import org.dromara.im.domain.vo.ImUserLableVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 用户分组Mapper接口 + * + * @author Blue + * @date 2026-04-01 + */ +public interface ImUserLableMapper extends BaseMapperPlus { + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserGroupService.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserGroupService.java new file mode 100644 index 0000000..173e9cd --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserGroupService.java @@ -0,0 +1,68 @@ +package org.dromara.im.service; + +import org.dromara.im.domain.vo.ImUserGroupVo; +import org.dromara.im.domain.bo.ImUserGroupBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 用户分组Service接口 + * + * @author Blue + * @date 2026-04-01 + */ +public interface IImUserGroupService { + + /** + * 查询用户分组 + * + * @param id 主键 + * @return 用户分组 + */ + ImUserGroupVo queryById(Long id); + + /** + * 分页查询用户分组列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户分组分页列表 + */ + TableDataInfo queryPageList(ImUserGroupBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户分组列表 + * + * @param bo 查询条件 + * @return 用户分组列表 + */ + List queryList(ImUserGroupBo bo); + + /** + * 新增用户分组 + * + * @param bo 用户分组 + * @return 是否新增成功 + */ + Boolean insertByBo(ImUserGroupBo bo); + + /** + * 修改用户分组 + * + * @param bo 用户分组 + * @return 是否修改成功 + */ + Boolean updateByBo(ImUserGroupBo bo); + + /** + * 校验并批量删除用户分组信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserLableService.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserLableService.java new file mode 100644 index 0000000..d63ab26 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImUserLableService.java @@ -0,0 +1,68 @@ +package org.dromara.im.service; + +import org.dromara.im.domain.vo.ImUserLableVo; +import org.dromara.im.domain.bo.ImUserLableBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 用户分组Service接口 + * + * @author Blue + * @date 2026-04-01 + */ +public interface IImUserLableService { + + /** + * 查询用户分组 + * + * @param id 主键 + * @return 用户分组 + */ + ImUserLableVo queryById(Long id); + + /** + * 分页查询用户分组列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户分组分页列表 + */ + TableDataInfo queryPageList(ImUserLableBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户分组列表 + * + * @param bo 查询条件 + * @return 用户分组列表 + */ + List queryList(ImUserLableBo bo); + + /** + * 新增用户分组 + * + * @param bo 用户分组 + * @return 是否新增成功 + */ + Boolean insertByBo(ImUserLableBo bo); + + /** + * 修改用户分组 + * + * @param bo 用户分组 + * @return 是否修改成功 + */ + Boolean updateByBo(ImUserLableBo bo); + + /** + * 校验并批量删除用户分组信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserGroupServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserGroupServiceImpl.java new file mode 100644 index 0000000..9a866f3 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserGroupServiceImpl.java @@ -0,0 +1,133 @@ +package org.dromara.im.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.dynamic.datasource.annotation.DS; +import lombok.RequiredArgsConstructor; +import org.dromara.im.constant.ImConstant; +import org.springframework.stereotype.Service; +import org.dromara.im.domain.bo.ImUserGroupBo; +import org.dromara.im.domain.vo.ImUserGroupVo; +import org.dromara.im.domain.ImUserGroup; +import org.dromara.im.mapper.ImUserGroupMapper; +import org.dromara.im.service.IImUserGroupService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 用户分组 Service 业务层处理 + * + * @author Blue + * @date 2026-04-01 + */ +@DS(ImConstant.DS_IM_PLATFORM) +@RequiredArgsConstructor +@Service +public class ImUserGroupServiceImpl implements IImUserGroupService { + + private final ImUserGroupMapper baseMapper; + + /** + * 查询用户分组 + * + * @param id 主键 + * @return 用户分组 + */ + @Override + public ImUserGroupVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询用户分组列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户分组分页列表 + */ + @Override + public TableDataInfo queryPageList(ImUserGroupBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的用户分组列表 + * + * @param bo 查询条件 + * @return 用户分组列表 + */ + @Override + public List queryList(ImUserGroupBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ImUserGroupBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getGroupName()), ImUserGroup::getGroupName, bo.getGroupName()); + lqw.eq(bo.getSort() != null, ImUserGroup::getSort, bo.getSort()); + return lqw; + } + + /** + * 新增用户分组 + * + * @param bo 用户分组 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ImUserGroupBo bo) { + ImUserGroup add = MapstructUtils.convert(bo, ImUserGroup.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改用户分组 + * + * @param bo 用户分组 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ImUserGroupBo bo) { + ImUserGroup update = MapstructUtils.convert(bo, ImUserGroup.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ImUserGroup entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除用户分组信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserLableServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserLableServiceImpl.java new file mode 100644 index 0000000..f98143d --- /dev/null +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserLableServiceImpl.java @@ -0,0 +1,133 @@ +package org.dromara.im.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.dynamic.datasource.annotation.DS; +import lombok.RequiredArgsConstructor; +import org.dromara.im.constant.ImConstant; +import org.springframework.stereotype.Service; +import org.dromara.im.domain.bo.ImUserLableBo; +import org.dromara.im.domain.vo.ImUserLableVo; +import org.dromara.im.domain.ImUserLable; +import org.dromara.im.mapper.ImUserLableMapper; +import org.dromara.im.service.IImUserLableService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 用户分组 Service 业务层处理 + * + * @author Blue + * @date 2026-04-01 + */ +@DS(ImConstant.DS_IM_PLATFORM) +@RequiredArgsConstructor +@Service +public class ImUserLableServiceImpl implements IImUserLableService { + + private final ImUserLableMapper baseMapper; + + /** + * 查询用户分组 + * + * @param id 主键 + * @return 用户分组 + */ + @Override + public ImUserLableVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询用户分组列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户分组分页列表 + */ + @Override + public TableDataInfo queryPageList(ImUserLableBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的用户分组列表 + * + * @param bo 查询条件 + * @return 用户分组列表 + */ + @Override + public List queryList(ImUserLableBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ImUserLableBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getLableName()), ImUserLable::getLableName, bo.getLableName()); + lqw.eq(bo.getSort() != null, ImUserLable::getSort, bo.getSort()); + return lqw; + } + + /** + * 新增用户分组 + * + * @param bo 用户分组 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ImUserLableBo bo) { + ImUserLable add = MapstructUtils.convert(bo, ImUserLable.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改用户分组 + * + * @param bo 用户分组 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ImUserLableBo bo) { + ImUserLable update = MapstructUtils.convert(bo, ImUserLable.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ImUserLable entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除用户分组信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/im-admin/ruoyi-im/src/main/resources/mapper/im/ImUserGroupMapper.xml b/im-admin/ruoyi-im/src/main/resources/mapper/im/ImUserGroupMapper.xml new file mode 100644 index 0000000..5350f96 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/resources/mapper/im/ImUserGroupMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/im-admin/ruoyi-im/src/main/resources/mapper/im/ImUserLableMapper.xml b/im-admin/ruoyi-im/src/main/resources/mapper/im/ImUserLableMapper.xml new file mode 100644 index 0000000..cc9c1ac --- /dev/null +++ b/im-admin/ruoyi-im/src/main/resources/mapper/im/ImUserLableMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/im-admin/ruoyi-im/target/classes/META-INF/mps/autoMapper b/im-admin/ruoyi-im/target/classes/META-INF/mps/autoMapper index 691d987..325e2d1 100644 --- a/im-admin/ruoyi-im/target/classes/META-INF/mps/autoMapper +++ b/im-admin/ruoyi-im/target/classes/META-INF/mps/autoMapper @@ -1,12 +1,16 @@ org.dromara.im.domain.bo.ImGroupMessageBo -org.dromara.im.domain.bo.ImSensitiveWordBo -org.dromara.im.domain.vo.ImGroupMemberVo +org.dromara.im.domain.bo.ImUserGroupBo org.dromara.im.domain.vo.ImPrivateMessageVo -org.dromara.im.domain.vo.ImSensitiveWordVo org.dromara.im.domain.bo.ImGroupMemberBo -org.dromara.im.domain.vo.ImGroupVo +org.dromara.im.domain.bo.ImUserLableBo +org.dromara.im.domain.vo.ImUserLableVo org.dromara.im.domain.vo.ImGroupMessageVo +org.dromara.im.domain.vo.ImUserGroupVo org.dromara.im.domain.vo.ImUserVo -org.dromara.im.domain.bo.ImGroupBo org.dromara.im.domain.bo.ImPrivateMessageBo +org.dromara.im.domain.bo.ImSensitiveWordBo +org.dromara.im.domain.vo.ImGroupMemberVo +org.dromara.im.domain.vo.ImSensitiveWordVo +org.dromara.im.domain.vo.ImGroupVo +org.dromara.im.domain.bo.ImGroupBo org.dromara.im.domain.bo.ImUserBo \ No newline at end of file diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.class index 90372bac8ab44a0160fac264895d10d99a6e996d..33d317765c8c6bc78aeb3bdda14ef20521c7ed60 100644 GIT binary patch delta 29 lcmbQtI+=CDZbnAS$$J=;CMz&$P3B;dn0${>YqA%UCjf~U2%!J~ delta 29 lcmbQtI+=CDZbnA)$$J=;CMz&$P3B;dn0${>YqA%UCjf}<2%i7| diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.class index 6ea0b14c3f6c176fe49b7b6581ab46e7ae6f8fbd..f55fcc915def1c0afb16139bc0948dbe354e2b92 100644 GIT binary patch delta 25 hcmbQsI+u0BK}JqXYeoi^(&E(O$$U&wlb6) delta 25 hcmbQsI+u0BK}Jq@2ju_& diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupToImGroupVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImGroupToImGroupVoMapper.class index b1ad00ab770a9f0fd34fb42d63b0eb648d2e1db8..b3f9ba5e0691cb7b5eb1e93a0cb6a2a6bba87e1a 100644 GIT binary patch delta 13 Vcmcc4a-C(vbVf$Y$uk)D0{|s-1tb6f delta 13 Vcmcc4a-C(vbVf$=$uk)D0{|sz1tI_d diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.class index 7a2d8b5e1aebfbb5c05bfab70c88d25467cf20d3..a78ea0925da166030fc730df9c57efe72b34b52d 100644 GIT binary patch delta 13 VcmdnUx{-CmSw=?7$>$g!0{|p&1!@2Q delta 13 VcmdnUx{-CmSw=?l$>$g!0{|pu1!w>O diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.class index 2cada44b51fd20ded48678091e67ac277575bdea..4f4208f223d11ea00a905b98cf680dd84a772810 100644 GIT binary patch delta 13 VcmZ3^x}0^xaYjbV$tM`^0{|mB1x5e> delta 13 VcmZ3^x}0^xaYjb-$tM`^0{|m11w;S< diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImUserToImUserVoMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/ImUserToImUserVoMapper.class index 61b6c38105dcfb5b53ce806890c57c25f94e66af..8d1d593ad4b51215f66b692efde3e7b4c2d34cf8 100644 GIT binary patch delta 28 kcmX@ha+YPoL`F_aYeoi^(&E(O$>$iQCcfdGyq~cT0Et=(3;+NC delta 28 kcmX@ha+YPoL`F_?Yeoi^(&E(O$>$iQCcfdGyq~cT0EsdR3IG5A diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.class index c10b5ef759f3f6d1a7d464bd38cdc0c37345f926..f3af920e1d6092f30d129b9d0e09f7f211b205ce 100644 GIT binary patch delta 13 UcmaFC{DOJIEJjAl$+H=K0Vbsc*Z=?k delta 13 UcmaFC{DOJIEJjB2$+H=K0VbOS)&Kwi diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.class index 68de59d0984d281c728ec426b4007d5b47286563..5b8486814ed00e1c5fb05f6dd98346924b4b2b88 100644 GIT binary patch delta 13 UcmeBS>0#NhkCD-G@_t5N03W9WY5)KL delta 13 UcmeBS>0#NhkCD-Q@_t5N03V$MXaE2J diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.class index bb4e671cd7df2593e0448ebc16c06d81762ae03c..090b6f571d125383ef39dd26cfa194b9b3d4429f 100644 GIT binary patch delta 13 UcmbQlGKpow5k^MK$wwJ|0U&t}m0VWv*FaQ7m delta 13 UcmX@da*k!gK1N3K$@>}m0VWRxE&u=k diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.class index 730256d6e146150b7bc515713d47e16c9a023a23..857217a71100e70404721339bbc7b46cfeb44a50 100644 GIT binary patch delta 13 Vcmcb{a*buf5k^MK$wwI{0sto+1x^3} delta 13 Vcmcb{a*buf5k^My$wwI{0stoy1xx?{ diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.class index d010c057a97920bd585f1695f00071e791efb970..8b93b40cf95eedc74bcb1f23b44ca32558359be9 100644 GIT binary patch delta 13 UcmbQoGLL1$EJjAl$+H=o0U!Ycd;kCd delta 13 UcmbQoGLL1$EJjB2$+H=o0U!4SdH?_b diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.class index a2dd25fc50a12099225aadf7be1234563dfb4619..bcb4f04bcc55c77ea0e3398ca9b0fab0ea931262 100644 GIT binary patch delta 13 VcmaFH@{DD}1x7~8$rl-?0stu`1&ROw delta 13 VcmaFH@{DD}1x7~m$rl-?0stu+1&9Cu diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.class index 5c764e97d39d5b28b0e57c32e4996e4a3caaa192..2588bc086b13a9f192b4471aeaf3b78a77ead170 100644 GIT binary patch delta 13 Vcmcb|a*t)hDMm)i$)_170{|!?1#AES delta 13 Vcmcb|a*t)hDMm)~$)_170{|!&1!@2Q diff --git a/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImUserVoToImUserMapper.class b/im-admin/ruoyi-im/target/classes/org/dromara/im/domain/vo/ImUserVoToImUserMapper.class index 73ab6b816006ee06354e879334af6ae1b5f9a0b9..afe3b0cb7945ca72fd03f2f2e72422c9dc67c1d9 100644 GIT binary patch delta 13 UcmbQnGL2=!6h=nN$x|5{0UrGXUH||9 delta 13 UcmbQnGL2=!6h=n#$x|5{0Uq-NTmS$7 diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.java index e115e1a..62cad67 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapper.java @@ -1,6 +1,6 @@ package org.dromara.im.domain; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.bo.ImGroupMemberBoToImGroupMemberMapper; import org.dromara.im.domain.vo.ImGroupMemberVo; @@ -8,8 +8,8 @@ import org.dromara.im.domain.vo.ImGroupMemberVoToImGroupMemberMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, - uses = {ImGroupMemberVoToImGroupMemberMapper.class,ImGroupMemberBoToImGroupMemberMapper.class}, + config = AutoMapperConfig__169.class, + uses = {ImGroupMemberBoToImGroupMemberMapper.class,ImGroupMemberVoToImGroupMemberMapper.class}, imports = {} ) public interface ImGroupMemberToImGroupMemberVoMapper extends BaseMapper { diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapperImpl.java index 2454481..4e0f070 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMemberToImGroupMemberVoMapperImpl.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.java index 02261fb..15bfc92 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapper.java @@ -1,6 +1,6 @@ package org.dromara.im.domain; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.bo.ImGroupMessageBoToImGroupMessageMapper; import org.dromara.im.domain.vo.ImGroupMessageVo; @@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImGroupMessageVoToImGroupMessageMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImGroupMessageBoToImGroupMessageMapper.class,ImGroupMessageVoToImGroupMessageMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapperImpl.java index d39851b..3c2bfca 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupMessageToImGroupMessageVoMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapper.java index b90a483..8f66d2a 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapper.java @@ -1,6 +1,6 @@ package org.dromara.im.domain; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.bo.ImGroupBoToImGroupMapper; import org.dromara.im.domain.vo.ImGroupVo; @@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImGroupVoToImGroupMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImGroupVoToImGroupMapper.class,ImGroupBoToImGroupMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapperImpl.java index 5e96281..78d60ad 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImGroupToImGroupVoMapperImpl.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:05+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.java index 2d77730..429e45d 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapper.java @@ -1,6 +1,6 @@ package org.dromara.im.domain; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.bo.ImPrivateMessageBoToImPrivateMessageMapper; import org.dromara.im.domain.vo.ImPrivateMessageVo; @@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImPrivateMessageVoToImPrivateMessageMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImPrivateMessageVoToImPrivateMessageMapper.class,ImPrivateMessageBoToImPrivateMessageMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapperImpl.java index b0d85c6..9279d52 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImPrivateMessageToImPrivateMessageVoMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:05+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.java index 4f0e597..1295aad 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapper.java @@ -1,6 +1,6 @@ package org.dromara.im.domain; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.bo.ImSensitiveWordBoToImSensitiveWordMapper; import org.dromara.im.domain.vo.ImSensitiveWordVo; @@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImSensitiveWordVoToImSensitiveWordMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImSensitiveWordBoToImSensitiveWordMapper.class,ImSensitiveWordVoToImSensitiveWordMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapperImpl.java index ffaa7c4..85b9a71 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImSensitiveWordToImSensitiveWordVoMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:08+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapper.java index 55de8ca..3597ad2 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapper.java @@ -1,6 +1,6 @@ package org.dromara.im.domain; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.bo.ImUserBoToImUserMapper; import org.dromara.im.domain.vo.ImUserVo; @@ -8,7 +8,7 @@ import org.dromara.im.domain.vo.ImUserVoToImUserMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImUserVoToImUserMapper.class,ImUserBoToImUserMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapperImpl.java index 234c8b8..2e44530 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/ImUserToImUserVoMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:05+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.java index e136d7a..ecb1927 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapper.java @@ -1,12 +1,12 @@ package org.dromara.im.domain.bo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImGroup; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapperImpl.java index c30a7f9..1adf33e 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupBoToImGroupMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.java index 82626b3..db3df65 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapper.java @@ -1,12 +1,12 @@ package org.dromara.im.domain.bo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImGroupMember; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapperImpl.java index 235333e..9b1ef3c 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMemberBoToImGroupMemberMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:05+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.java index b5919d0..337a812 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapper.java @@ -1,12 +1,12 @@ package org.dromara.im.domain.bo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImGroupMessage; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapperImpl.java index 009433f..dd32931 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImGroupMessageBoToImGroupMessageMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.java index fa5253b..0a82930 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapper.java @@ -1,12 +1,12 @@ package org.dromara.im.domain.bo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImPrivateMessage; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapperImpl.java index 36dce61..2da69dd 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImPrivateMessageBoToImPrivateMessageMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:05+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.java index f888069..1ce299e 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapper.java @@ -1,12 +1,12 @@ package org.dromara.im.domain.bo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImSensitiveWord; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapperImpl.java index 3225dad..447c260 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImSensitiveWordBoToImSensitiveWordMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapper.java index e070c24..85ebfd0 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapper.java @@ -1,12 +1,12 @@ package org.dromara.im.domain.bo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImUser; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.java index f2bdf1b..db5da1d 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/bo/ImUserBoToImUserMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:05+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.java index d7974d1..7f61544 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapper.java @@ -1,13 +1,13 @@ package org.dromara.im.domain.vo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImGroupMember; import org.dromara.im.domain.ImGroupMemberToImGroupMemberVoMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImGroupMemberToImGroupMemberVoMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapperImpl.java index c00cf47..dd704d8 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMemberVoToImGroupMemberMapperImpl.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.java index b007ba3..445a3d2 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapper.java @@ -1,13 +1,13 @@ package org.dromara.im.domain.vo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImGroupMessage; import org.dromara.im.domain.ImGroupMessageToImGroupMessageVoMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImGroupMessageToImGroupMessageVoMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapperImpl.java index 0bdd33a..033073d 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupMessageVoToImGroupMessageMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.java index 8dcaf4c..ed5f019 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapper.java @@ -1,13 +1,13 @@ package org.dromara.im.domain.vo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImGroup; import org.dromara.im.domain.ImGroupToImGroupVoMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImGroupToImGroupVoMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapperImpl.java index 291ab5d..73fb02d 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImGroupVoToImGroupMapperImpl.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.java index 6bd83cf..04d41ea 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapper.java @@ -1,13 +1,13 @@ package org.dromara.im.domain.vo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImPrivateMessage; import org.dromara.im.domain.ImPrivateMessageToImPrivateMessageVoMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImPrivateMessageToImPrivateMessageVoMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapperImpl.java index 421426a..ff8bf43 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImPrivateMessageVoToImPrivateMessageMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.java index d78474a..75aaf45 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapper.java @@ -1,13 +1,13 @@ package org.dromara.im.domain.vo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImSensitiveWord; import org.dromara.im.domain.ImSensitiveWordToImSensitiveWordVoMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImSensitiveWordToImSensitiveWordVoMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapperImpl.java index 02bf360..56c9103 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImSensitiveWordVoToImSensitiveWordMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:05+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapper.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapper.java index 9ffd305..bc3d748 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapper.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapper.java @@ -1,13 +1,13 @@ package org.dromara.im.domain.vo; -import io.github.linpeilie.AutoMapperConfig__167; +import io.github.linpeilie.AutoMapperConfig__169; import io.github.linpeilie.BaseMapper; import org.dromara.im.domain.ImUser; import org.dromara.im.domain.ImUserToImUserVoMapper; import org.mapstruct.Mapper; @Mapper( - config = AutoMapperConfig__167.class, + config = AutoMapperConfig__169.class, uses = {ImUserToImUserVoMapper.class}, imports = {} ) diff --git a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.java b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.java index 062f90d..fe92ad6 100644 --- a/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.java +++ b/im-admin/ruoyi-im/target/generated-sources/annotations/org/dromara/im/domain/vo/ImUserVoToImUserMapperImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2026-03-31T16:18:09+0800", + date = "2026-04-01T15:40:06+0800", comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" ) @Component