From a6f30412ade38bc49585fd64e3f0746161db3ea6 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 25 三月 2022 15:22:01 +0800 Subject: [PATCH] update 修改角色适配 采用 get set 转换数据类型 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java | 91 ++++++++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 43 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 8e29db6..03de7c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -1,38 +1,40 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.PageUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.redis.RedisUtils; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.service.ISysDictDataService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Arrays; import java.util.List; /** * 瀛楀吀 涓氬姟灞傚鐞� * - * @author ruoyi + * @author Lion Li */ +@RequiredArgsConstructor @Service -public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService { +public class SysDictDataServiceImpl implements ISysDictDataService { - @Autowired - private SysDictDataMapper dictDataMapper; + private final SysDictDataMapper baseMapper; @Override - public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData) { + public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData, PageQuery pageQuery) { LambdaQueryWrapper<SysDictData> lqw = new LambdaQueryWrapper<SysDictData>() - .eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType()) - .like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel()) - .eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus()) - .orderByAsc(SysDictData::getDictSort); - return PageUtils.buildDataInfo(page(PageUtils.buildPage(),lqw)); + .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); + return TableDataInfo.build(page); } /** @@ -43,11 +45,11 @@ */ @Override public List<SysDictData> selectDictDataList(SysDictData dictData) { - return list(new LambdaQueryWrapper<SysDictData>() - .eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType()) - .like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel()) - .eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus()) - .orderByAsc(SysDictData::getDictSort)); + 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)); } /** @@ -59,11 +61,11 @@ */ @Override public String selectDictLabel(String dictType, String dictValue) { - return getOne(new LambdaQueryWrapper<SysDictData>() + return baseMapper.selectOne(new LambdaQueryWrapper<SysDictData>() .select(SysDictData::getDictLabel) .eq(SysDictData::getDictType, dictType) .eq(SysDictData::getDictValue, dictValue)) - .getDictLabel(); + .getDictLabel(); } /** @@ -74,24 +76,21 @@ */ @Override public SysDictData selectDictDataById(Long dictCode) { - return getById(dictCode); + return baseMapper.selectById(dictCode); } /** * 鎵归噺鍒犻櫎瀛楀吀鏁版嵁淇℃伅 * * @param dictCodes 闇�瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID - * @return 缁撴灉 */ @Override - public void deleteDictDataByIds(Long[] dictCodes) - { - for (Long dictCode : dictCodes) - { + public void deleteDictDataByIds(Long[] dictCodes) { + for (Long dictCode : dictCodes) { SysDictData data = selectDictDataById(dictCode); - dictDataMapper.deleteDictDataById(dictCode); - List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); - DictUtils.setDictCache(data.getDictType(), dictDatas); + baseMapper.deleteById(dictCode); + List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType()); + RedisUtils.setCacheObject(getCacheKey(data.getDictType()), dictDatas); } } @@ -102,13 +101,11 @@ * @return 缁撴灉 */ @Override - public int insertDictData(SysDictData data) - { + public int insertDictData(SysDictData data) { int row = baseMapper.insert(data); - if (row > 0) - { - List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); - DictUtils.setDictCache(data.getDictType(), dictDatas); + if (row > 0) { + List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType()); + RedisUtils.setCacheObject(getCacheKey(data.getDictType()), dictDatas); } return row; } @@ -120,14 +117,22 @@ * @return 缁撴灉 */ @Override - public int updateDictData(SysDictData data) - { + public int updateDictData(SysDictData data) { int row = baseMapper.updateById(data); - if (row > 0) - { - List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); - DictUtils.setDictCache(data.getDictType(), dictDatas); + if (row > 0) { + List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType()); + RedisUtils.setCacheObject(getCacheKey(data.getDictType()), dictDatas); } return row; } + + /** + * 璁剧疆cache key + * + * @param configKey 鍙傛暟閿� + * @return 缂撳瓨閿甼ey + */ + String getCacheKey(String configKey) { + return Constants.SYS_DICT_KEY + configKey; + } } -- Gitblit v1.9.3