From e523764b0f300e5055d6f4bc680aa40d2590504f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 29 五月 2021 19:14:45 +0800
Subject: [PATCH] 发布 2.2.1

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java |  184 +++++++++++++++++++++++----------------------
 1 files changed, 93 insertions(+), 91 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 faae4aa..7038565 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
@@ -11,7 +11,6 @@
 import com.ruoyi.system.service.ISysDictDataService;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -22,100 +21,103 @@
 @Service
 public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService {
 
-    @Override
-    public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData) {
-        LambdaQueryWrapper<SysDictData> lqw = new LambdaQueryWrapper<SysDictData>()
-                .eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
-                .like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
-                .eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
-                .orderByAsc(SysDictData::getDictSort);
-        return PageUtils.buildDataInfo(page(PageUtils.buildPage(),lqw));
-    }
+	@Override
+	public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData) {
+		LambdaQueryWrapper<SysDictData> lqw = new LambdaQueryWrapper<SysDictData>()
+			.eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
+			.like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
+			.eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
+			.orderByAsc(SysDictData::getDictSort);
+		return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
+	}
 
-    /**
-     * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁
-     *
-     * @param dictData 瀛楀吀鏁版嵁淇℃伅
-     * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
-     */
-    @Override
-    public List<SysDictData> selectDictDataList(SysDictData dictData) {
-        return list(new LambdaQueryWrapper<SysDictData>()
-                .eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
-                .like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
-                .eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
-                .orderByAsc(SysDictData::getDictSort));
-    }
+	/**
+	 * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁
+	 *
+	 * @param dictData 瀛楀吀鏁版嵁淇℃伅
+	 * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
+	 */
+	@Override
+	public List<SysDictData> selectDictDataList(SysDictData dictData) {
+		return list(new LambdaQueryWrapper<SysDictData>()
+			.eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
+			.like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
+			.eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
+			.orderByAsc(SysDictData::getDictSort));
+	}
 
-    /**
-     * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏搁敭鍊兼煡璇㈠瓧鍏告暟鎹俊鎭�
-     *
-     * @param dictType  瀛楀吀绫诲瀷
-     * @param dictValue 瀛楀吀閿��
-     * @return 瀛楀吀鏍囩
-     */
-    @Override
-    public String selectDictLabel(String dictType, String dictValue) {
-        return getOne(new LambdaQueryWrapper<SysDictData>()
-                .select(SysDictData::getDictLabel)
-                .eq(SysDictData::getDictType, dictType)
-                .eq(SysDictData::getDictValue, dictValue))
-                .getDictLabel();
-    }
+	/**
+	 * 鏍规嵁瀛楀吀绫诲瀷鍜屽瓧鍏搁敭鍊兼煡璇㈠瓧鍏告暟鎹俊鎭�
+	 *
+	 * @param dictType  瀛楀吀绫诲瀷
+	 * @param dictValue 瀛楀吀閿��
+	 * @return 瀛楀吀鏍囩
+	 */
+	@Override
+	public String selectDictLabel(String dictType, String dictValue) {
+		return getOne(new LambdaQueryWrapper<SysDictData>()
+			.select(SysDictData::getDictLabel)
+			.eq(SysDictData::getDictType, dictType)
+			.eq(SysDictData::getDictValue, dictValue))
+			.getDictLabel();
+	}
 
-    /**
-     * 鏍规嵁瀛楀吀鏁版嵁ID鏌ヨ淇℃伅
-     *
-     * @param dictCode 瀛楀吀鏁版嵁ID
-     * @return 瀛楀吀鏁版嵁
-     */
-    @Override
-    public SysDictData selectDictDataById(Long dictCode) {
-        return getById(dictCode);
-    }
+	/**
+	 * 鏍规嵁瀛楀吀鏁版嵁ID鏌ヨ淇℃伅
+	 *
+	 * @param dictCode 瀛楀吀鏁版嵁ID
+	 * @return 瀛楀吀鏁版嵁
+	 */
+	@Override
+	public SysDictData selectDictDataById(Long dictCode) {
+		return getById(dictCode);
+	}
 
-    /**
-     * 鎵归噺鍒犻櫎瀛楀吀鏁版嵁淇℃伅
-     *
-     * @param dictCodes 闇�瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID
-     * @return 缁撴灉
-     */
-    @Override
-    public int deleteDictDataByIds(Long[] dictCodes) {
-        int row = baseMapper.deleteBatchIds(Arrays.asList(dictCodes));
-        if (row > 0) {
-            DictUtils.clearDictCache();
-        }
-        return row;
-    }
+	/**
+	 * 鎵归噺鍒犻櫎瀛楀吀鏁版嵁淇℃伅
+	 *
+	 * @param dictCodes 闇�瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID
+	 * @return 缁撴灉
+	 */
+	@Override
+	public void deleteDictDataByIds(Long[] dictCodes) {
+		for (Long dictCode : dictCodes) {
+			SysDictData data = selectDictDataById(dictCode);
+			baseMapper.deleteById(dictCode);
+			List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
+			DictUtils.setDictCache(data.getDictType(), dictDatas);
+		}
+	}
 
-    /**
-     * 鏂板淇濆瓨瀛楀吀鏁版嵁淇℃伅
-     *
-     * @param dictData 瀛楀吀鏁版嵁淇℃伅
-     * @return 缁撴灉
-     */
-    @Override
-    public int insertDictData(SysDictData dictData) {
-        int row = baseMapper.insert(dictData);
-        if (row > 0) {
-            DictUtils.clearDictCache();
-        }
-        return row;
-    }
+	/**
+	 * 鏂板淇濆瓨瀛楀吀鏁版嵁淇℃伅
+	 *
+	 * @param data 瀛楀吀鏁版嵁淇℃伅
+	 * @return 缁撴灉
+	 */
+	@Override
+	public int insertDictData(SysDictData data) {
+		int row = baseMapper.insert(data);
+		if (row > 0) {
+			List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
+			DictUtils.setDictCache(data.getDictType(), dictDatas);
+		}
+		return row;
+	}
 
-    /**
-     * 淇敼淇濆瓨瀛楀吀鏁版嵁淇℃伅
-     *
-     * @param dictData 瀛楀吀鏁版嵁淇℃伅
-     * @return 缁撴灉
-     */
-    @Override
-    public int updateDictData(SysDictData dictData) {
-        int row = baseMapper.updateById(dictData);
-        if (row > 0) {
-            DictUtils.clearDictCache();
-        }
-        return row;
-    }
+	/**
+	 * 淇敼淇濆瓨瀛楀吀鏁版嵁淇℃伅
+	 *
+	 * @param data 瀛楀吀鏁版嵁淇℃伅
+	 * @return 缁撴灉
+	 */
+	@Override
+	public int updateDictData(SysDictData data) {
+		int row = baseMapper.updateById(data);
+		if (row > 0) {
+			List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
+			DictUtils.setDictCache(data.getDictType(), dictDatas);
+		}
+		return row;
+	}
 }

--
Gitblit v1.9.3