diff --git a/db/im-admin.sql b/db/im-admin.sql index a47e857..b2da57c 100644 --- a/db/im-admin.sql +++ b/db/im-admin.sql @@ -360,6 +360,10 @@ insert into sys_menu values('6', '消息管理', '0', '3', 'message', null, '', insert into sys_menu values('60', '私聊消息', '6', '1', 'private', 'im/message/private/index', '', 1, 0, 'C', '0', '0', 'im:privateMessage:list', 'education, 103, 1, sysdate(), null, null, 'IM私聊消息'); insert into sys_menu values('6001', '私聊消息查询', '60', '1', '#', '', '', 1, 0, 'F', '0', '0', 'im:privateMessage:query', '#', 103, 1, sysdate(), null, null, ''); +-- IM-群聊管理 +insert into sys_menu values('61', '群聊消息', '6', '2', 'group', 'im/message/group/index', '', 1, 0, 'C', '0', '0', 'im:groupMessage:list', 'category', 103, 1, sysdate(), null, null, 'IM群聊消息'); +insert into sys_menu values('6101', '群聊消息查询', '61', '1', '#', '', '', 1, 0, 'F', '0', '0', 'im:groupMessage:query', '#', 103, 1, sysdate(), null, null, ''); + -- ---------------------------- -- 6、用户和角色关联表 用户N-1角色 -- ---------------------------- diff --git a/im-admin-ui/src/api/im/groupMessage/index.ts b/im-admin-ui/src/api/im/groupMessage/index.ts index 64aca83..0c5cc91 100644 --- a/im-admin-ui/src/api/im/groupMessage/index.ts +++ b/im-admin-ui/src/api/im/groupMessage/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { GroupMessageVO, GroupMessageForm, GroupMessageQuery } from '@/api/im/groupMessage/types'; +import { GroupMessageVO, GroupMessageQuery } from '@/api/im/groupMessage/types'; /** * 查询群消息列表 @@ -27,37 +27,3 @@ export const getGroupMessage = (id: string | number): AxiosPromise { - return request({ - url: '/im/groupMessage', - method: 'post', - data: data - }); -}; - -/** - * 修改群消息 - * @param data - */ -export const updateGroupMessage = (data: GroupMessageForm) => { - return request({ - url: '/im/groupMessage', - method: 'put', - data: data - }); -}; - -/** - * 删除群消息 - * @param id - */ -export const delGroupMessage = (id: string | number | Array) => { - return request({ - url: '/im/groupMessage/' + id, - method: 'delete' - }); -}; diff --git a/im-admin-ui/src/api/im/groupMessage/types.ts b/im-admin-ui/src/api/im/groupMessage/types.ts index e195bbd..907c73c 100644 --- a/im-admin-ui/src/api/im/groupMessage/types.ts +++ b/im-admin-ui/src/api/im/groupMessage/types.ts @@ -7,12 +7,23 @@ export interface GroupMessageVO { /** * 群id */ - groupId: string | number; + groupId: number; + + /** + * 群名 + */ + groupName: string, /** * 发送用户id */ - sendId: string | number; + sendId: number; + + /** + * 发送用户 + */ + sendUserName: string; + /** * 发送用户昵称 @@ -72,11 +83,20 @@ export interface GroupMessageForm extends BaseEntity { */ groupId?: string | number; + /** +* 群名 +*/ + groupName: string, + /** * 发送用户id */ sendId?: string | number; + /** + * 发送用户 + */ + sendUserName: string; /** * 发送用户昵称 */ @@ -181,10 +201,10 @@ export interface GroupMessageQuery extends PageQuery { */ recvIds?: string | number; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } diff --git a/im-admin-ui/src/components/im/ImGroupSelect/index.vue b/im-admin-ui/src/components/im/ImGroupSelect/index.vue index 86cc562..e81239a 100644 --- a/im-admin-ui/src/components/im/ImGroupSelect/index.vue +++ b/im-admin-ui/src/components/im/ImGroupSelect/index.vue @@ -27,7 +27,7 @@ const props = defineProps({ const loading = ref(false) const options = ref() -const model = defineModel>() +const model = defineModel | string | Array>() const groupIds = computed({ get() { if(model.value != undefined){ @@ -43,7 +43,7 @@ const groupIds = computed({ const handleRemote = (name: String)=>{ loading.value = true - findGroupByName().then((res) => { + findGroupByName(name).then((res) => { loading.value = false; options.value = res.data; }); diff --git a/im-admin-ui/src/components/im/ImSysMsgSelect/index.vue b/im-admin-ui/src/components/im/ImSysMsgSelect/index.vue index 73cd212..1f746f7 100644 --- a/im-admin-ui/src/components/im/ImSysMsgSelect/index.vue +++ b/im-admin-ui/src/components/im/ImSysMsgSelect/index.vue @@ -26,7 +26,7 @@ const props = defineProps({ const loading = ref(false) const options = ref() -const model = defineModel>() +const model = defineModel | string | Array>() const messageIds = computed({ get() { if(model.value != undefined){ diff --git a/im-admin-ui/src/components/im/ImUserSelect/index.vue b/im-admin-ui/src/components/im/ImUserSelect/index.vue index 52c9ce9..ad3d25f 100644 --- a/im-admin-ui/src/components/im/ImUserSelect/index.vue +++ b/im-admin-ui/src/components/im/ImUserSelect/index.vue @@ -26,7 +26,7 @@ const props = defineProps({ const loading = ref(false) const options = ref() -const model = defineModel>() +const model = defineModel | string | Array>() const userIds = computed({ get() { if(model.value != undefined){ diff --git a/im-admin-ui/src/views/im/message/group/index.vue b/im-admin-ui/src/views/im/message/group/index.vue index c48c590..3a463e5 100644 --- a/im-admin-ui/src/views/im/message/group/index.vue +++ b/im-admin-ui/src/views/im/message/group/index.vue @@ -4,34 +4,30 @@
- - + + - - + + - - + + - - + + - - - - - - - - - - - + + + + 搜索 @@ -41,51 +37,34 @@
- - - - - - - - - - - - - + + + + + + + + + + + + - - - @@ -96,20 +75,11 @@ - - - - - - - - - - - + + - + - - + + - - + + @@ -149,13 +118,11 @@ const groupMessageList = ref([]); const buttonLoading = ref(false); const loading = ref(true); const showSearch = ref(true); -const ids = ref>([]); -const single = ref(true); -const multiple = ref(true); const total = ref(0); const queryFormRef = ref(); const groupMessageFormRef = ref(); +const dateRange = ref<[DateModelType, DateModelType]>(['', '']); const dialog = reactive({ visible: false, @@ -165,7 +132,9 @@ const dialog = reactive({ const initFormData: GroupMessageForm = { id: undefined, groupId: undefined, + groupName: undefined, sendId: undefined, + sendUserName: undefined, sendNickName: undefined, atUserIds: undefined, content: undefined, @@ -196,62 +165,21 @@ const data = reactive>({ } }, rules: { - id: [ - { required: true, message: "id不能为空", trigger: "blur" } - ], - groupId: [ - { required: true, message: "群id不能为空", trigger: "blur" } - ], - sendId: [ - { required: true, message: "发送用户id不能为空", trigger: "blur" } - ], - sendNickName: [ - { required: true, message: "发送用户昵称不能为空", trigger: "blur" } - ], - atUserIds: [ - { required: true, message: "被@用户id列表，逗号分隔不能为空", trigger: "blur" } - ], - content: [ - { required: true, message: "发送内容不能为空", trigger: "blur" } - ], - status: [ - { required: true, message: "不能为空", trigger: "change" } - ], - type: [ - { required: true, message: "消息类型 0:文字 1:图片 2:文件不能为空", trigger: "change" } - ], - sendTime: [ - { required: true, message: "发送时间不能为空", trigger: "blur" } - ], - receiptOk: [ - { required: true, message: "回执消息是否完成不能为空", trigger: "blur" } - ], - receipt: [ - { required: true, message: "是否回执消息不能为空", trigger: "blur" } - ], - recvIds: [ - { required: true, message: "接收用户id,逗号分隔，为空表示发给所有成员不能为空", trigger: "blur" } - ] } }); const { queryParams, form, rules } = toRefs(data); +const { im_message_type,sys_bool } = toRefs(proxy?.useDict('im_message_type','sys_bool')); /** 查询群消息列表 */ const getList = async () => { loading.value = true; - const res = await listGroupMessage(queryParams.value); + const res = await listGroupMessage(proxy?.addDateRange(queryParams.value, dateRange.value)); groupMessageList.value = res.rows; total.value = res.total; loading.value = false; } -/** 取消按钮 */ -const cancel = () => { - reset(); - dialog.visible = false; -} - /** 表单重置 */ const reset = () => { form.value = {...initFormData}; @@ -270,61 +198,19 @@ const resetQuery = () => { handleQuery(); } -/** 多选框选中数据 */ -const handleSelectionChange = (selection: GroupMessageVO[]) => { - ids.value = selection.map(item => item.id); - single.value = selection.length != 1; - multiple.value = !selection.length; -} - -/** 新增按钮操作 */ -const handleAdd = () => { - reset(); - dialog.visible = true; - dialog.title = "添加群消息"; +/** 确定按钮 */ +const submitForm = () => { + dialog.visible = false; } -/** 修改按钮操作 */ -const handleUpdate = async (row?: GroupMessageVO) => { +/** 详情按钮操作 */ +const handleDetail = async (row?: GroupMessageVO) => { reset(); - const _id = row?.id || ids.value[0] + const _id = row?.id const res = await getGroupMessage(_id); Object.assign(form.value, res.data); dialog.visible = true; - dialog.title = "修改群消息"; -} - -/** 提交按钮 */ -const submitForm = () => { - groupMessageFormRef.value?.validate(async (valid: boolean) => { - if (valid) { - buttonLoading.value = true; - if (form.value.id) { - await updateGroupMessage(form.value).finally(() => buttonLoading.value = false); - } else { - await addGroupMessage(form.value).finally(() => buttonLoading.value = false); - } - proxy?.$modal.msgSuccess("操作成功"); - dialog.visible = false; - await getList(); - } - }); -} - -/** 删除按钮操作 */ -const handleDelete = async (row?: GroupMessageVO) => { - const _ids = row?.id || ids.value; - await proxy?.$modal.confirm('是否确认删除群消息编号为"' + _ids + '"的数据项？').finally(() => loading.value = false); - await delGroupMessage(_ids); - proxy?.$modal.msgSuccess("删除成功"); - await getList(); -} - -/** 导出按钮操作 */ -const handleExport = () => { - proxy?.download('im/groupMessage/export', { - ...queryParams.value - }, `groupMessage_${new Date().getTime()}.xlsx`) + dialog.title = "消息详情"; } onMounted(() => { diff --git a/im-admin-ui/src/views/im/message/private/index.vue b/im-admin-ui/src/views/im/message/private/index.vue index 78dfd2b..c88e558 100644 --- a/im-admin-ui/src/views/im/message/private/index.vue +++ b/im-admin-ui/src/views/im/message/private/index.vue @@ -44,7 +44,7 @@ - + @@ -70,7 +70,7 @@ @@ -88,7 +88,7 @@ - + ([]); const buttonLoading = ref(false); const loading = ref(true); const showSearch = ref(true); -const ids = ref>([]); -const single = ref(true); -const multiple = ref(true); const total = ref(0); const queryFormRef = ref(); @@ -201,30 +198,15 @@ const resetQuery = () => { handleQuery(); } -/** 多选框选中数据 */ -const handleSelectionChange = (selection: PrivateMessageVO[]) => { - ids.value = selection.map(item => item.id); - single.value = selection.length != 1; - multiple.value = !selection.length; -} - /** 修改按钮操作 */ -const handleUpdate = async (row?: PrivateMessageVO) => { +const handleDetail = async (row?: PrivateMessageVO) => { reset(); - const _id = row?.id || ids.value[0] + const _id = row?.id const res = await getPrivateMessage(_id); Object.assign(form.value, res.data); dialog.visible = true; dialog.title = "消息详情"; } - -/** 导出按钮操作 */ -const handleExport = () => { - proxy?.download('im/privateMessage/export', { - ...queryParams.value - }, `privateMessage_${new Date().getTime()}.xlsx`) -} - onMounted(() => { getList(); }); diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImGroupMessageController.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImGroupMessageController.java index 41daacb..a5f5d82 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImGroupMessageController.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImGroupMessageController.java @@ -46,17 +46,6 @@ public class ImGroupMessageController extends BaseController { return imGroupMessageService.queryPageList(bo, pageQuery); } - /** - * 导出群消息列表 - */ - @SaCheckPermission("im:groupMessage:export") - @Log(title = "群消息", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(ImGroupMessageBo bo, HttpServletResponse response) { - List list = imGroupMessageService.queryList(bo); - ExcelUtil.exportExcel(list, "群消息", ImGroupMessageVo.class, response); - } - /** * 获取群消息详细信息 * @@ -69,38 +58,5 @@ public class ImGroupMessageController extends BaseController { return R.ok(imGroupMessageService.queryById(id)); } - /** - * 新增群消息 - */ - @SaCheckPermission("im:groupMessage:add") - @Log(title = "群消息", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody ImGroupMessageBo bo) { - return toAjax(imGroupMessageService.insertByBo(bo)); - } - /** - * 修改群消息 - */ - @SaCheckPermission("im:groupMessage:edit") - @Log(title = "群消息", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody ImGroupMessageBo bo) { - return toAjax(imGroupMessageService.updateByBo(bo)); - } - - /** - * 删除群消息 - * - * @param ids 主键串 - */ - @SaCheckPermission("im:groupMessage:remove") - @Log(title = "群消息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(imGroupMessageService.deleteWithValidByIds(List.of(ids), true)); - } } diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroup.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroup.java index e64afce..020640c 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroup.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroup.java @@ -2,6 +2,7 @@ package org.dromara.im.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fhs.core.trans.vo.TransPojo; import lombok.Data; import java.io.Serial; @@ -15,7 +16,7 @@ import java.util.Date; */ @Data @TableName("im_group") -public class ImGroup { +public class ImGroup implements TransPojo { @Serial private static final long serialVersionUID = 1L; diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroupMessage.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroupMessage.java index 7e92383..5a852a3 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroupMessage.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroupMessage.java @@ -69,12 +69,12 @@ public class ImGroupMessage { /** * 回执消息是否完成 */ - private Long receiptOk; + private Boolean receiptOk; /** * 是否回执消息 */ - private Long receipt; + private Boolean receipt; /** * 接收用户id,逗号分隔，为空表示发给所有成员 diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMemberBo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMemberBo.java index 4a3b46e..42d8e04 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMemberBo.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMemberBo.java @@ -19,68 +19,57 @@ import java.util.Date; * @date 2024-12-22 */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = ImGroupMember.class, reverseConvertGenerate = false) -public class ImGroupMemberBo extends BaseEntity { +public class ImGroupMemberBo { /** * id */ - @NotNull(message = "id不能为空", groups = { EditGroup.class }) private Long id; /** * 群id */ - @NotNull(message = "群id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long groupId; /** * 用户id */ - @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long userId; /** * 组内显示名称 */ - @NotBlank(message = "组内显示名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String remarkNickName; /** * 用户头像 */ - @NotBlank(message = "用户头像不能为空", groups = { AddGroup.class, EditGroup.class }) private String headImage; /** * 群名备注 */ - @NotBlank(message = "群名备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remarkGroupName; /** * 是否已退出 */ - @NotNull(message = "是否已退出不能为空", groups = { AddGroup.class, EditGroup.class }) private Long quit; /** * 创建时间 */ - @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date createdTime; /** * 退出时间 */ - @NotNull(message = "退出时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date quitTime; /** * 用户昵称 */ - @NotBlank(message = "用户昵称不能为空", groups = { AddGroup.class, EditGroup.class }) private String userNickName; diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMessageBo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMessageBo.java index 8e50e1d..be60445 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMessageBo.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMessageBo.java @@ -11,6 +11,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.im.domain.ImGroupMessage; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 群消息业务对象 im_group_message @@ -19,81 +21,71 @@ import java.util.Date; * @date 2024-12-22 */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = ImGroupMessage.class, reverseConvertGenerate = false) -public class ImGroupMessageBo extends BaseEntity { +public class ImGroupMessageBo { /** * id */ - @NotNull(message = "id不能为空", groups = { EditGroup.class }) private Long id; /** * 群id */ - @NotNull(message = "群id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long groupId; /** * 发送用户id */ - @NotNull(message = "发送用户id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long sendId; /** * 发送用户昵称 */ - @NotBlank(message = "发送用户昵称不能为空", groups = { AddGroup.class, EditGroup.class }) private String sendNickName; /** * 被@用户id列表，逗号分隔 */ - @NotBlank(message = "被@用户id列表，逗号分隔不能为空", groups = { AddGroup.class, EditGroup.class }) private String atUserIds; /** * 发送内容 */ - @NotBlank(message = "发送内容不能为空", groups = { AddGroup.class, EditGroup.class }) private String content; /** * */ - @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class }) private Long status; /** * 消息类型 0:文字 1:图片 2:文件 */ - @NotNull(message = "消息类型 0:文字 1:图片 2:文件不能为空", groups = { AddGroup.class, EditGroup.class }) private Long type; /** * 发送时间 */ - @NotNull(message = "发送时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date sendTime; /** * 回执消息是否完成 */ - @NotNull(message = "回执消息是否完成不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long receiptOk; + private Boolean receiptOk; /** * 是否回执消息 */ - @NotNull(message = "是否回执消息不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long receipt; + private Boolean receipt; /** * 接收用户id,逗号分隔，为空表示发给所有成员 */ - @NotBlank(message = "接收用户id,逗号分隔，为空表示发给所有成员不能为空", groups = { AddGroup.class, EditGroup.class }) private String recvIds; - + /** + * 请求参数 + */ + private Map params = new HashMap<>(); } diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPrivateMessageBo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPrivateMessageBo.java index 0b057e8..cf59ab2 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPrivateMessageBo.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPrivateMessageBo.java @@ -17,9 +17,8 @@ import java.util.Map; * @date 2024-12-22 */ @Data -@EqualsAndHashCode(callSuper = true) @AutoMapper(target = ImPrivateMessage.class, reverseConvertGenerate = false) -public class ImPrivateMessageBo extends BaseEntity { +public class ImPrivateMessageBo { /** * id diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImGroupMessageVo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImGroupMessageVo.java index dfbfff1..0301df6 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImGroupMessageVo.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImGroupMessageVo.java @@ -2,9 +2,16 @@ package org.dromara.im.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.fhs.core.trans.anno.Trans; +import com.fhs.core.trans.constant.TransType; +import com.fhs.core.trans.vo.TransPojo; import io.github.linpeilie.annotations.AutoMapper; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.dromara.im.constant.ImConstant; +import org.dromara.im.domain.ImGroup; import org.dromara.im.domain.ImGroupMessage; +import org.dromara.im.domain.ImUser; import java.io.Serial; import java.io.Serializable; @@ -21,7 +28,7 @@ import java.util.Date; @Data @ExcelIgnoreUnannotated @AutoMapper(target = ImGroupMessage.class) -public class ImGroupMessageVo implements Serializable { +public class ImGroupMessageVo implements TransPojo { @Serial private static final long serialVersionUID = 1L; @@ -35,15 +42,22 @@ public class ImGroupMessageVo implements Serializable { /** * 群id */ - @ExcelProperty(value = "群id") + @Trans(type = TransType.SIMPLE,dataSource = ImConstant.DS_IM_PLATFORM,target = ImGroup.class, fields = "name", ref = "groupName") private Long groupId; + @ExcelProperty(value = "群名称") + private String groupName; + /** * 发送用户id */ - @ExcelProperty(value = "发送用户id") + @Trans(type = TransType.SIMPLE,dataSource = ImConstant.DS_IM_PLATFORM,target = ImUser.class, fields = "userName", ref = "sendUserName") private Long sendId; + @ExcelProperty(value = "发送用户") + private String sendUserName; + + /** * 发送用户昵称 */ @@ -84,13 +98,13 @@ public class ImGroupMessageVo implements Serializable { * 回执消息是否完成 */ @ExcelProperty(value = "回执消息是否完成") - private Long receiptOk; + private Boolean receiptOk; /** * 是否回执消息 */ @ExcelProperty(value = "是否回执消息") - private Long receipt; + private Boolean receipt; /** * 接收用户id,逗号分隔，为空表示发给所有成员 diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImGroupMessageService.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImGroupMessageService.java index f204503..deb3e36 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImGroupMessageService.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImGroupMessageService.java @@ -41,28 +41,6 @@ public interface IImGroupMessageService { */ List queryList(ImGroupMessageBo bo); - /** - * 新增群消息 - * - * @param bo 群消息 - * @return 是否新增成功 - */ - Boolean insertByBo(ImGroupMessageBo bo); - /** - * 修改群消息 - * - * @param bo 群消息 - * @return 是否修改成功 - */ - Boolean updateByBo(ImGroupMessageBo 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/ImGroupMemberServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMemberServiceImpl.java index 4092c23..02a6a6c 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMemberServiceImpl.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMemberServiceImpl.java @@ -53,8 +53,8 @@ public class ImGroupMemberServiceImpl implements IImGroupMemberService { */ @Override public TableDataInfo queryPageList(ImGroupMemberBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), wrapper); // 填充显示昵称 result.getRecords().forEach(m -> { m.setShowNickName(StrUtil.isEmpty(m.getRemarkNickName()) ? m.getUserNickName() : m.getRemarkNickName()); @@ -70,8 +70,8 @@ public class ImGroupMemberServiceImpl implements IImGroupMemberService { */ @Override public List queryList(ImGroupMemberBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + return baseMapper.selectVoList(wrapper); } @@ -84,16 +84,15 @@ public class ImGroupMemberServiceImpl implements IImGroupMemberService { } private LambdaQueryWrapper buildQueryWrapper(ImGroupMemberBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getGroupId() != null, ImGroupMember::getGroupId, bo.getGroupId()); - lqw.eq(bo.getUserId() != null, ImGroupMember::getUserId, bo.getUserId()); - lqw.like(StringUtils.isNotBlank(bo.getRemarkNickName()), ImGroupMember::getRemarkNickName, bo.getRemarkNickName()); - lqw.like(StringUtils.isNotBlank(bo.getRemarkGroupName()), ImGroupMember::getRemarkGroupName, bo.getRemarkGroupName()); - lqw.like(StringUtils.isNotBlank(bo.getUserNickName()), ImGroupMember::getUserNickName, bo.getUserNickName()); - lqw.eq(ImGroupMember::getQuit, false); - lqw.orderByDesc(ImGroupMember::getCreatedTime); - return lqw; + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(bo.getGroupId() != null, ImGroupMember::getGroupId, bo.getGroupId()); + wrapper.eq(bo.getUserId() != null, ImGroupMember::getUserId, bo.getUserId()); + wrapper.like(StringUtils.isNotBlank(bo.getRemarkNickName()), ImGroupMember::getRemarkNickName, bo.getRemarkNickName()); + wrapper.like(StringUtils.isNotBlank(bo.getRemarkGroupName()), ImGroupMember::getRemarkGroupName, bo.getRemarkGroupName()); + wrapper.like(StringUtils.isNotBlank(bo.getUserNickName()), ImGroupMember::getUserNickName, bo.getUserNickName()); + wrapper.eq(ImGroupMember::getQuit, false); + wrapper.orderByDesc(ImGroupMember::getCreatedTime); + return wrapper; } diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMessageServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMessageServiceImpl.java index 35c65d5..2b95f66 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMessageServiceImpl.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMessageServiceImpl.java @@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.im.constant.ImConstant; import org.dromara.im.domain.ImGroupMessage; +import org.dromara.im.domain.ImPrivateMessage; import org.dromara.im.domain.bo.ImGroupMessageBo; import org.dromara.im.domain.vo.ImGroupMessageVo; import org.dromara.im.mapper.ImGroupMessageMapper; @@ -54,8 +55,8 @@ public class ImGroupMessageServiceImpl implements IImGroupMessageService { */ @Override public TableDataInfo queryPageList(ImGroupMessageBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), wrapper); return TableDataInfo.build(result); } @@ -67,76 +68,22 @@ public class ImGroupMessageServiceImpl implements IImGroupMessageService { */ @Override public List queryList(ImGroupMessageBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + return baseMapper.selectVoList(wrapper); } private LambdaQueryWrapper buildQueryWrapper(ImGroupMessageBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getGroupId() != null, ImGroupMessage::getGroupId, bo.getGroupId()); - lqw.eq(bo.getSendId() != null, ImGroupMessage::getSendId, bo.getSendId()); - lqw.like(StringUtils.isNotBlank(bo.getSendNickName()), ImGroupMessage::getSendNickName, bo.getSendNickName()); - lqw.eq(StringUtils.isNotBlank(bo.getAtUserIds()), ImGroupMessage::getAtUserIds, bo.getAtUserIds()); - lqw.eq(StringUtils.isNotBlank(bo.getContent()), ImGroupMessage::getContent, bo.getContent()); - lqw.eq(bo.getStatus() != null, ImGroupMessage::getStatus, bo.getStatus()); - lqw.eq(bo.getType() != null, ImGroupMessage::getType, bo.getType()); - lqw.eq(bo.getSendTime() != null, ImGroupMessage::getSendTime, bo.getSendTime()); - lqw.eq(bo.getReceiptOk() != null, ImGroupMessage::getReceiptOk, bo.getReceiptOk()); - lqw.eq(bo.getReceipt() != null, ImGroupMessage::getReceipt, bo.getReceipt()); - lqw.eq(StringUtils.isNotBlank(bo.getRecvIds()), ImGroupMessage::getRecvIds, bo.getRecvIds()); - return lqw; + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(bo.getGroupId() != null, ImGroupMessage::getGroupId, bo.getGroupId()); + wrapper.eq(bo.getSendId() != null, ImGroupMessage::getSendId, bo.getSendId()); + wrapper.like(StringUtils.isNotBlank(bo.getContent()), ImGroupMessage::getContent, bo.getContent()); + wrapper.eq(bo.getStatus() != null, ImGroupMessage::getStatus, bo.getStatus()); + wrapper.eq(bo.getType() != null, ImGroupMessage::getType, bo.getType()); + wrapper.between(params.get("beginTime") != null && params.get("endTime") != null, ImGroupMessage::getSendTime, + params.get("beginTime"), params.get("endTime")); + wrapper.orderByDesc(ImGroupMessage::getId); + return wrapper; } - /** - * 新增群消息 - * - * @param bo 群消息 - * @return 是否新增成功 - */ - @Override - public Boolean insertByBo(ImGroupMessageBo bo) { - ImGroupMessage add = MapstructUtils.convert(bo, ImGroupMessage.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - return flag; - } - - /** - * 修改群消息 - * - * @param bo 群消息 - * @return 是否修改成功 - */ - @Override - public Boolean updateByBo(ImGroupMessageBo bo) { - ImGroupMessage update = MapstructUtils.convert(bo, ImGroupMessage.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(ImGroupMessage 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/ImGroupServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupServiceImpl.java index 2858d65..0993ac8 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupServiceImpl.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupServiceImpl.java @@ -69,8 +69,8 @@ public class ImGroupServiceImpl implements IImGroupService { */ @Override public TableDataInfo queryPageList(ImGroupBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), wrapper); // 填充成员数量 result.getRecords().forEach(vo -> vo.setMemberCount(groupMemberService.findCountByGroupId(vo.getId()))); return TableDataInfo.build(result); @@ -85,8 +85,8 @@ public class ImGroupServiceImpl implements IImGroupService { @TransMethodResult @Override public List queryList(ImGroupBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + return baseMapper.selectVoList(wrapper); } @@ -130,17 +130,17 @@ public class ImGroupServiceImpl implements IImGroupService { private LambdaQueryWrapper buildQueryWrapper(ImGroupBo bo) {; Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getName()), ImGroup::getName, bo.getName()); - lqw.eq(bo.getOwnerId() != null, ImGroup::getOwnerId, bo.getOwnerId()); - lqw.eq(bo.getDissolve() != null, ImGroup::getDissolve, bo.getDissolve()); - lqw.eq(bo.getCreatedTime() != null, ImGroup::getCreatedTime, bo.getCreatedTime()); - lqw.eq(bo.getIsBanned() != null, ImGroup::getIsBanned, bo.getIsBanned()); - lqw.eq(StringUtils.isNotBlank(bo.getReason()), ImGroup::getReason, bo.getReason()); - lqw.between(params.get("beginTime") != null && params.get("endTime") != null, + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StringUtils.isNotBlank(bo.getName()), ImGroup::getName, bo.getName()); + wrapper.eq(bo.getOwnerId() != null, ImGroup::getOwnerId, bo.getOwnerId()); + wrapper.eq(bo.getDissolve() != null, ImGroup::getDissolve, bo.getDissolve()); + wrapper.eq(bo.getCreatedTime() != null, ImGroup::getCreatedTime, bo.getCreatedTime()); + wrapper.eq(bo.getIsBanned() != null, ImGroup::getIsBanned, bo.getIsBanned()); + wrapper.eq(StringUtils.isNotBlank(bo.getReason()), ImGroup::getReason, bo.getReason()); + wrapper.between(params.get("beginTime") != null && params.get("endTime") != null, ImGroup::getCreatedTime, params.get("beginTime"), params.get("endTime")); - lqw.orderByDesc(ImGroup::getCreatedTime); - return lqw; + wrapper.orderByDesc(ImGroup::getCreatedTime); + return wrapper; } } diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPrivateMessageServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPrivateMessageServiceImpl.java index 31a83ce..856a254 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPrivateMessageServiceImpl.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPrivateMessageServiceImpl.java @@ -52,8 +52,8 @@ public class ImPrivateMessageServiceImpl implements IImPrivateMessageService { */ @Override public TableDataInfo queryPageList(ImPrivateMessageBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), wrapper); return TableDataInfo.build(result); } @@ -65,22 +65,22 @@ public class ImPrivateMessageServiceImpl implements IImPrivateMessageService { */ @Override public List queryList(ImPrivateMessageBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + return baseMapper.selectVoList(wrapper); } private LambdaQueryWrapper buildQueryWrapper(ImPrivateMessageBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getSendId() != null, ImPrivateMessage::getSendId, bo.getSendId()); - lqw.eq(bo.getRecvId() != null, ImPrivateMessage::getRecvId, bo.getRecvId()); - lqw.like(StringUtils.isNotBlank(bo.getContent()), ImPrivateMessage::getContent, bo.getContent()); - lqw.eq(bo.getType() != null, ImPrivateMessage::getType, bo.getType()); - lqw.eq(bo.getStatus() != null, ImPrivateMessage::getStatus, bo.getStatus()); - lqw.between(params.get("beginTime") != null && params.get("endTime") != null, ImPrivateMessage::getSendTime, + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(bo.getSendId() != null, ImPrivateMessage::getSendId, bo.getSendId()); + wrapper.eq(bo.getRecvId() != null, ImPrivateMessage::getRecvId, bo.getRecvId()); + wrapper.like(StringUtils.isNotBlank(bo.getContent()), ImPrivateMessage::getContent, bo.getContent()); + wrapper.eq(bo.getType() != null, ImPrivateMessage::getType, bo.getType()); + wrapper.eq(bo.getStatus() != null, ImPrivateMessage::getStatus, bo.getStatus()); + wrapper.between(params.get("beginTime") != null && params.get("endTime") != null, ImPrivateMessage::getSendTime, params.get("beginTime"), params.get("endTime")); - lqw.orderByDesc(ImPrivateMessage::getId); - return lqw; + wrapper.orderByDesc(ImPrivateMessage::getId); + return wrapper; } } diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSensitiveWordServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSensitiveWordServiceImpl.java index c40c46c..da40852 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSensitiveWordServiceImpl.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSensitiveWordServiceImpl.java @@ -54,8 +54,8 @@ public class ImSensitiveWordServiceImpl implements IImSensitiveWordService { */ @Override public TableDataInfo queryPageList(ImSensitiveWordBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), wrapper); return TableDataInfo.build(result); } @@ -67,17 +67,17 @@ public class ImSensitiveWordServiceImpl implements IImSensitiveWordService { */ @Override public List queryList(ImSensitiveWordBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + return baseMapper.selectVoList(wrapper); } private LambdaQueryWrapper buildQueryWrapper(ImSensitiveWordBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getContent()), ImSensitiveWord::getContent, bo.getContent()); - lqw.eq(bo.getEnabled() != null, ImSensitiveWord::getEnabled, bo.getEnabled()); - lqw.eq(bo.getCreator() != null, ImSensitiveWord::getCreator, bo.getCreator()); - return lqw; + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(StringUtils.isNotBlank(bo.getContent()), ImSensitiveWord::getContent, bo.getContent()); + wrapper.eq(bo.getEnabled() != null, ImSensitiveWord::getEnabled, bo.getEnabled()); + wrapper.eq(bo.getCreator() != null, ImSensitiveWord::getCreator, bo.getCreator()); + return wrapper; } /** diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSmPushTaskServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSmPushTaskServiceImpl.java index aabb578..5565bf9 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSmPushTaskServiceImpl.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSmPushTaskServiceImpl.java @@ -54,8 +54,8 @@ public class ImSmPushTaskServiceImpl implements IImSmPushTaskService { */ @Override public TableDataInfo queryPageList(ImSmPushTaskBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), wrapper); return TableDataInfo.build(result); } @@ -67,23 +67,23 @@ public class ImSmPushTaskServiceImpl implements IImSmPushTaskService { */ @Override public List queryList(ImSmPushTaskBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + return baseMapper.selectVoList(wrapper); } private LambdaQueryWrapper buildQueryWrapper(ImSmPushTaskBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getMessageId() != null, ImSmPushTask::getMessageId, bo.getMessageId()); - lqw.eq(bo.getSeqNo() != null, ImSmPushTask::getSeqNo, bo.getSeqNo()); - lqw.eq(bo.getSendTime() != null, ImSmPushTask::getSendTime, bo.getSendTime()); - lqw.eq(bo.getStatus() != null, ImSmPushTask::getStatus, bo.getStatus()); - lqw.eq(bo.getSendToAll() != null, ImSmPushTask::getSendToAll, bo.getSendToAll()); - lqw.eq(StringUtils.isNotBlank(bo.getRecvIds()), ImSmPushTask::getRecvIds, bo.getRecvIds()); - lqw.eq(bo.getDeleted() != null, ImSmPushTask::getDeleted, bo.getDeleted()); - lqw.eq(bo.getCreator() != null, ImSmPushTask::getCreator, bo.getCreator()); - lqw.eq(bo.getUpdater() != null, ImSmPushTask::getUpdater, bo.getUpdater()); - return lqw; + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(bo.getMessageId() != null, ImSmPushTask::getMessageId, bo.getMessageId()); + wrapper.eq(bo.getSeqNo() != null, ImSmPushTask::getSeqNo, bo.getSeqNo()); + wrapper.eq(bo.getSendTime() != null, ImSmPushTask::getSendTime, bo.getSendTime()); + wrapper.eq(bo.getStatus() != null, ImSmPushTask::getStatus, bo.getStatus()); + wrapper.eq(bo.getSendToAll() != null, ImSmPushTask::getSendToAll, bo.getSendToAll()); + wrapper.eq(StringUtils.isNotBlank(bo.getRecvIds()), ImSmPushTask::getRecvIds, bo.getRecvIds()); + wrapper.eq(bo.getDeleted() != null, ImSmPushTask::getDeleted, bo.getDeleted()); + wrapper.eq(bo.getCreator() != null, ImSmPushTask::getCreator, bo.getCreator()); + wrapper.eq(bo.getUpdater() != null, ImSmPushTask::getUpdater, bo.getUpdater()); + return wrapper; } /** diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSystemMessageServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSystemMessageServiceImpl.java index 9068a60..5eb557d 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSystemMessageServiceImpl.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSystemMessageServiceImpl.java @@ -54,8 +54,8 @@ public class ImSystemMessageServiceImpl implements IImSystemMessageService { */ @Override public TableDataInfo queryPageList(ImSystemMessageBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), wrapper); return TableDataInfo.build(result); } @@ -67,23 +67,23 @@ public class ImSystemMessageServiceImpl implements IImSystemMessageService { */ @Override public List queryList(ImSystemMessageBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + return baseMapper.selectVoList(wrapper); } private LambdaQueryWrapper buildQueryWrapper(ImSystemMessageBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getTitle()), ImSystemMessage::getTitle, bo.getTitle()); - lqw.eq(StringUtils.isNotBlank(bo.getCoverUrl()), ImSystemMessage::getCoverUrl, bo.getCoverUrl()); - lqw.eq(StringUtils.isNotBlank(bo.getIntro()), ImSystemMessage::getIntro, bo.getIntro()); - lqw.eq(bo.getContentType() != null, ImSystemMessage::getContentType, bo.getContentType()); - lqw.eq(StringUtils.isNotBlank(bo.getRichText()), ImSystemMessage::getRichText, bo.getRichText()); - lqw.eq(StringUtils.isNotBlank(bo.getExternLink()), ImSystemMessage::getExternLink, bo.getExternLink()); - lqw.eq(bo.getDeleted() != null, ImSystemMessage::getDeleted, bo.getDeleted()); - lqw.eq(bo.getCreator() != null, ImSystemMessage::getCreator, bo.getCreator()); - lqw.eq(bo.getUpdater() != null, ImSystemMessage::getUpdater, bo.getUpdater()); - return lqw; + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(StringUtils.isNotBlank(bo.getTitle()), ImSystemMessage::getTitle, bo.getTitle()); + wrapper.eq(StringUtils.isNotBlank(bo.getCoverUrl()), ImSystemMessage::getCoverUrl, bo.getCoverUrl()); + wrapper.eq(StringUtils.isNotBlank(bo.getIntro()), ImSystemMessage::getIntro, bo.getIntro()); + wrapper.eq(bo.getContentType() != null, ImSystemMessage::getContentType, bo.getContentType()); + wrapper.eq(StringUtils.isNotBlank(bo.getRichText()), ImSystemMessage::getRichText, bo.getRichText()); + wrapper.eq(StringUtils.isNotBlank(bo.getExternLink()), ImSystemMessage::getExternLink, bo.getExternLink()); + wrapper.eq(bo.getDeleted() != null, ImSystemMessage::getDeleted, bo.getDeleted()); + wrapper.eq(bo.getCreator() != null, ImSystemMessage::getCreator, bo.getCreator()); + wrapper.eq(bo.getUpdater() != null, ImSystemMessage::getUpdater, bo.getUpdater()); + return wrapper; } /** diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java index 65ba1c5..36d7d1a 100644 --- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java +++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java @@ -59,8 +59,8 @@ public class ImUserServiceImpl implements IImUserService { */ @Override public TableDataInfo queryPageList(ImUserBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), wrapper); return TableDataInfo.build(result); } @@ -72,8 +72,8 @@ public class ImUserServiceImpl implements IImUserService { */ @Override public List queryList(ImUserBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + LambdaQueryWrapper wrapper = buildQueryWrapper(bo); + return baseMapper.selectVoList(wrapper); } @@ -98,11 +98,11 @@ public class ImUserServiceImpl implements IImUserService { } private LambdaQueryWrapper buildQueryWrapper(ImUserBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getUserName()), ImUser::getUserName, bo.getUserName()); - lqw.like(StringUtils.isNotBlank(bo.getNickName()), ImUser::getNickName, bo.getNickName()); - lqw.orderByDesc(ImUser::getCreatedTime); - return lqw; + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StringUtils.isNotBlank(bo.getUserName()), ImUser::getUserName, bo.getUserName()); + wrapper.like(StringUtils.isNotBlank(bo.getNickName()), ImUser::getNickName, bo.getNickName()); + wrapper.orderByDesc(ImUser::getCreatedTime); + return wrapper; } @Override