From 7652c9f948f875fefe7d0c383c31b54a9eef2426 Mon Sep 17 00:00:00 2001 From: La123123 <617330105@qq.com> Date: Wed, 15 Apr 2026 14:41:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/im/packageHistory/index.ts | 63 ++++ .../src/api/im/packageHistory/types.ts | 131 ++++++++ .../src/views/im/packageHistory/index.vue | 288 ++++++++++++++++++ .../ImPackageHistoryController.java | 105 +++++++ .../dromara/im/domain/ImPackageHistory.java | 74 +++++ .../im/domain/bo/ImPackageHistoryBo.java | 86 ++++++ .../im/domain/vo/ImPackageHistoryVo.java | 76 +++++ .../im/mapper/ImPackageHistoryMapper.java | 15 + .../im/service/IImPackageHistoryService.java | 68 +++++ .../impl/ImChatPackageServiceImpl.java | 22 +- .../impl/ImPackageHistoryServiceImpl.java | 137 +++++++++ .../mapper/im/ImPackageHistoryMapper.xml | 7 + 12 files changed, 1070 insertions(+), 2 deletions(-) create mode 100644 im-admin-ui/src/api/im/packageHistory/index.ts create mode 100644 im-admin-ui/src/api/im/packageHistory/types.ts create mode 100644 im-admin-ui/src/views/im/packageHistory/index.vue create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPackageHistoryController.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImPackageHistory.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPackageHistoryBo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImPackageHistoryVo.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImPackageHistoryMapper.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPackageHistoryService.java create mode 100644 im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPackageHistoryServiceImpl.java create mode 100644 im-admin/ruoyi-im/src/main/resources/mapper/im/ImPackageHistoryMapper.xml diff --git a/im-admin-ui/src/api/im/packageHistory/index.ts b/im-admin-ui/src/api/im/packageHistory/index.ts new file mode 100644 index 0000000..e90e3fb --- /dev/null +++ b/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 => { + return request({ + url: '/im/packageHistory/list', + method: 'get', + params: query + }); +}; + +/** + * 查询套餐分配历史记录详细 + * @param id + */ +export const getPackageHistory = (id: string | number): AxiosPromise => { + 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) => { + return request({ + url: '/im/packageHistory/' + id, + method: 'delete' + }); +}; diff --git a/im-admin-ui/src/api/im/packageHistory/types.ts b/im-admin-ui/src/api/im/packageHistory/types.ts new file mode 100644 index 0000000..aa28265 --- /dev/null +++ b/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; +} + + + diff --git a/im-admin-ui/src/views/im/packageHistory/index.vue b/im-admin-ui/src/views/im/packageHistory/index.vue new file mode 100644 index 0000000..bcd762f --- /dev/null +++ b/im-admin-ui/src/views/im/packageHistory/index.vue @@ -0,0 +1,288 @@ + + + diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPackageHistoryController.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPackageHistoryController.java new file mode 100644 index 0000000..69d8c45 --- /dev/null +++ b/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 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 list = imPackageHistoryService.queryList(bo); + ExcelUtil.exportExcel(list, "套餐分配历史记录", ImPackageHistoryVo.class, response); + } + + /** + * 获取套餐分配历史记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("im:packageHistory:query") + //@GetMapping("/{id}") + public R 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 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 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 remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(imPackageHistoryService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImPackageHistory.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/ImPackageHistory.java new file mode 100644 index 0000000..60fa482 --- /dev/null +++ b/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; + + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPackageHistoryBo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImPackageHistoryBo.java new file mode 100644 index 0000000..6b264b9 --- /dev/null +++ b/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; + + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImPackageHistoryVo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImPackageHistoryVo.java new file mode 100644 index 0000000..5a656ed --- /dev/null +++ b/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; + + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImPackageHistoryMapper.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImPackageHistoryMapper.java new file mode 100644 index 0000000..25dbe45 --- /dev/null +++ b/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 { + +} diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPackageHistoryService.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPackageHistoryService.java new file mode 100644 index 0000000..766d23f --- /dev/null +++ b/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 queryPageList(ImPackageHistoryBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的套餐分配历史记录列表 + * + * @param bo 查询条件 + * @return 套餐分配历史记录列表 + */ + List 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 ids, Boolean isValid); +} 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 index 7c3e686..e57ab85 100644 --- 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 @@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.satoken.utils.LoginHelper; 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.dromara.im.domain.bo.ImChatPackageBo; import org.dromara.im.domain.vo.ImChatPackageVo; @@ -41,6 +43,8 @@ public class ImChatPackageServiceImpl implements IImChatPackageService { private final ImAgentMapper imAgentMapper; + private final ImPackageHistoryMapper imPackageHistoryMapper; + /** * 查询套餐 * @@ -195,7 +199,21 @@ public class ImChatPackageServiceImpl implements IImChatPackageService { agent.setPackageExpireTime(packageExpireTime); agent.setPackageId(packageId); 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; } } diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPackageHistoryServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPackageHistoryServiceImpl.java new file mode 100644 index 0000000..1c77f90 --- /dev/null +++ b/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 queryPageList(ImPackageHistoryBo 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(ImPackageHistoryBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ImPackageHistoryBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/im-admin/ruoyi-im/src/main/resources/mapper/im/ImPackageHistoryMapper.xml b/im-admin/ruoyi-im/src/main/resources/mapper/im/ImPackageHistoryMapper.xml new file mode 100644 index 0000000..ff1a2ba --- /dev/null +++ b/im-admin/ruoyi-im/src/main/resources/mapper/im/ImPackageHistoryMapper.xml @@ -0,0 +1,7 @@ + + + + +