From aa638475e955207a5d5f76f9ec99415b5a18f5db Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 25 八月 2022 12:30:32 +0800 Subject: [PATCH] update 同步 ruoyi 新功能 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 98 ++++++++++++++++++++++--------------------------- 1 files changed, 44 insertions(+), 54 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 0edb041..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 @@ -1,42 +1,43 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; 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; import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; 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.redis.RedisUtils; +import com.ruoyi.common.utils.StreamUtils; import com.ruoyi.common.utils.StringUtils; +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 org.springframework.beans.factory.annotation.Autowired; +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.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 瀛楀吀 涓氬姟灞傚鐞� * * @author Lion Li */ +@RequiredArgsConstructor @Service -public class SysDictTypeServiceImpl extends ServicePlusImpl<SysDictTypeMapper, SysDictType, SysDictType> implements ISysDictTypeService, DictService { +public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService { - @Autowired - private SysDictDataMapper dictDataMapper; + private final SysDictTypeMapper baseMapper; + private final SysDictDataMapper dictDataMapper; @Override public TableDataInfo<SysDictType> selectPageDictTypeList(SysDictType dictType, PageQuery pageQuery) { @@ -47,7 +48,7 @@ .like(StringUtils.isNotBlank(dictType.getDictType()), SysDictType::getDictType, dictType.getDictType()) .between(params.get("beginTime") != null && params.get("endTime") != null, SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime")); - Page<SysDictType> page = page(pageQuery.build(), lqw); + Page<SysDictType> page = baseMapper.selectPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -60,7 +61,7 @@ @Override public List<SysDictType> selectDictTypeList(SysDictType dictType) { Map<String, Object> params = dictType.getParams(); - return list(new LambdaQueryWrapper<SysDictType>() + return baseMapper.selectList(new LambdaQueryWrapper<SysDictType>() .like(StringUtils.isNotBlank(dictType.getDictName()), SysDictType::getDictName, dictType.getDictName()) .eq(StringUtils.isNotBlank(dictType.getStatus()), SysDictType::getStatus, dictType.getStatus()) .like(StringUtils.isNotBlank(dictType.getDictType()), SysDictType::getDictType, dictType.getDictType()) @@ -75,7 +76,7 @@ */ @Override public List<SysDictType> selectDictTypeAll() { - return list(); + return baseMapper.selectList(); } /** @@ -84,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)); - if (StringUtils.isNotEmpty(dictDatas)) { - return dictDatas; - } - dictDatas = dictDataMapper.selectDictDataByType(dictType); + List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType); if (CollUtil.isNotEmpty(dictDatas)) { - RedisUtils.setCacheObject(getCacheKey(dictType), dictDatas); return dictDatas; } return null; @@ -106,7 +103,7 @@ */ @Override public SysDictType selectDictTypeById(Long dictId) { - return getById(dictId); + return baseMapper.selectById(dictId); } /** @@ -115,26 +112,26 @@ * @param dictType 瀛楀吀绫诲瀷 * @return 瀛楀吀绫诲瀷 */ + @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType") @Override public SysDictType selectDictTypeByType(String dictType) { - return getOne(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType)); + return baseMapper.selectById(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType)); } /** * 鎵归噺鍒犻櫎瀛楀吀绫诲瀷淇℃伅 * * @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,11 +141,13 @@ */ @Override public void loadingDictCache() { - List<SysDictType> dictTypeList = list(); - for (SysDictType dictType : dictTypeList) { - List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType()); - RedisUtils.setCacheObject(getCacheKey(dictType.getDictType()), dictDatas); - } + List<SysDictData> dictDataList = dictDataMapper.selectList( + new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getStatus, UserConstants.DICT_NORMAL)); + Map<String, List<SysDictData>> dictDataMap = StreamUtils.groupByKey(dictDataList, SysDictData::getDictType); + dictDataMap.forEach((k,v) -> { + List<SysDictData> dictList = StreamUtils.sorted(v, Comparator.comparing(SysDictData::getDictSort)); + CacheUtils.put(CacheNames.SYS_DICT, k, dictList); + }); } /** @@ -156,8 +155,7 @@ */ @Override public void clearDictCache() { - Collection<String> keys = RedisUtils.keys(Constants.SYS_DICT_KEY + "*"); - RedisUtils.deleteObject(keys); + CacheUtils.clear(CacheNames.SYS_DICT); } /** @@ -175,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("鎿嶄綔澶辫触"); } /** @@ -190,19 +189,20 @@ * @param dict 瀛楀吀绫诲瀷淇℃伅 * @return 缁撴灉 */ + @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#dict.dictType") @Override @Transactional(rollbackFor = Exception.class) - public int updateDictType(SysDictType dict) { - SysDictType oldDict = getById(dict.getDictId()); + 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("鎿嶄綔澶辫触"); } /** @@ -213,11 +213,10 @@ */ @Override public String checkDictTypeUnique(SysDictType dict) { - Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId(); - long count = count(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; @@ -287,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