From b0554643d7a5104a777769eea4193af7600f95e3 Mon Sep 17 00:00:00 2001 From: La123123 <617330105@qq.com> Date: Thu, 9 Apr 2026 09:44:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E8=A1=A8=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E5=9F=BA=E7=B1=BB/=E4=BB=A3=E7=90=86=E8=A1=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=A5=97=E9=A4=90=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-admin-ui/src/api/im/chatPackage/index.ts | 63 ++++ im-admin-ui/src/api/im/chatPackage/types.ts | 96 ++++++ .../src/views/im/chatPackage/index.vue | 280 ++++++++++++++++++ .../controller/ImChatPackageController.java | 105 +++++++ .../java/org/dromara/im/domain/ImAgent.java | 5 + .../org/dromara/im/domain/ImChatPackage.java | 79 +++++ .../org/dromara/im/domain/bo/ImAgentBo.java | 5 + .../dromara/im/domain/bo/ImChatPackageBo.java | 73 +++++ .../org/dromara/im/domain/vo/ImAgentVo.java | 5 + .../dromara/im/domain/vo/ImChatPackageVo.java | 66 +++++ .../im/mapper/ImChatPackageMapper.java | 15 + .../im/service/IImChatPackageService.java | 68 +++++ .../im/service/impl/ImAgentServiceImpl.java | 16 +- .../impl/ImChatPackageServiceImpl.java | 134 +++++++++ .../mapper/im/ImChatPackageMapper.xml | 7 + .../dromara/system/domain/ImAgentAdmin.java | 5 + .../system/domain/bo/ImAgentAdminBo.java | 5 + .../system/domain/vo/ImAgentAdminVo.java | 5 + 18 files changed, 1024 insertions(+), 8 deletions(-) create mode 100644 im-admin-ui/src/api/im/chatPackage/index.ts create mode 100644 im-admin-ui/src/api/im/chatPackage/types.ts create mode 100644 im-admin-ui/src/views/im/chatPackage/index.vue create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImChatPackageController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImChatPackage.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImChatPackageBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImChatPackageVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImChatPackageMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImChatPackageService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImChatPackageServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/resources/mapper/im/ImChatPackageMapper.xml diff --git a/im-admin-ui/src/api/im/chatPackage/index.ts b/im-admin-ui/src/api/im/chatPackage/index.ts new file mode 100644 index 0000000..7670106 --- /dev/null +++ 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 => { + return request({ + url: '/im/chatPackage/list', + method: 'get', + params: query + }); +}; + +/** + * 查询套餐详细 + * @param id + */ +export const getChatPackage = (id: string | number): AxiosPromise => { + 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) => { + return request({ + url: '/im/chatPackage/' + id, + method: 'delete' + }); +}; diff --git a/im-admin-ui/src/api/im/chatPackage/types.ts b/im-admin-ui/src/api/im/chatPackage/types.ts new file mode 100644 index 0000000..1a7115c --- /dev/null +++ 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; +} + + + diff --git a/im-admin-ui/src/views/im/chatPackage/index.vue b/im-admin-ui/src/views/im/chatPackage/index.vue new file mode 100644 index 0000000..3a8e51d --- /dev/null +++ b/im-admin-ui/src/views/im/chatPackage/index.vue @@ -0,0 +1,280 @@ + + + diff --git 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 new file mode 100644 index 0000000..a6d2d6e --- /dev/null +++ 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 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 list = imChatPackageService.queryList(bo); + ExcelUtil.exportExcel(list, "套餐", ImChatPackageVo.class, response); + } + + /** + * 获取套餐详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("im:chatPackage:query") + @GetMapping("/{id}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(imChatPackageService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git 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 index d765272..27c72cc 100644 --- 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; + } diff --git 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 new file mode 100644 index 0000000..f6d5791 --- /dev/null +++ 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; + + +} diff --git 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 index 5344887..b8b12fa 100644 --- 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; + } diff --git 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 new file mode 100644 index 0000000..5f62ae5 --- /dev/null +++ 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; + + +} diff --git 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 index cf4bba7..3627c16 100644 --- 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; + } diff --git 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 new file mode 100644 index 0000000..2f42158 --- /dev/null +++ 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; + + +} diff --git 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 new file mode 100644 index 0000000..7412a17 --- /dev/null +++ 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 { + +} diff --git 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 new file mode 100644 index 0000000..aa9af72 --- /dev/null +++ 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 queryPageList(ImChatPackageBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的套餐列表 + * + * @param bo 查询条件 + * @return 套餐列表 + */ + List 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 ids, Boolean isValid); +} diff --git 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 index de6a1e4..4783df7 100644 --- 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)); } } diff --git 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 new file mode 100644 index 0000000..9ac05f8 --- /dev/null +++ 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 queryPageList(ImChatPackageBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的套餐列表 + * + * @param bo 查询条件 + * @return 套餐列表 + */ + @Override + public List queryList(ImChatPackageBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ImChatPackageBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/im-admin/ruoyi-im/src/main/resources/mapper/im/ImChatPackageMapper.xml b/im-admin/ruoyi-im/src/main/resources/mapper/im/ImChatPackageMapper.xml new file mode 100644 index 0000000..f9abfb7 --- /dev/null +++ b/im-admin/ruoyi-im/src/main/resources/mapper/im/ImChatPackageMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git 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 index 10d93f9..420a739 100644 --- 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; + } diff --git 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 index a4e829b..879a83c 100644 --- 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; + } diff --git 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 index d87b5c3..162c976 100644 --- 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; + }