Browse Source

群聊消息

master
xsx 1 year ago
parent
commit
80ce47f016
  1. 4
      db/im-admin.sql
  2. 36
      im-admin-ui/src/api/im/groupMessage/index.ts
  3. 24
      im-admin-ui/src/api/im/groupMessage/types.ts
  4. 4
      im-admin-ui/src/components/im/ImGroupSelect/index.vue
  5. 2
      im-admin-ui/src/components/im/ImSysMsgSelect/index.vue
  6. 2
      im-admin-ui/src/components/im/ImUserSelect/index.vue
  7. 230
      im-admin-ui/src/views/im/message/group/index.vue
  8. 28
      im-admin-ui/src/views/im/message/private/index.vue
  9. 44
      im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImGroupMessageController.java
  10. 3
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroup.java
  11. 4
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImGroupMessage.java
  12. 13
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMemberBo.java
  13. 26
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImGroupMessageBo.java
  14. 3
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPrivateMessageBo.java
  15. 24
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImGroupMessageVo.java
  16. 22
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImGroupMessageService.java
  17. 27
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMemberServiceImpl.java
  18. 83
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupMessageServiceImpl.java
  19. 28
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImGroupServiceImpl.java
  20. 26
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPrivateMessageServiceImpl.java
  21. 18
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSensitiveWordServiceImpl.java
  22. 30
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSmPushTaskServiceImpl.java
  23. 30
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImSystemMessageServiceImpl.java
  24. 18
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java

4
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角色
-- ----------------------------

36
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<GroupMessageV
});
};
/**
*
* @param data
*/
export const addGroupMessage = (data: GroupMessageForm) => {
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<string | number>) => {
return request({
url: '/im/groupMessage/' + id,
method: 'delete'
});
};

24
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;
/**
*
*/

4
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<number | Array<Number>>()
const model = defineModel<number | Array<Number> | string | Array<String>>()
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;
});

2
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<number | Array<Number>>()
const model = defineModel<number | Array<Number> | string | Array<String>>()
const messageIds = computed({
get() {
if(model.value != undefined){

2
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<number | Array<Number>>()
const model = defineModel<number | Array<Number> | string | Array<String>>()
const userIds = computed({
get() {
if(model.value != undefined){

230
im-admin-ui/src/views/im/message/group/index.vue

@ -4,34 +4,30 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="群id" prop="groupId">
<el-input v-model="queryParams.groupId" placeholder="请输入群id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="发送用户id" prop="sendId">
<el-input v-model="queryParams.sendId" placeholder="请输入发送用户id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="发送用户昵称" prop="sendNickName">
<el-input v-model="queryParams.sendNickName" placeholder="请输入发送用户昵称" clearable @keyup.enter="handleQuery" />
<el-form-item label="发送时间" prop="createdTime">
<el-date-picker
v-model="dateRange"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
></el-date-picker>
</el-form-item>
<el-form-item label="被@用户id列表,逗号分隔" prop="atUserIds">
<el-input v-model="queryParams.atUserIds" placeholder="请输入被@用户id列表,逗号分隔" clearable @keyup.enter="handleQuery" />
<el-form-item label="群聊" prop="groupId">
<im-group-select v-model="queryParams.groupId"></im-group-select>
</el-form-item>
<el-form-item label="发送时间" prop="sendTime">
<el-date-picker clearable
v-model="queryParams.sendTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择发送时间"
/>
<el-form-item label="发送用户" prop="sendId">
<im-user-select v-model="queryParams.sendId"></im-user-select>
</el-form-item>
<el-form-item label="回执消息是否完成" prop="receiptOk">
<el-input v-model="queryParams.receiptOk" placeholder="请输入回执消息是否完成" clearable @keyup.enter="handleQuery" />
<el-form-item label="内容" prop="content">
<el-input v-model="queryParams.content"></el-input>
</el-form-item>
<el-form-item label="是否回执消息" prop="receipt">
<el-input v-model="queryParams.receipt" placeholder="请输入是否回执消息" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="接收用户id,逗号分隔,为空表示发给所有成员" prop="recvIds">
<el-input v-model="queryParams.recvIds" placeholder="请输入接收用户id,逗号分隔,为空表示发给所有成员" clearable @keyup.enter="handleQuery" />
<el-form-item label="消息类型" prop="type">
<el-select v-model="queryParams.type" clearable>
<el-option v-for="dict in im_message_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -41,51 +37,34 @@
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['im:groupMessage:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['im:groupMessage:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['im:groupMessage:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['im:groupMessage:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="groupMessageList" >
<el-table-column label="群名" align="center" prop="groupName" />
<el-table-column label="发送用户" align="center" prop="sendUserName" />
<el-table-column label="发送内容" align="center" prop="content" >
<template #default="scope">
<im-message-content :message="scope.row" ></im-message-content>
</template>
<el-table v-loading="loading" :data="groupMessageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" v-if="true" />
<el-table-column label="群id" align="center" prop="groupId" />
<el-table-column label="发送用户id" align="center" prop="sendId" />
<el-table-column label="发送用户昵称" align="center" prop="sendNickName" />
<el-table-column label="被@用户id列表,逗号分隔" align="center" prop="atUserIds" />
<el-table-column label="发送内容" align="center" prop="content" />
<el-table-column label="" align="center" prop="status" />
<el-table-column label="消息类型" align="center" prop="type" />
</el-table-column>
<el-table-column label="消息类型" align="center" prop="type" >
<template #default="scope">
<dict-tag :options="im_message_type" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="是否撤回" align="center" prop="status" >
<template #default="scope">
<dict-tag :options="sys_bool" :value="''+(scope.row.status == 2)" />
</template>
</el-table-column>
<el-table-column label="发送时间" align="center" prop="sendTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.sendTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="回执消息是否完成" align="center" prop="receiptOk" />
<el-table-column label="是否回执消息" align="center" prop="receipt" />
<el-table-column label="接收用户id,逗号分隔,为空表示发给所有成员" align="center" prop="recvIds" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['im:groupMessage:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['im:groupMessage:remove']"></el-button>
<el-tooltip placement="top">
<el-button link type="primary" @click="handleDetail(scope.row)" v-hasPermi="['im:groupMessage:edit']">详情</el-button>
</el-tooltip>
</template>
</el-table-column>
@ -96,20 +75,11 @@
<!-- 添加或修改群消息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="groupMessageFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="群id" prop="groupId">
<el-input v-model="form.groupId" placeholder="请输入群id" />
</el-form-item>
<el-form-item label="发送用户id" prop="sendId">
<el-input v-model="form.sendId" placeholder="请输入发送用户id" />
</el-form-item>
<el-form-item label="发送用户昵称" prop="sendNickName">
<el-input v-model="form.sendNickName" placeholder="请输入发送用户昵称" />
</el-form-item>
<el-form-item label="被@用户id列表,逗号分隔" prop="atUserIds">
<el-input v-model="form.atUserIds" placeholder="请输入被@用户id列表,逗号分隔" />
<el-form-item label="发送用户" prop="sendUserName">
<el-input v-model="form.sendUserName" />
</el-form-item>
<el-form-item label="发送内容">
<editor v-model="form.content" :min-height="192"/>
<im-message-content :message="form" ></im-message-content>
</el-form-item>
<el-form-item label="发送时间" prop="sendTime">
<el-date-picker clearable
@ -119,20 +89,19 @@
placeholder="请选择发送时间">
</el-date-picker>
</el-form-item>
<el-form-item label="回执消息是否完成" prop="receiptOk">
<el-input v-model="form.receiptOk" placeholder="请输入回执消息是否完成" />
<el-form-item v-if="form.receipt" label="是否撤回" prop="status">
<dict-tag :options="sys_bool" :value="'' + (form.status == 2)" />
</el-form-item>
<el-form-item label="是否回执消息" prop="receipt">
<el-input v-model="form.receipt" placeholder="请输入是否回执消息" />
</el-form-item>
<el-form-item label="接收用户id,逗号分隔,为空表示发给所有成员" prop="recvIds">
<el-input v-model="form.recvIds" placeholder="请输入接收用户id,逗号分隔,为空表示发给所有成员" />
<el-form-item v-if="form.receipt" label="回执消息是否完成" prop="receiptOk">
<dict-tag :options="sys_bool" :value="form.receiptOk" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
@ -149,13 +118,11 @@ const groupMessageList = ref<GroupMessageVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const groupMessageFormRef = ref<ElFormInstance>();
const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
const dialog = reactive<DialogOption>({
visible: false,
@ -165,7 +132,9 @@ const dialog = reactive<DialogOption>({
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<PageData<GroupMessageForm, GroupMessageQuery>>({
}
},
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<any>(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(() => {

28
im-admin-ui/src/views/im/message/private/index.vue

@ -44,7 +44,7 @@
</transition>
<el-card shadow="never">
<el-table v-loading="loading" :data="privateMessageList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="privateMessageList" >
<el-table-column label="发送用户" align="center" prop="sendUserName" />
<el-table-column label="接收用户" align="center" prop="recvUserName" />
<el-table-column label="发送内容" align="center" prop="content" >
@ -70,7 +70,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="详情" placement="top">
<el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['im:privateMessage:query']">详情</el-button>
<el-button link type="primary" @click="handleDetail(scope.row)" v-hasPermi="['im:privateMessage:query']">详情</el-button>
</el-tooltip>
</template>
</el-table-column>
@ -88,7 +88,7 @@
<el-input v-model="form.recvUserName" />
</el-form-item>
<el-form-item label="发送内容">
<el-input v-model="form.content" :min-height="192"/>
<im-message-content :message="form" ></im-message-content>
</el-form-item>
<el-form-item label="发送时间" prop="sendTime">
<el-date-picker clearable
@ -124,9 +124,6 @@ const privateMessageList = ref<PrivateMessageVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
@ -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();
});

44
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<ImGroupMessageVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(imGroupMessageService.deleteWithValidByIds(List.of(ids), true));
}
}

3
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;

4
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,逗号分隔为空表示发给所有成员

13
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;

26
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<String, Object> params = new HashMap<>();
}

3
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

24
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,逗号分隔为空表示发给所有成员

22
im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImGroupMessageService.java

@ -41,28 +41,6 @@ public interface IImGroupMessageService {
*/
List<ImGroupMessageVo> 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<Long> ids, Boolean isValid);
}

27
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<ImGroupMemberVo> queryPageList(ImGroupMemberBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ImGroupMember> lqw = buildQueryWrapper(bo);
Page<ImGroupMemberVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
LambdaQueryWrapper<ImGroupMember> wrapper = buildQueryWrapper(bo);
Page<ImGroupMemberVo> 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<ImGroupMemberVo> queryList(ImGroupMemberBo bo) {
LambdaQueryWrapper<ImGroupMember> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
LambdaQueryWrapper<ImGroupMember> wrapper = buildQueryWrapper(bo);
return baseMapper.selectVoList(wrapper);
}
@ -84,16 +84,15 @@ public class ImGroupMemberServiceImpl implements IImGroupMemberService {
}
private LambdaQueryWrapper<ImGroupMember> buildQueryWrapper(ImGroupMemberBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ImGroupMember> 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<ImGroupMember> 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;
}

83
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<ImGroupMessageVo> queryPageList(ImGroupMessageBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ImGroupMessage> lqw = buildQueryWrapper(bo);
Page<ImGroupMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
LambdaQueryWrapper<ImGroupMessage> wrapper = buildQueryWrapper(bo);
Page<ImGroupMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
return TableDataInfo.build(result);
}
@ -67,76 +68,22 @@ public class ImGroupMessageServiceImpl implements IImGroupMessageService {
*/
@Override
public List<ImGroupMessageVo> queryList(ImGroupMessageBo bo) {
LambdaQueryWrapper<ImGroupMessage> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
LambdaQueryWrapper<ImGroupMessage> wrapper = buildQueryWrapper(bo);
return baseMapper.selectVoList(wrapper);
}
private LambdaQueryWrapper<ImGroupMessage> buildQueryWrapper(ImGroupMessageBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ImGroupMessage> 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<ImGroupMessage> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

28
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<ImGroupVo> queryPageList(ImGroupBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ImGroup> lqw = buildQueryWrapper(bo);
Page<ImGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
LambdaQueryWrapper<ImGroup> wrapper = buildQueryWrapper(bo);
Page<ImGroupVo> 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<ImGroupVo> queryList(ImGroupBo bo) {
LambdaQueryWrapper<ImGroup> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
LambdaQueryWrapper<ImGroup> wrapper = buildQueryWrapper(bo);
return baseMapper.selectVoList(wrapper);
}
@ -130,17 +130,17 @@ public class ImGroupServiceImpl implements IImGroupService {
private LambdaQueryWrapper<ImGroup> buildQueryWrapper(ImGroupBo bo) {;
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ImGroup> 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<ImGroup> 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;
}
}

26
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<ImPrivateMessageVo> queryPageList(ImPrivateMessageBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ImPrivateMessage> lqw = buildQueryWrapper(bo);
Page<ImPrivateMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
LambdaQueryWrapper<ImPrivateMessage> wrapper = buildQueryWrapper(bo);
Page<ImPrivateMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
return TableDataInfo.build(result);
}
@ -65,22 +65,22 @@ public class ImPrivateMessageServiceImpl implements IImPrivateMessageService {
*/
@Override
public List<ImPrivateMessageVo> queryList(ImPrivateMessageBo bo) {
LambdaQueryWrapper<ImPrivateMessage> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
LambdaQueryWrapper<ImPrivateMessage> wrapper = buildQueryWrapper(bo);
return baseMapper.selectVoList(wrapper);
}
private LambdaQueryWrapper<ImPrivateMessage> buildQueryWrapper(ImPrivateMessageBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ImPrivateMessage> 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<ImPrivateMessage> 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;
}
}

18
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<ImSensitiveWordVo> queryPageList(ImSensitiveWordBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ImSensitiveWord> lqw = buildQueryWrapper(bo);
Page<ImSensitiveWordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
LambdaQueryWrapper<ImSensitiveWord> wrapper = buildQueryWrapper(bo);
Page<ImSensitiveWordVo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
return TableDataInfo.build(result);
}
@ -67,17 +67,17 @@ public class ImSensitiveWordServiceImpl implements IImSensitiveWordService {
*/
@Override
public List<ImSensitiveWordVo> queryList(ImSensitiveWordBo bo) {
LambdaQueryWrapper<ImSensitiveWord> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
LambdaQueryWrapper<ImSensitiveWord> wrapper = buildQueryWrapper(bo);
return baseMapper.selectVoList(wrapper);
}
private LambdaQueryWrapper<ImSensitiveWord> buildQueryWrapper(ImSensitiveWordBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ImSensitiveWord> 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<ImSensitiveWord> 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;
}
/**

30
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<ImSmPushTaskVo> queryPageList(ImSmPushTaskBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ImSmPushTask> lqw = buildQueryWrapper(bo);
Page<ImSmPushTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
LambdaQueryWrapper<ImSmPushTask> wrapper = buildQueryWrapper(bo);
Page<ImSmPushTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
return TableDataInfo.build(result);
}
@ -67,23 +67,23 @@ public class ImSmPushTaskServiceImpl implements IImSmPushTaskService {
*/
@Override
public List<ImSmPushTaskVo> queryList(ImSmPushTaskBo bo) {
LambdaQueryWrapper<ImSmPushTask> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
LambdaQueryWrapper<ImSmPushTask> wrapper = buildQueryWrapper(bo);
return baseMapper.selectVoList(wrapper);
}
private LambdaQueryWrapper<ImSmPushTask> buildQueryWrapper(ImSmPushTaskBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ImSmPushTask> 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<ImSmPushTask> 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;
}
/**

30
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<ImSystemMessageVo> queryPageList(ImSystemMessageBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ImSystemMessage> lqw = buildQueryWrapper(bo);
Page<ImSystemMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
LambdaQueryWrapper<ImSystemMessage> wrapper = buildQueryWrapper(bo);
Page<ImSystemMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
return TableDataInfo.build(result);
}
@ -67,23 +67,23 @@ public class ImSystemMessageServiceImpl implements IImSystemMessageService {
*/
@Override
public List<ImSystemMessageVo> queryList(ImSystemMessageBo bo) {
LambdaQueryWrapper<ImSystemMessage> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
LambdaQueryWrapper<ImSystemMessage> wrapper = buildQueryWrapper(bo);
return baseMapper.selectVoList(wrapper);
}
private LambdaQueryWrapper<ImSystemMessage> buildQueryWrapper(ImSystemMessageBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ImSystemMessage> 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<ImSystemMessage> 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;
}
/**

18
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<ImUserVo> queryPageList(ImUserBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ImUser> lqw = buildQueryWrapper(bo);
Page<ImUserVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
LambdaQueryWrapper<ImUser> wrapper = buildQueryWrapper(bo);
Page<ImUserVo> result = baseMapper.selectVoPage(pageQuery.build(), wrapper);
return TableDataInfo.build(result);
}
@ -72,8 +72,8 @@ public class ImUserServiceImpl implements IImUserService {
*/
@Override
public List<ImUserVo> queryList(ImUserBo bo) {
LambdaQueryWrapper<ImUser> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
LambdaQueryWrapper<ImUser> wrapper = buildQueryWrapper(bo);
return baseMapper.selectVoList(wrapper);
}
@ -98,11 +98,11 @@ public class ImUserServiceImpl implements IImUserService {
}
private LambdaQueryWrapper<ImUser> buildQueryWrapper(ImUserBo bo) {
LambdaQueryWrapper<ImUser> 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<ImUser> 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

Loading…
Cancel
Save