套餐表对应基类/代理表更新套餐到期时间

1 month ago · b0554643d7
18 changed files with 1024 additions and 8 deletions
--- a/im-admin-ui/src/api/im/chatPackage/index.ts
+++ b/im-admin-ui/src/api/im/chatPackage/index.ts
@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ChatPackageVO, ChatPackageForm, ChatPackageQuery } from '@/api/im/chatPackage/types';
+
+/**
+ * 查询套餐列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listChatPackage = (query?: ChatPackageQuery): AxiosPromise<ChatPackageVO[]> => {
+  return request({
+    url: '/im/chatPackage/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询套餐详细
+ * @param id
+ */
+export const getChatPackage = (id: string | number): AxiosPromise<ChatPackageVO> => {
+  return request({
+    url: '/im/chatPackage/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增套餐
+ * @param data
+ */
+export const addChatPackage = (data: ChatPackageForm) => {
+  return request({
+    url: '/im/chatPackage',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改套餐
+ * @param data
+ */
+export const updateChatPackage = (data: ChatPackageForm) => {
+  return request({
+    url: '/im/chatPackage',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除套餐
+ * @param id
+ */
+export const delChatPackage = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/im/chatPackage/' + id,
+    method: 'delete'
+  });
+};
--- a/im-admin-ui/src/api/im/chatPackage/types.ts
+++ b/im-admin-ui/src/api/im/chatPackage/types.ts
@ -0,0 +1,96 @@
+export interface ChatPackageVO {
+  /**
+   * 套餐名称
+   */
+  packageName: string;
+
+  /**
+   * 客服数量
+   */
+  customerServiceNumber: number;
+
+  /**
+   * 套餐持续时间（天）
+   */
+  durationDays: number;
+
+  /**
+   * 状态：0-禁用 1-启用
+   */
+  status: number;
+
+  /**
+   * 创建时间
+   */
+  createdTime: string;
+
+}
+
+export interface ChatPackageForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 套餐名称
+   */
+  packageName?: string;
+
+  /**
+   * 套餐内容描述
+   */
+  packageContent?: string;
+
+  /**
+   * 客服数量
+   */
+  customerServiceNumber?: number;
+
+  /**
+   * 套餐持续时间（天）
+   */
+  durationDays?: number;
+
+  /**
+   * 状态：0-禁用 1-启用
+   */
+  status?: number;
+
+  /**
+   * 排序
+   */
+  sortOrder?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface ChatPackageQuery extends PageQuery {
+
+  /**
+   * 套餐名称
+   */
+  packageName?: string;
+
+  /**
+   * 套餐内容描述
+   */
+  packageContent?: string;
+
+  /**
+   * 状态：0-禁用 1-启用
+   */
+  status?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
--- a/im-admin-ui/src/views/im/chatPackage/index.vue
+++ b/im-admin-ui/src/views/im/chatPackage/index.vue
@ -0,0 +1,280 @@
+<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="packageName">
+              <el-input v-model="queryParams.packageName" placeholder="请输入套餐名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="状态：0-禁用 1-启用" prop="status">
+              <el-select v-model="queryParams.status" placeholder="请选择状态：0-禁用 1-启用" clearable >
+                <el-option v-for="dict in commom_status" :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>
+              <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:chatPackage:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['im:chatPackage:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['im:chatPackage:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['im:chatPackage:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="chatPackageList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" v-if="false" />
+        <el-table-column label="套餐名称" align="center" prop="packageName" />
+        <el-table-column label="客服数量" align="center" prop="customerServiceNumber" />
+        <el-table-column label="套餐持续时间" align="center" prop="durationDays" />
+        <el-table-column label="状态：0-禁用 1-启用" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :options="commom_status" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
+          <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:chatPackage:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['im:chatPackage:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改套餐对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="chatPackageFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="套餐名称" prop="packageName">
+          <el-input v-model="form.packageName" placeholder="请输入套餐名称" />
+        </el-form-item>
+        <el-form-item label="套餐内容描述">
+          <editor v-model="form.packageContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="客服数量" prop="customerServiceNumber">
+          <el-input v-model="form.customerServiceNumber" placeholder="请输入客服数量" />
+        </el-form-item>
+        <el-form-item label="套餐持续时间" prop="durationDays">
+          <el-input v-model="form.durationDays" placeholder="请输入套餐持续时间" />
+        </el-form-item>
+        <el-form-item label="状态：0-禁用 1-启用" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态：0-禁用 1-启用">
+            <el-option
+                v-for="dict in commom_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排序" prop="sortOrder">
+          <el-input v-model="form.sortOrder" placeholder="请输入排序" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </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="ChatPackage" lang="ts">
+import { listChatPackage, getChatPackage, delChatPackage, addChatPackage, updateChatPackage } from '@/api/im/chatPackage';
+import { ChatPackageVO, ChatPackageQuery, ChatPackageForm } from '@/api/im/chatPackage/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { commom_status } = toRefs<any>(proxy?.useDict('commom_status'));
+
+const chatPackageList = ref<ChatPackageVO[]>([]);
+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 chatPackageFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ChatPackageForm = {
+  id: undefined,
+  packageName: undefined,
+  packageContent: undefined,
+  customerServiceNumber: undefined,
+  durationDays: undefined,
+  status: undefined,
+  sortOrder: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<ChatPackageForm, ChatPackageQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    packageName: undefined,
+    packageContent: undefined,
+    status: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键ID不能为空", trigger: "blur" }
+    ],
+    packageName: [
+      { required: true, message: "套餐名称不能为空", trigger: "blur" }
+    ],
+    packageContent: [
+      { required: true, message: "套餐内容描述不能为空", trigger: "blur" }
+    ],
+    customerServiceNumber: [
+      { required: true, message: "客服数量不能为空", trigger: "blur" }
+    ],
+    durationDays: [
+      { required: true, message: "套餐持续时间不能为空", trigger: "blur" }
+    ],
+    status: [
+      { required: true, message: "状态：0-禁用 1-启用不能为空", trigger: "change" }
+    ],
+    sortOrder: [
+      { required: true, message: "排序不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询套餐列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listChatPackage(queryParams.value);
+  chatPackageList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  chatPackageFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ChatPackageVO[]) => {
+  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?: ChatPackageVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getChatPackage(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改套餐";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  chatPackageFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateChatPackage(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addChatPackage(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ChatPackageVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除套餐编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delChatPackage(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('im/chatPackage/export', {
+    ...queryParams.value
+  }, `chatPackage_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImChatPackageController.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImChatPackageController.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.ImChatPackageVo;
+import org.dromara.im.domain.bo.ImChatPackageBo;
+import org.dromara.im.service.IImChatPackageService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 套餐
+ *
+ * @author Blue
+ * @date 2026-04-09
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/im/chatPackage")
+public class ImChatPackageController extends BaseController {
+
+    private final IImChatPackageService imChatPackageService;
+
+    /**
+     * 查询套餐列表
+     */
+    @SaCheckPermission("im:chatPackage:list")
+    @GetMapping("/list")
+    public TableDataInfo<ImChatPackageVo> list(ImChatPackageBo bo, PageQuery pageQuery) {
+        return imChatPackageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出套餐列表
+     */
+    @SaCheckPermission("im:chatPackage:export")
+    @Log(title = "套餐", businessType = BusinessType.EXPORT)
+    //@PostMapping("/export")
+    public void export(ImChatPackageBo bo, HttpServletResponse response) {
+        List<ImChatPackageVo> list = imChatPackageService.queryList(bo);
+        ExcelUtil.exportExcel(list, "套餐", ImChatPackageVo.class, response);
+    }
+
+    /**
+     * 获取套餐详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("im:chatPackage:query")
+    @GetMapping("/{id}")
+    public R<ImChatPackageVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(imChatPackageService.queryById(id));
+    }
+
+    /**
+     * 新增套餐
+     */
+    @SaCheckPermission("im:chatPackage:add")
+    @Log(title = "套餐", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ImChatPackageBo bo) {
+        return toAjax(imChatPackageService.insertByBo(bo));
+    }
+
+    /**
+     * 修改套餐
+     */
+    @SaCheckPermission("im:chatPackage:edit")
+    @Log(title = "套餐", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ImChatPackageBo bo) {
+        return toAjax(imChatPackageService.updateByBo(bo));
+    }
+
+    /**
+     * 删除套餐
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("im:chatPackage:remove")
+    @Log(title = "套餐", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(imChatPackageService.deleteWithValidByIds(List.of(ids), true));
+    }
+}
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImAgent.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImAgent.java
@ -51,5 +51,10 @@ public class ImAgent implements TransPojo {
     */
    private Date updatedTime;

+    /**
+     * 套餐到期时间
+     */
+    private Date packageExpireTime;
+

 }
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImChatPackage.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImChatPackage.java
@ -0,0 +1,79 @@
+package org.dromara.im.domain;
+
+import com.fhs.core.trans.vo.TransPojo;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 套餐对象 im_chat_package
+ *
+ * @author Blue
+ * @date 2026-04-09
+ */
+@Data
+@TableName("im_chat_package")
+public class ImChatPackage implements TransPojo {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 套餐名称
+     */
+    private String packageName;
+
+    /**
+     * 套餐内容描述
+     */
+    private String packageContent;
+
+    /**
+     * 客服数量
+     */
+    private Long customerServiceNumber;
+
+    /**
+     * 套餐持续时间（天）
+     */
+    private Long durationDays;
+
+    /**
+     * 状态：0-禁用 1-启用
+     */
+    private Long status;
+
+    /**
+     * 排序
+     */
+    private Long sortOrder;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 创建者ID
+     */
+    private Long creatorId;
+
+    /**
+     * 更新者ID
+     */
+    private Long updaterId;
+
+
+}
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImAgentBo.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImAgentBo.java
@ -61,5 +61,10 @@ public class ImAgentBo {
    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
    private Date updatedTime;

+    /**
+     * 套餐到期时间
+     */
+    private Date packageExpireTime;
+

 }
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImChatPackageBo.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImChatPackageBo.java
@ -0,0 +1,73 @@
+package org.dromara.im.domain.bo;
+
+import org.dromara.im.domain.ImChatPackage;
+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_chat_package
+ *
+ * @author Blue
+ * @date 2026-04-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ImChatPackage.class, reverseConvertGenerate = false)
+public class ImChatPackageBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 套餐名称
+     */
+    @NotBlank(message = "套餐名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String packageName;
+
+    /**
+     * 套餐内容描述
+     */
+    @NotBlank(message = "套餐内容描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String packageContent;
+
+    /**
+     * 客服数量
+     */
+    @NotNull(message = "客服数量不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long customerServiceNumber;
+
+    /**
+     * 套餐持续时间（天）
+     */
+    @NotNull(message = "套餐持续时间（天）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long durationDays;
+
+    /**
+     * 状态：0-禁用 1-启用
+     */
+    @NotNull(message = "状态：0-禁用 1-启用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+    /**
+     * 排序
+     */
+    @NotNull(message = "排序不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long sortOrder;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImAgentVo.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImAgentVo.java
@ -72,5 +72,10 @@ public class ImAgentVo implements Serializable {
    @ExcelProperty(value = "更新时间")
    private Date updatedTime;

+    /**
+     * 套餐到期时间
+     */
+    private Date packageExpireTime;
+

 }
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImChatPackageVo.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImChatPackageVo.java
@ -0,0 +1,66 @@
+package org.dromara.im.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.im.domain.ImChatPackage;
+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_chat_package
+ *
+ * @author Blue
+ * @date 2026-04-09
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ImChatPackage.class)
+public class ImChatPackageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 套餐名称
+     */
+    @ExcelProperty(value = "套餐名称")
+    private String packageName;
+
+    /**
+     * 客服数量
+     */
+    @ExcelProperty(value = "客服数量")
+    private Long customerServiceNumber;
+
+    /**
+     * 套餐持续时间（天）
+     */
+    @ExcelProperty(value = "套餐持续时间", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "天=")
+    private Long durationDays;
+
+    /**
+     * 状态：0-禁用 1-启用
+     */
+    @ExcelProperty(value = "状态：0-禁用 1-启用", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "commom_status")
+    private Long status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createdTime;
+
+
+}
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImChatPackageMapper.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImChatPackageMapper.java
@ -0,0 +1,15 @@
+package org.dromara.im.mapper;
+
+import org.dromara.im.domain.ImChatPackage;
+import org.dromara.im.domain.vo.ImChatPackageVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 套餐Mapper接口
+ *
+ * @author Blue
+ * @date 2026-04-09
+ */
+public interface ImChatPackageMapper extends BaseMapperPlus<ImChatPackage, ImChatPackageVo> {
+
+}
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImChatPackageService.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImChatPackageService.java
@ -0,0 +1,68 @@
+package org.dromara.im.service;
+
+import org.dromara.im.domain.vo.ImChatPackageVo;
+import org.dromara.im.domain.bo.ImChatPackageBo;
+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-09
+ */
+public interface IImChatPackageService {
+
+    /**
+     * 查询套餐
+     *
+     * @param id 主键
+     * @return 套餐
+     */
+    ImChatPackageVo queryById(Long id);
+
+    /**
+     * 分页查询套餐列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 套餐分页列表
+     */
+    TableDataInfo<ImChatPackageVo> queryPageList(ImChatPackageBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的套餐列表
+     *
+     * @param bo 查询条件
+     * @return 套餐列表
+     */
+    List<ImChatPackageVo> queryList(ImChatPackageBo bo);
+
+    /**
+     * 新增套餐
+     *
+     * @param bo 套餐
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ImChatPackageBo bo);
+
+    /**
+     * 修改套餐
+     *
+     * @param bo 套餐
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ImChatPackageBo bo);
+
+    /**
+     * 校验并批量删除套餐信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImAgentServiceImpl.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImAgentServiceImpl.java
@ -14,6 +14,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.im.constant.ImConstant;
+import org.dromara.im.mq.ImRedisMQTemplate;
 import org.springframework.stereotype.Service;
 import org.dromara.im.domain.bo.ImAgentBo;
 import org.dromara.im.domain.vo.ImAgentVo;
@ -40,6 +41,8 @@ public class ImAgentServiceImpl implements IImAgentService {

    private final ImAgentMapper baseMapper;

+    private final ImRedisMQTemplate redisMQTemplate;
+
    /**
     * 查询代理关联
     *
@ -98,11 +101,7 @@ public class ImAgentServiceImpl implements IImAgentService {
    public Boolean insertByBo(ImAgentBo bo) {
        ImAgent add = MapstructUtils.convert(bo, ImAgent.class);
        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
+        return baseMapper.insert(add) > 0;
    }

    /**
@ -156,8 +155,9 @@ public class ImAgentServiceImpl implements IImAgentService {
        String cacheKey = AGENT_TOKEN_KEY + userId;
        
        // 先从缓存中获取
-        String cachedToken = RedisUtils.getCacheObject(cacheKey);
-        if (ObjectUtil.isNotEmpty(cachedToken)) {
+        String cachedToken = (String) redisMQTemplate.opsForValue().get(cacheKey);
+
+        if (cachedToken != null && ObjectUtil.isNotEmpty(cachedToken)) {
            return cachedToken;
        }

@ -170,7 +170,7 @@ public class ImAgentServiceImpl implements IImAgentService {
            if(ObjectUtil.isNotEmpty(uniqueToken)){
                token = uniqueToken;
                // 将token存入缓存，过期时间1小时
-                RedisUtils.setCacheObject(cacheKey, token, Duration.ofHours(1));
+                redisMQTemplate.opsForValue().set(cacheKey, token, Duration.ofHours(1));
            }
        }

--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImChatPackageServiceImpl.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImChatPackageServiceImpl.java
@ -0,0 +1,134 @@
+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.ImChatPackageBo;
+import org.dromara.im.domain.vo.ImChatPackageVo;
+import org.dromara.im.domain.ImChatPackage;
+import org.dromara.im.mapper.ImChatPackageMapper;
+import org.dromara.im.service.IImChatPackageService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 套餐Service业务层处理
+ *
+ * @author Blue
+ * @date 2026-04-09
+ */
+@DS(ImConstant.DS_IM_PLATFORM)
+@RequiredArgsConstructor
+@Service
+public class ImChatPackageServiceImpl implements IImChatPackageService {
+
+    private final ImChatPackageMapper baseMapper;
+
+    /**
+     * 查询套餐
+     *
+     * @param id 主键
+     * @return 套餐
+     */
+    @Override
+    public ImChatPackageVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询套餐列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 套餐分页列表
+     */
+    @Override
+    public TableDataInfo<ImChatPackageVo> queryPageList(ImChatPackageBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ImChatPackage> lqw = buildQueryWrapper(bo);
+        Page<ImChatPackageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的套餐列表
+     *
+     * @param bo 查询条件
+     * @return 套餐列表
+     */
+    @Override
+    public List<ImChatPackageVo> queryList(ImChatPackageBo bo) {
+        LambdaQueryWrapper<ImChatPackage> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ImChatPackage> buildQueryWrapper(ImChatPackageBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ImChatPackage> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getPackageName()), ImChatPackage::getPackageName, bo.getPackageName());
+        lqw.eq(StringUtils.isNotBlank(bo.getPackageContent()), ImChatPackage::getPackageContent, bo.getPackageContent());
+        lqw.eq(bo.getStatus() != null, ImChatPackage::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增套餐
+     *
+     * @param bo 套餐
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ImChatPackageBo bo) {
+        ImChatPackage add = MapstructUtils.convert(bo, ImChatPackage.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改套餐
+     *
+     * @param bo 套餐
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ImChatPackageBo bo) {
+        ImChatPackage update = MapstructUtils.convert(bo, ImChatPackage.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ImChatPackage entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除套餐信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
--- a/im-admin/ruoyi-im/src/main/resources/mapper/im/ImChatPackageMapper.xml
+++ b/im-admin/ruoyi-im/src/main/resources/mapper/im/ImChatPackageMapper.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.ImChatPackageMapper">
+
+</mapper>
--- a/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ImAgentAdmin.java
+++ b/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ImAgentAdmin.java
@ -51,5 +51,10 @@ public class ImAgentAdmin implements TransPojo {
     */
    private Date updatedTime;

+    /**
+     * 套餐到期时间
+     */
+    private Date packageExpireTime;
+

 }
--- a/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ImAgentAdminBo.java
+++ b/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ImAgentAdminBo.java
@ -62,5 +62,10 @@ public class ImAgentAdminBo extends BaseEntity {
    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
    private Date updatedTime;

+    /**
+     * 套餐到期时间
+     */
+    private Date packageExpireTime;
+

 }
--- a/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ImAgentAdminVo.java
+++ b/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ImAgentAdminVo.java
@ -68,5 +68,10 @@ public class ImAgentAdminVo implements Serializable {
    @ExcelProperty(value = "更新时间")
    private Date updatedTime;

+    /**
+     * 套餐到期时间
+     */
+    private Date packageExpireTime;
+

 }