From 07f3517b6f178efea6150429a3867468b718e3c4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 八月 2022 18:20:29 +0800
Subject: [PATCH] fix 修复 用户登录与短信登录 国际化格式不一致
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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 9e4ceec..04e4f4e 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,10 +1,11 @@
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.CacheConstants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -12,6 +13,7 @@
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.system.mapper.SysDictDataMapper;
@@ -22,7 +24,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 瀛楀吀 涓氬姟灞傚鐞�
@@ -85,7 +86,7 @@
@Override
public List<SysDictData> selectDictDataByType(String dictType) {
List<SysDictData> dictDatas = RedisUtils.getCacheObject(getCacheKey(dictType));
- if (StringUtils.isNotEmpty(dictDatas)) {
+ if (CollUtil.isNotEmpty(dictDatas)) {
return dictDatas;
}
dictDatas = dictDataMapper.selectDictDataByType(dictType);
@@ -122,14 +123,13 @@
* 鎵归噺鍒犻櫎瀛楀吀绫诲瀷淇℃伅
*
* @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()));
@@ -143,13 +143,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());
+ List<SysDictData> dictList = StreamUtils.sorted(v, Comparator.comparing(SysDictData::getDictSort));
RedisUtils.setCacheObject(dictKey, dictList);
});
}
@@ -159,7 +157,7 @@
*/
@Override
public void clearDictCache() {
- Collection<String> keys = RedisUtils.keys(Constants.SYS_DICT_KEY + "*");
+ Collection<String> keys = RedisUtils.keys(CacheConstants.SYS_DICT_KEY + "*");
RedisUtils.deleteObject(keys);
}
@@ -216,11 +214,10 @@
*/
@Override
public String checkDictTypeUnique(SysDictType dict) {
- Long dictId = StringUtils.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;
@@ -297,6 +294,6 @@
* @return 缂撳瓨閿甼ey
*/
String getCacheKey(String configKey) {
- return Constants.SYS_DICT_KEY + configKey;
+ return CacheConstants.SYS_DICT_KEY + configKey;
}
}
--
Gitblit v1.9.3