From e8225fbdee782bbabecda08d6d1a285e39c5ca3b Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期四, 02 二月 2023 16:15:52 +0800
Subject: [PATCH] !282 System 相关表请求响应参数优化 * update 更新 system 相关表接口 (sys_role) 新增 Bo | Vo 类, 更改请求以及响应参数 ; * update 更新 system 相关表接口 (sys_notice, sys_post) 新增 Bo | Vo 类, 更改请求以及响应参数 ; * update 更新 system 相关表接口 (sys_menu) 新增 Bo | Vo 类, 更改请求以及响应参数 ; * update 更新 system 相关表接口 (sys_dict_data, sys_dict_type) 新增 Bo | Vo 类, 更改请求以及响应参数 ; * update 更新 system 相关表接口 (sys_config, sys_dept) 新增 Bo | Vo 类, 更改请求以及响应参数 ;
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
index 5d06194..eb125f2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.CacheNames;
import com.ruoyi.common.mybatis.core.page.PageQuery;
@@ -9,6 +11,8 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.utils.CacheUtils;
+import com.ruoyi.system.domain.bo.SysDictDataBo;
+import com.ruoyi.system.domain.vo.SysDictDataVo;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService;
import lombok.RequiredArgsConstructor;
@@ -29,13 +33,9 @@
private final SysDictDataMapper baseMapper;
@Override
- public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData, PageQuery pageQuery) {
- LambdaQueryWrapper<SysDictData> lqw = new LambdaQueryWrapper<SysDictData>()
- .eq(StringUtils.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
- .like(StringUtils.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
- .eq(StringUtils.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
- .orderByAsc(SysDictData::getDictSort);
- Page<SysDictData> page = baseMapper.selectPage(pageQuery.build(), lqw);
+ public TableDataInfo<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) {
+ LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(dictData);
+ Page<SysDictDataVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(page);
}
@@ -46,12 +46,19 @@
* @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
*/
@Override
- public List<SysDictData> selectDictDataList(SysDictData dictData) {
- return baseMapper.selectList(new LambdaQueryWrapper<SysDictData>()
- .eq(StringUtils.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
- .like(StringUtils.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
- .eq(StringUtils.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
- .orderByAsc(SysDictData::getDictSort));
+ public List<SysDictDataVo> selectDictDataList(SysDictDataBo dictData) {
+ LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(dictData);
+ return baseMapper.selectVoList(lqw);
+ }
+
+ private LambdaQueryWrapper<SysDictData> buildQueryWrapper(SysDictDataBo bo) {
+ LambdaQueryWrapper<SysDictData> lqw = Wrappers.lambdaQuery();
+ lqw.eq(bo.getDictSort() != null, SysDictData::getDictSort, bo.getDictSort());
+ lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), SysDictData::getDictLabel, bo.getDictLabel());
+ lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysDictData::getDictType, bo.getDictType());
+ lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDictData::getStatus, bo.getStatus());
+ lqw.orderByAsc(SysDictData::getDictSort);
+ return lqw;
}
/**
@@ -77,8 +84,8 @@
* @return 瀛楀吀鏁版嵁
*/
@Override
- public SysDictData selectDictDataById(Long dictCode) {
- return baseMapper.selectById(dictCode);
+ public SysDictDataVo selectDictDataById(Long dictCode) {
+ return baseMapper.selectVoById(dictCode);
}
/**
@@ -89,7 +96,7 @@
@Override
public void deleteDictDataByIds(Long[] dictCodes) {
for (Long dictCode : dictCodes) {
- SysDictData data = selectDictDataById(dictCode);
+ SysDictData data = baseMapper.selectById(dictCode);
baseMapper.deleteById(dictCode);
CacheUtils.evict(CacheNames.SYS_DICT, data.getDictType());
}
@@ -98,12 +105,13 @@
/**
* 鏂板淇濆瓨瀛楀吀鏁版嵁淇℃伅
*
- * @param data 瀛楀吀鏁版嵁淇℃伅
+ * @param bo 瀛楀吀鏁版嵁淇℃伅
* @return 缁撴灉
*/
- @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#data.dictType")
+ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType")
@Override
- public List<SysDictData> insertDictData(SysDictData data) {
+ public List<SysDictDataVo> insertDictData(SysDictDataBo bo) {
+ SysDictData data = BeanUtil.toBean(bo, SysDictData.class);
int row = baseMapper.insert(data);
if (row > 0) {
return baseMapper.selectDictDataByType(data.getDictType());
@@ -114,12 +122,13 @@
/**
* 淇敼淇濆瓨瀛楀吀鏁版嵁淇℃伅
*
- * @param data 瀛楀吀鏁版嵁淇℃伅
+ * @param bo 瀛楀吀鏁版嵁淇℃伅
* @return 缁撴灉
*/
- @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#data.dictType")
+ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType")
@Override
- public List<SysDictData> updateDictData(SysDictData data) {
+ public List<SysDictDataVo> updateDictData(SysDictDataBo bo) {
+ SysDictData data = BeanUtil.toBean(bo, SysDictData.class);
int row = baseMapper.updateById(data);
if (row > 0) {
return baseMapper.selectDictDataByType(data.getDictType());
--
Gitblit v1.9.3