From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 24 十二月 2021 11:36:02 +0800 Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java | 81 +++++++++++++++++++++++++++++----------- 1 files changed, 58 insertions(+), 23 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 a096a26..7726ee0 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,11 +1,16 @@ package com.ruoyi.system.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.utils.DictUtils; +import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.RedisUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.service.ISysDictDataService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -13,12 +18,21 @@ /** * 瀛楀吀 涓氬姟灞傚鐞� * - * @author ruoyi + * @author Lion Li */ @Service -public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService { - @Autowired - private SysDictDataMapper dictDataMapper; +public class SysDictDataServiceImpl extends ServicePlusImpl<SysDictDataMapper, SysDictData, SysDictData> implements ISysDictDataService { + + @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 = page(pageQuery.build(), lqw); + return TableDataInfo.build(page); + } /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁 @@ -28,7 +42,11 @@ */ @Override public List<SysDictData> selectDictDataList(SysDictData dictData) { - return dictDataMapper.selectDictDataList(dictData); + return list(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)); } /** @@ -40,7 +58,11 @@ */ @Override public String selectDictLabel(String dictType, String dictValue) { - return dictDataMapper.selectDictLabel(dictType, dictValue); + return getOne(new LambdaQueryWrapper<SysDictData>() + .select(SysDictData::getDictLabel) + .eq(SysDictData::getDictType, dictType) + .eq(SysDictData::getDictValue, dictValue)) + .getDictLabel(); } /** @@ -51,7 +73,7 @@ */ @Override public SysDictData selectDictDataById(Long dictCode) { - return dictDataMapper.selectDictDataById(dictCode); + return getById(dictCode); } /** @@ -61,25 +83,27 @@ * @return 缁撴灉 */ @Override - public int deleteDictDataByIds(Long[] dictCodes) { - int row = dictDataMapper.deleteDictDataByIds(dictCodes); - if (row > 0) { - DictUtils.clearDictCache(); + public void deleteDictDataByIds(Long[] dictCodes) { + for (Long dictCode : dictCodes) { + SysDictData data = selectDictDataById(dictCode); + removeById(dictCode); + List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType()); + RedisUtils.setCacheObject(getCacheKey(data.getDictType()), dictDatas); } - return row; } /** * 鏂板淇濆瓨瀛楀吀鏁版嵁淇℃伅 * - * @param dictData 瀛楀吀鏁版嵁淇℃伅 + * @param data 瀛楀吀鏁版嵁淇℃伅 * @return 缁撴灉 */ @Override - public int insertDictData(SysDictData dictData) { - int row = dictDataMapper.insertDictData(dictData); + public int insertDictData(SysDictData data) { + int row = baseMapper.insert(data); if (row > 0) { - DictUtils.clearDictCache(); + List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType()); + RedisUtils.setCacheObject(getCacheKey(data.getDictType()), dictDatas); } return row; } @@ -87,15 +111,26 @@ /** * 淇敼淇濆瓨瀛楀吀鏁版嵁淇℃伅 * - * @param dictData 瀛楀吀鏁版嵁淇℃伅 + * @param data 瀛楀吀鏁版嵁淇℃伅 * @return 缁撴灉 */ @Override - public int updateDictData(SysDictData dictData) { - int row = dictDataMapper.updateDictData(dictData); + public int updateDictData(SysDictData data) { + int row = baseMapper.updateById(data); if (row > 0) { - DictUtils.clearDictCache(); + 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