From 97e4f5c460d37ae3eb9c03396dd9dd6bb3f970cd Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 22 十一月 2023 11:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 111 ++++++++++++++++++++++++++++---------------------------
1 files changed, 56 insertions(+), 55 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 a06b236..d0ddbf2 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,6 +5,8 @@
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
+
+import com.ruoyi.common.utils.MessageUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -20,12 +22,11 @@
/**
* 瀛楀吀 涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
*/
@Service
-public class SysDictTypeServiceImpl implements ISysDictTypeService
-{
+public class SysDictTypeServiceImpl implements ISysDictTypeService {
@Autowired
private SysDictTypeMapper dictTypeMapper;
@@ -36,52 +37,60 @@
* 椤圭洰鍚姩鏃讹紝鍒濆鍖栧瓧鍏稿埌缂撳瓨
*/
@PostConstruct
- public void init()
- {
+ public void init() {
loadingDictCache();
}
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀绫诲瀷
- *
+ *
* @param dictType 瀛楀吀绫诲瀷淇℃伅
* @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅
*/
@Override
- public List<SysDictType> selectDictTypeList(SysDictType dictType)
- {
+ public List<SysDictType> selectDictTypeList(SysDictType dictType) {
List<SysDictType> sysDictTypes = dictTypeMapper.selectDictTypeList(dictType);
+ //鍥介檯鍖�
+ sysDictTypes.stream().forEach(sysDictType -> {
+ String message = MessageUtils.message("dic.type." + sysDictType.getDictNameI18n());
+ if (StringUtils.isNotEmpty(message)) {
+ sysDictType.setDictName(message);
+ }
+ });
return sysDictTypes;
}
/**
* 鏍规嵁鎵�鏈夊瓧鍏哥被鍨�
- *
+ *
* @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅
*/
@Override
- public List<SysDictType> selectDictTypeAll()
- {
+ public List<SysDictType> selectDictTypeAll() {
return dictTypeMapper.selectDictTypeAll();
}
/**
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁
- *
+ *
* @param dictType 瀛楀吀绫诲瀷
* @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
*/
@Override
- public List<SysDictData> selectDictDataByType(String dictType)
- {
+ public List<SysDictData> selectDictDataByType(String dictType) {
List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
- if (StringUtils.isNotEmpty(dictDatas))
- {
+ if (StringUtils.isNotEmpty(dictDatas)) {
+ //鍥介檯鍖�
+ dictDatas.stream().forEach(dictData -> {
+ String message = MessageUtils.message("dic.data." + dictData.getDictLabelI18n());
+ if (StringUtils.isNotEmpty(message)) {
+ dictData.setDictLabel(message);
+ }
+ });
return dictDatas;
}
dictDatas = dictDataMapper.selectDictDataByType(dictType);
- if (StringUtils.isNotEmpty(dictDatas))
- {
+ if (StringUtils.isNotEmpty(dictDatas)) {
DictUtils.setDictCache(dictType, dictDatas);
return dictDatas;
}
@@ -90,41 +99,43 @@
/**
* 鏍规嵁瀛楀吀绫诲瀷ID鏌ヨ淇℃伅
- *
+ *
* @param dictId 瀛楀吀绫诲瀷ID
* @return 瀛楀吀绫诲瀷
*/
@Override
- public SysDictType selectDictTypeById(Long dictId)
- {
- return dictTypeMapper.selectDictTypeById(dictId);
+ public SysDictType selectDictTypeById(Long dictId) {
+ SysDictType sysDictType = dictTypeMapper.selectDictTypeById(dictId);
+ //鍥介檯鍖�
+ String message = MessageUtils.message("dic.type." + sysDictType.getDictNameI18n());
+ if(StringUtils.isNotEmpty(message))
+ {
+ sysDictType.setDictName(message);
+ }
+ return sysDictType;
}
/**
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ淇℃伅
- *
+ *
* @param dictType 瀛楀吀绫诲瀷
* @return 瀛楀吀绫诲瀷
*/
@Override
- public SysDictType selectDictTypeByType(String dictType)
- {
+ public SysDictType selectDictTypeByType(String dictType) {
return dictTypeMapper.selectDictTypeByType(dictType);
}
/**
* 鎵归噺鍒犻櫎瀛楀吀绫诲瀷淇℃伅
- *
+ *
* @param dictIds 闇�瑕佸垹闄ょ殑瀛楀吀ID
*/
@Override
- public void deleteDictTypeByIds(Long[] dictIds)
- {
- for (Long dictId : dictIds)
- {
+ public void deleteDictTypeByIds(Long[] dictIds) {
+ for (Long dictId : dictIds) {
SysDictType dictType = selectDictTypeById(dictId);
- if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
- {
+ if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) {
throw new ServiceException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", dictType.getDictName()));
}
dictTypeMapper.deleteDictTypeById(dictId);
@@ -136,13 +147,11 @@
* 鍔犺浇瀛楀吀缂撳瓨鏁版嵁
*/
@Override
- public void loadingDictCache()
- {
+ public void loadingDictCache() {
SysDictData dictData = new SysDictData();
dictData.setStatus("0");
Map<String, List<SysDictData>> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType));
- for (Map.Entry<String, List<SysDictData>> entry : dictDataMap.entrySet())
- {
+ for (Map.Entry<String, List<SysDictData>> entry : dictDataMap.entrySet()) {
DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList()));
}
}
@@ -151,8 +160,7 @@
* 娓呯┖瀛楀吀缂撳瓨鏁版嵁
*/
@Override
- public void clearDictCache()
- {
+ public void clearDictCache() {
DictUtils.clearDictCache();
}
@@ -160,24 +168,21 @@
* 閲嶇疆瀛楀吀缂撳瓨鏁版嵁
*/
@Override
- public void resetDictCache()
- {
+ public void resetDictCache() {
clearDictCache();
loadingDictCache();
}
/**
* 鏂板淇濆瓨瀛楀吀绫诲瀷淇℃伅
- *
+ *
* @param dict 瀛楀吀绫诲瀷淇℃伅
* @return 缁撴灉
*/
@Override
- public int insertDictType(SysDictType dict)
- {
+ public int insertDictType(SysDictType dict) {
int row = dictTypeMapper.insertDictType(dict);
- if (row > 0)
- {
+ if (row > 0) {
DictUtils.setDictCache(dict.getDictType(), null);
}
return row;
@@ -185,19 +190,17 @@
/**
* 淇敼淇濆瓨瀛楀吀绫诲瀷淇℃伅
- *
+ *
* @param dict 瀛楀吀绫诲瀷淇℃伅
* @return 缁撴灉
*/
@Override
@Transactional
- public int updateDictType(SysDictType dict)
- {
+ public int updateDictType(SysDictType dict) {
SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId());
dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType());
int row = dictTypeMapper.updateDictType(dict);
- if (row > 0)
- {
+ if (row > 0) {
List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
DictUtils.setDictCache(dict.getDictType(), dictDatas);
}
@@ -206,17 +209,15 @@
/**
* 鏍￠獙瀛楀吀绫诲瀷绉版槸鍚﹀敮涓�
- *
+ *
* @param dict 瀛楀吀绫诲瀷
* @return 缁撴灉
*/
@Override
- public String checkDictTypeUnique(SysDictType dict)
- {
+ public String checkDictTypeUnique(SysDictType dict) {
Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
- if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
- {
+ if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
--
Gitblit v1.9.3