From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 16:30:20 +0800
Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 70 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index 42ef2c9..2d589e5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.CacheNames;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -13,17 +13,19 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.service.DictService;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StreamUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.utils.redis.CacheUtils;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.mapper.SysDictTypeMapper;
import com.ruoyi.system.service.ISysDictTypeService;
import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 瀛楀吀 涓氬姟灞傚鐞�
@@ -83,15 +85,11 @@
* @param dictType 瀛楀吀绫诲瀷
* @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
*/
+ @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
@Override
public List<SysDictData> selectDictDataByType(String dictType) {
- List<SysDictData> dictDatas = RedisUtils.getCacheObject(getCacheKey(dictType));
+ List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType);
if (CollUtil.isNotEmpty(dictDatas)) {
- return dictDatas;
- }
- dictDatas = dictDataMapper.selectDictDataByType(dictType);
- if (CollUtil.isNotEmpty(dictDatas)) {
- RedisUtils.setCacheObject(getCacheKey(dictType), dictDatas);
return dictDatas;
}
return null;
@@ -114,6 +112,7 @@
* @param dictType 瀛楀吀绫诲瀷
* @return 瀛楀吀绫诲瀷
*/
+ @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
@Override
public SysDictType selectDictTypeByType(String dictType) {
return baseMapper.selectById(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType));
@@ -123,17 +122,16 @@
* 鎵归噺鍒犻櫎瀛楀吀绫诲瀷淇℃伅
*
* @param dictIds 闇�瑕佸垹闄ょ殑瀛楀吀ID
- * @return 缁撴灉
*/
@Override
public void deleteDictTypeByIds(Long[] dictIds) {
for (Long dictId : dictIds) {
SysDictType dictType = selectDictTypeById(dictId);
- if (dictDataMapper.selectCount(new LambdaQueryWrapper<SysDictData>()
- .eq(SysDictData::getDictType, dictType.getDictType())) > 0) {
+ if (dictDataMapper.exists(new LambdaQueryWrapper<SysDictData>()
+ .eq(SysDictData::getDictType, dictType.getDictType()))) {
throw new ServiceException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", dictType.getDictName()));
}
- RedisUtils.deleteObject(getCacheKey(dictType.getDictType()));
+ CacheUtils.evict(CacheNames.SYS_DICT, dictType.getDictType());
}
baseMapper.deleteBatchIds(Arrays.asList(dictIds));
}
@@ -144,14 +142,11 @@
@Override
public void loadingDictCache() {
List<SysDictData> dictDataList = dictDataMapper.selectList(
- new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getStatus, "0"));
- Map<String, List<SysDictData>> dictDataMap = dictDataList.stream().collect(Collectors.groupingBy(SysDictData::getDictType));
+ new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getStatus, UserConstants.DICT_NORMAL));
+ Map<String, List<SysDictData>> dictDataMap = StreamUtils.groupByKey(dictDataList, SysDictData::getDictType);
dictDataMap.forEach((k,v) -> {
- String dictKey = getCacheKey(k);
- List<SysDictData> dictList = v.stream()
- .sorted(Comparator.comparing(SysDictData::getDictSort))
- .collect(Collectors.toList());
- RedisUtils.setCacheObject(dictKey, dictList);
+ List<SysDictData> dictList = StreamUtils.sorted(v, Comparator.comparing(SysDictData::getDictSort));
+ CacheUtils.put(CacheNames.SYS_DICT, k, dictList);
});
}
@@ -160,8 +155,7 @@
*/
@Override
public void clearDictCache() {
- Collection<String> keys = RedisUtils.keys(Constants.SYS_DICT_KEY + "*");
- RedisUtils.deleteObject(keys);
+ CacheUtils.clear(CacheNames.SYS_DICT);
}
/**
@@ -179,13 +173,14 @@
* @param dict 瀛楀吀绫诲瀷淇℃伅
* @return 缁撴灉
*/
+ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#dict.dictType")
@Override
- public int insertDictType(SysDictType dict) {
+ public List<SysDictData> insertDictType(SysDictType dict) {
int row = baseMapper.insert(dict);
if (row > 0) {
- RedisUtils.setCacheObject(getCacheKey(dict.getDictType()), null);
+ return new ArrayList<>();
}
- return row;
+ throw new ServiceException("鎿嶄綔澶辫触");
}
/**
@@ -194,19 +189,20 @@
* @param dict 瀛楀吀绫诲瀷淇℃伅
* @return 缁撴灉
*/
+ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#dict.dictType")
@Override
@Transactional(rollbackFor = Exception.class)
- public int updateDictType(SysDictType dict) {
+ public List<SysDictData> updateDictType(SysDictType dict) {
SysDictType oldDict = baseMapper.selectById(dict.getDictId());
dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>()
.set(SysDictData::getDictType, dict.getDictType())
.eq(SysDictData::getDictType, oldDict.getDictType()));
int row = baseMapper.updateById(dict);
if (row > 0) {
- List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
- RedisUtils.setCacheObject(getCacheKey(dict.getDictType()), dictDatas);
+ CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType());
+ return dictDataMapper.selectDictDataByType(dict.getDictType());
}
- return row;
+ throw new ServiceException("鎿嶄綔澶辫触");
}
/**
@@ -217,11 +213,10 @@
*/
@Override
public String checkDictTypeUnique(SysDictType dict) {
- Long dictId = ObjectUtil.isNull(dict.getDictId()) ? -1L : dict.getDictId();
- long count = baseMapper.selectCount(new LambdaQueryWrapper<SysDictType>()
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDictType>()
.eq(SysDictType::getDictType, dict.getDictType())
- .ne(SysDictType::getDictId, dictId));
- if (count > 0) {
+ .ne(ObjectUtil.isNotNull(dict.getDictId()), SysDictType::getDictId, dict.getDictId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -291,13 +286,4 @@
return StringUtils.stripEnd(propertyString.toString(), separator);
}
- /**
- * 璁剧疆cache key
- *
- * @param configKey 鍙傛暟閿�
- * @return 缂撳瓨閿甼ey
- */
- String getCacheKey(String configKey) {
- return Constants.SYS_DICT_KEY + configKey;
- }
}
--
Gitblit v1.9.3