Browse Source

套餐历史记录

master
La123123 1 month ago
parent
commit
7652c9f948
  1. 63
      im-admin-ui/src/api/im/packageHistory/index.ts
  2. 131
      im-admin-ui/src/api/im/packageHistory/types.ts
  3. 288
      im-admin-ui/src/views/im/packageHistory/index.vue
  4. 105
      im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPackageHistoryController.java
  5. 74
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImPackageHistory.java
  6. 86
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPackageHistoryBo.java
  7. 76
      im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImPackageHistoryVo.java
  8. 15
      im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImPackageHistoryMapper.java
  9. 68
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPackageHistoryService.java
  10. 20
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImChatPackageServiceImpl.java
  11. 137
      im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPackageHistoryServiceImpl.java
  12. 7
      im-admin/ruoyi-im/src/main/resources/mapper/im/ImPackageHistoryMapper.xml

63
im-admin-ui/src/api/im/packageHistory/index.ts

@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { PackageHistoryVO, PackageHistoryForm, PackageHistoryQuery } from '@/api/im/packageHistory/types';
/**
*
* @param query
* @returns {*}
*/
export const listPackageHistory = (query?: PackageHistoryQuery): AxiosPromise<PackageHistoryVO[]> => {
return request({
url: '/im/packageHistory/list',
method: 'get',
params: query
});
};
/**
*
* @param id
*/
export const getPackageHistory = (id: string | number): AxiosPromise<PackageHistoryVO> => {
return request({
url: '/im/packageHistory/' + id,
method: 'get'
});
};
/**
*
* @param data
*/
export const addPackageHistory = (data: PackageHistoryForm) => {
return request({
url: '/im/packageHistory',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updatePackageHistory = (data: PackageHistoryForm) => {
return request({
url: '/im/packageHistory',
method: 'put',
data: data
});
};
/**
*
* @param id
*/
export const delPackageHistory = (id: string | number | Array<string | number>) => {
return request({
url: '/im/packageHistory/' + id,
method: 'delete'
});
};

131
im-admin-ui/src/api/im/packageHistory/types.ts

@ -0,0 +1,131 @@
export interface PackageHistoryVO {
/**
* ID
*/
id: string | number;
/**
*
*/
sysId: string | number;
/**
* id
*/
packageId: string | number;
/**
*
*/
sysName: string;
/**
*
*/
packageName: string;
/**
*
*/
remark: string;
/**
*
*/
createdTime: string;
}
export interface PackageHistoryForm extends BaseEntity {
/**
* ID
*/
id?: string | number;
/**
*
*/
sysId?: string | number;
/**
* id
*/
packageId?: string | number;
/**
*
*/
sysName?: string;
/**
*
*/
packageName?: string;
/**
*
*/
remark?: string;
/**
*
*/
createdTime?: string;
/**
*
*/
updatedTime?: string;
/**
* ID
*/
creatorId?: string | number;
/**
* ID
*/
updaterId?: string | number;
}
export interface PackageHistoryQuery extends PageQuery {
/**
*
*/
sysId?: string | number;
/**
* id
*/
packageId?: string | number;
/**
*
*/
sysName?: string;
/**
*
*/
packageName?: string;
/**
*
*/
remark?: string;
/**
*
*/
createdTime?: string;
/**
*
*/
params?: any;
}

288
im-admin-ui/src/views/im/packageHistory/index.vue

@ -0,0 +1,288 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<!-- <el-form-item label="分配的代理对象" prop="sysId">
<el-input v-model="queryParams.sysId" placeholder="请输入分配的代理对象" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="套餐id" prop="packageId">
<el-input v-model="queryParams.packageId" placeholder="请输入套餐id" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="代理名称" prop="sysName">
<el-input v-model="queryParams.sysName" placeholder="请输入代理名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="套餐名称" prop="packageName">
<el-input v-model="queryParams.packageName" placeholder="请输入套餐名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="备注" prop="remark">
<el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker v-model="queryParams.createdTime" clearable type="date" value-format="YYYY-MM-DD" placeholder="请选择创建时间" />
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</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:packageHistory:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['im:packageHistory:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['im:packageHistory:remove']"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['im:packageHistory:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template> -->
<el-table v-loading="loading" :data="packageHistoryList" @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="分配的代理对象" align="center" prop="sysId" /> -->
<!-- <el-table-column label="套餐id" align="center" prop="packageId" /> -->
<el-table-column label="代理名称" align="center" prop="sysName" width="400" />
<el-table-column label="套餐名称" align="center" prop="packageName" width="400" />
<el-table-column label="套餐信息" align="center" prop="remark" width="500" />
<el-table-column label="分配时间" align="center" prop="createdTime">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <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:packageHistory:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['im:packageHistory:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column> -->
</el-table>
<pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
</el-card>
<!-- 添加或修改套餐分配历史记录对话框 -->
<!-- <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="packageHistoryFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="分配的代理对象" prop="sysId">
<el-input v-model="form.sysId" placeholder="请输入分配的代理对象" />
</el-form-item>
<el-form-item label="套餐id" prop="packageId">
<el-input v-model="form.packageId" placeholder="请输入套餐id" />
</el-form-item>
<el-form-item label="代理名称" prop="sysName">
<el-input v-model="form.sysName" placeholder="请输入代理名称" />
</el-form-item>
<el-form-item label="套餐名称" prop="packageName">
<el-input v-model="form.packageName" placeholder="请输入套餐名称" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker clearable v-model="form.createdTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="更新时间" prop="updatedTime">
<el-date-picker clearable v-model="form.updatedTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="创建者ID" prop="creatorId">
<el-input v-model="form.creatorId" placeholder="请输入创建者ID" />
</el-form-item>
<el-form-item label="更新者ID" prop="updaterId">
<el-input v-model="form.updaterId" placeholder="请输入更新者ID" />
</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> -->
</div>
</template>
<script setup name="PackageHistory" lang="ts">
import { listPackageHistory, getPackageHistory, delPackageHistory, addPackageHistory, updatePackageHistory } from '@/api/im/packageHistory';
import { PackageHistoryVO, PackageHistoryQuery, PackageHistoryForm } from '@/api/im/packageHistory/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const packageHistoryList = ref<PackageHistoryVO[]>([]);
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 packageHistoryFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: PackageHistoryForm = {
id: undefined,
sysId: undefined,
packageId: undefined,
sysName: undefined,
packageName: undefined,
remark: undefined,
createdTime: undefined,
updatedTime: undefined,
creatorId: undefined,
updaterId: undefined
};
const data = reactive<PageData<PackageHistoryForm, PackageHistoryQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
sysId: undefined,
packageId: undefined,
sysName: undefined,
packageName: undefined,
remark: undefined,
createdTime: undefined,
params: {}
},
rules: {
id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
sysId: [{ required: true, message: '分配的代理对象不能为空', trigger: 'blur' }],
packageId: [{ required: true, message: '套餐id不能为空', trigger: 'blur' }],
sysName: [{ required: true, message: '代理名称不能为空', trigger: 'blur' }],
packageName: [{ required: true, message: '套餐名称不能为空', trigger: 'blur' }],
remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
createdTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
updatedTime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
creatorId: [{ required: true, message: '创建者ID不能为空', trigger: 'blur' }],
updaterId: [{ required: true, message: '更新者ID不能为空', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询套餐分配历史记录列表 */
const getList = async () => {
loading.value = true;
const res = await listPackageHistory(queryParams.value);
packageHistoryList.value = res.rows;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
packageHistoryFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: PackageHistoryVO[]) => {
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 handleUpdate = async (row?: PackageHistoryVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getPackageHistory(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改套餐分配历史记录';
};
/** 提交按钮 */
const submitForm = () => {
packageHistoryFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updatePackageHistory(form.value).finally(() => (buttonLoading.value = false));
} else {
await addPackageHistory(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: PackageHistoryVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除套餐分配历史记录编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delPackageHistory(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'im/packageHistory/export',
{
...queryParams.value
},
`packageHistory_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
});
</script>

105
im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPackageHistoryController.java

@ -0,0 +1,105 @@
package org.dromara.im.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.im.domain.vo.ImPackageHistoryVo;
import org.dromara.im.domain.bo.ImPackageHistoryBo;
import org.dromara.im.service.IImPackageHistoryService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 套餐分配历史记录
*
* @author Blue
* @date 2026-04-15
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/im/packageHistory")
public class ImPackageHistoryController extends BaseController {
private final IImPackageHistoryService imPackageHistoryService;
/**
* 查询套餐分配历史记录列表
*/
@SaCheckPermission("im:packageHistory:list")
@GetMapping("/list")
public TableDataInfo<ImPackageHistoryVo> list(ImPackageHistoryBo bo, PageQuery pageQuery) {
return imPackageHistoryService.queryPageList(bo, pageQuery);
}
/**
* 导出套餐分配历史记录列表
*/
@SaCheckPermission("im:packageHistory:export")
@Log(title = "套餐分配历史记录", businessType = BusinessType.EXPORT)
//@PostMapping("/export")
public void export(ImPackageHistoryBo bo, HttpServletResponse response) {
List<ImPackageHistoryVo> list = imPackageHistoryService.queryList(bo);
ExcelUtil.exportExcel(list, "套餐分配历史记录", ImPackageHistoryVo.class, response);
}
/**
* 获取套餐分配历史记录详细信息
*
* @param id 主键
*/
@SaCheckPermission("im:packageHistory:query")
//@GetMapping("/{id}")
public R<ImPackageHistoryVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(imPackageHistoryService.queryById(id));
}
/**
* 新增套餐分配历史记录
*/
@SaCheckPermission("im:packageHistory:add")
@Log(title = "套餐分配历史记录", businessType = BusinessType.INSERT)
@RepeatSubmit()
//@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ImPackageHistoryBo bo) {
return toAjax(imPackageHistoryService.insertByBo(bo));
}
/**
* 修改套餐分配历史记录
*/
@SaCheckPermission("im:packageHistory:edit")
@Log(title = "套餐分配历史记录", businessType = BusinessType.UPDATE)
@RepeatSubmit()
//@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ImPackageHistoryBo bo) {
return toAjax(imPackageHistoryService.updateByBo(bo));
}
/**
* 删除套餐分配历史记录
*
* @param ids 主键串
*/
@SaCheckPermission("im:packageHistory:remove")
@Log(title = "套餐分配历史记录", businessType = BusinessType.DELETE)
//@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(imPackageHistoryService.deleteWithValidByIds(List.of(ids), true));
}
}

74
im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImPackageHistory.java

@ -0,0 +1,74 @@
package org.dromara.im.domain;
import com.fhs.core.trans.vo.TransPojo;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
/**
* 套餐分配历史记录对象 im_package_history
*
* @author Blue
* @date 2026-04-15
*/
@Data
@TableName("im_package_history")
public class ImPackageHistory implements TransPojo {
/**
* 主键ID
*/
@TableId(value = "id")
private Long id;
/**
* 分配的代理对象
*/
private Long sysId;
/**
* 套餐id
*/
private Long packageId;
/**
* 代理名称
*/
private String sysName;
/**
* 套餐名称
*/
private String packageName;
/**
* 备注
*/
private String remark;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新时间
*/
private Date updatedTime;
/**
* 创建者ID
*/
private Long creatorId;
/**
* 更新者ID
*/
private Long updaterId;
}

86
im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPackageHistoryBo.java

@ -0,0 +1,86 @@
package org.dromara.im.domain.bo;
import org.dromara.im.domain.ImPackageHistory;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 套餐分配历史记录业务对象 im_package_history
*
* @author Blue
* @date 2026-04-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = ImPackageHistory.class, reverseConvertGenerate = false)
public class ImPackageHistoryBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 分配的代理对象
*/
@NotNull(message = "分配的代理对象不能为空", groups = { AddGroup.class, EditGroup.class })
private Long sysId;
/**
* 套餐id
*/
@NotNull(message = "套餐id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long packageId;
/**
* 代理名称
*/
@NotBlank(message = "代理名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String sysName;
/**
* 套餐名称
*/
@NotBlank(message = "套餐名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String packageName;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;
/**
* 创建时间
*/
@NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date createdTime;
/**
* 更新时间
*/
@NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date updatedTime;
/**
* 创建者ID
*/
@NotNull(message = "创建者ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long creatorId;
/**
* 更新者ID
*/
@NotNull(message = "更新者ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long updaterId;
}

76
im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImPackageHistoryVo.java

@ -0,0 +1,76 @@
package org.dromara.im.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.im.domain.ImPackageHistory;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 套餐分配历史记录视图对象 im_package_history
*
* @author Blue
* @date 2026-04-15
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = ImPackageHistory.class)
public class ImPackageHistoryVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 分配的代理对象
*/
@ExcelProperty(value = "分配的代理对象")
private Long sysId;
/**
* 套餐id
*/
@ExcelProperty(value = "套餐id")
private Long packageId;
/**
* 代理名称
*/
@ExcelProperty(value = "代理名称")
private String sysName;
/**
* 套餐名称
*/
@ExcelProperty(value = "套餐名称")
private String packageName;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createdTime;
}

15
im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImPackageHistoryMapper.java

@ -0,0 +1,15 @@
package org.dromara.im.mapper;
import org.dromara.im.domain.ImPackageHistory;
import org.dromara.im.domain.vo.ImPackageHistoryVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 套餐分配历史记录Mapper接口
*
* @author Blue
* @date 2026-04-15
*/
public interface ImPackageHistoryMapper extends BaseMapperPlus<ImPackageHistory, ImPackageHistoryVo> {
}

68
im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPackageHistoryService.java

@ -0,0 +1,68 @@
package org.dromara.im.service;
import org.dromara.im.domain.vo.ImPackageHistoryVo;
import org.dromara.im.domain.bo.ImPackageHistoryBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 套餐分配历史记录Service接口
*
* @author Blue
* @date 2026-04-15
*/
public interface IImPackageHistoryService {
/**
* 查询套餐分配历史记录
*
* @param id 主键
* @return 套餐分配历史记录
*/
ImPackageHistoryVo queryById(Long id);
/**
* 分页查询套餐分配历史记录列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 套餐分配历史记录分页列表
*/
TableDataInfo<ImPackageHistoryVo> queryPageList(ImPackageHistoryBo bo, PageQuery pageQuery);
/**
* 查询符合条件的套餐分配历史记录列表
*
* @param bo 查询条件
* @return 套餐分配历史记录列表
*/
List<ImPackageHistoryVo> queryList(ImPackageHistoryBo bo);
/**
* 新增套餐分配历史记录
*
* @param bo 套餐分配历史记录
* @return 是否新增成功
*/
Boolean insertByBo(ImPackageHistoryBo bo);
/**
* 修改套餐分配历史记录
*
* @param bo 套餐分配历史记录
* @return 是否修改成功
*/
Boolean updateByBo(ImPackageHistoryBo bo);
/**
* 校验并批量删除套餐分配历史记录信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

20
im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImChatPackageServiceImpl.java

@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.im.constant.ImConstant; import org.dromara.im.constant.ImConstant;
import org.dromara.im.domain.ImPackageHistory;
import org.dromara.im.mapper.ImPackageHistoryMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.im.domain.bo.ImChatPackageBo; import org.dromara.im.domain.bo.ImChatPackageBo;
import org.dromara.im.domain.vo.ImChatPackageVo; import org.dromara.im.domain.vo.ImChatPackageVo;
@ -41,6 +43,8 @@ public class ImChatPackageServiceImpl implements IImChatPackageService {
private final ImAgentMapper imAgentMapper; private final ImAgentMapper imAgentMapper;
private final ImPackageHistoryMapper imPackageHistoryMapper;
/** /**
* 查询套餐 * 查询套餐
* *
@ -196,6 +200,20 @@ public class ImChatPackageServiceImpl implements IImChatPackageService {
agent.setPackageId(packageId); agent.setPackageId(packageId);
agent.setMaxCustomer(chatPackage.getCustomerServiceNumber()); agent.setMaxCustomer(chatPackage.getCustomerServiceNumber());
return imAgentMapper.updateById(agent) > 0; boolean i = imAgentMapper.updateById(agent) > 0;
ImPackageHistory imPackageHistory = new ImPackageHistory();
imPackageHistory.setSysId(agent.getSysId());
imPackageHistory.setPackageId(packageId);
imPackageHistory.setSysName(agent.getAgentName());
imPackageHistory.setPackageName(chatPackage.getPackageName());
imPackageHistory.setCreatedTime(DateUtil.date());
imPackageHistory.setCreatorId(LoginHelper.getUserId());
imPackageHistory.setUpdatedTime(DateUtil.date());
imPackageHistory.setUpdaterId(LoginHelper.getUserId());
imPackageHistory.setRemark("套餐时长:" + durationDays + "天,客服数量:" + chatPackage.getCustomerServiceNumber() + ",套餐到期时间:" + DateUtil.format(packageExpireTime, "yyyy-MM-dd"));
imPackageHistoryMapper.insert(imPackageHistory);
return i;
} }
} }

137
im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPackageHistoryServiceImpl.java

@ -0,0 +1,137 @@
package org.dromara.im.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.im.constant.ImConstant;
import org.springframework.stereotype.Service;
import org.dromara.im.domain.bo.ImPackageHistoryBo;
import org.dromara.im.domain.vo.ImPackageHistoryVo;
import org.dromara.im.domain.ImPackageHistory;
import org.dromara.im.mapper.ImPackageHistoryMapper;
import org.dromara.im.service.IImPackageHistoryService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 套餐分配历史记录Service业务层处理
*
* @author Blue
* @date 2026-04-15
*/
@RequiredArgsConstructor
@Service
@DS(ImConstant.DS_IM_PLATFORM)
public class ImPackageHistoryServiceImpl implements IImPackageHistoryService {
private final ImPackageHistoryMapper baseMapper;
/**
* 查询套餐分配历史记录
*
* @param id 主键
* @return 套餐分配历史记录
*/
@Override
public ImPackageHistoryVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询套餐分配历史记录列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 套餐分配历史记录分页列表
*/
@Override
public TableDataInfo<ImPackageHistoryVo> queryPageList(ImPackageHistoryBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ImPackageHistory> lqw = buildQueryWrapper(bo);
Page<ImPackageHistoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的套餐分配历史记录列表
*
* @param bo 查询条件
* @return 套餐分配历史记录列表
*/
@Override
public List<ImPackageHistoryVo> queryList(ImPackageHistoryBo bo) {
LambdaQueryWrapper<ImPackageHistory> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<ImPackageHistory> buildQueryWrapper(ImPackageHistoryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ImPackageHistory> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getSysId() != null, ImPackageHistory::getSysId, bo.getSysId());
lqw.eq(bo.getPackageId() != null, ImPackageHistory::getPackageId, bo.getPackageId());
lqw.like(StringUtils.isNotBlank(bo.getSysName()), ImPackageHistory::getSysName, bo.getSysName());
lqw.like(StringUtils.isNotBlank(bo.getPackageName()), ImPackageHistory::getPackageName, bo.getPackageName());
lqw.eq(StringUtils.isNotBlank(bo.getRemark()), ImPackageHistory::getRemark, bo.getRemark());
lqw.eq(bo.getCreatedTime() != null, ImPackageHistory::getCreatedTime, bo.getCreatedTime());
return lqw;
}
/**
* 新增套餐分配历史记录
*
* @param bo 套餐分配历史记录
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(ImPackageHistoryBo bo) {
ImPackageHistory add = MapstructUtils.convert(bo, ImPackageHistory.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改套餐分配历史记录
*
* @param bo 套餐分配历史记录
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(ImPackageHistoryBo bo) {
ImPackageHistory update = MapstructUtils.convert(bo, ImPackageHistory.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ImPackageHistory entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除套餐分配历史记录信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

7
im-admin/ruoyi-im/src/main/resources/mapper/im/ImPackageHistoryMapper.xml

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.im.mapper.ImPackageHistoryMapper">
</mapper>
Loading…
Cancel
Save