修改租户字典bug

zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/SysDictTypeController.java

@@ -108,12 +108,12 @@ public class SysDictTypeController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
 //    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
-//    @DeleteMapping("/refreshCache")
-//    public AjaxResult refreshCache()
-//    {
-//        dictTypeService.resetDictCache();
-//        return success();
-//    }
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        dictTypeService.resetDictCache();
+        return success();
+    }
 
     /**
      * 获取字典选择框列表

zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDictType.java

@@ -58,7 +58,7 @@ public class SysDictType extends BaseEntity
 
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
+    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下划线）")
     public String getDictType()
     {
         return dictType;

zkqy-system/src/main/java/com/zkqy/system/service/ISysDictTypeService.java

@@ -61,17 +61,17 @@ public interface ISysDictTypeService
     /**
      * 加载字典缓存数据
      */
-//    public void loadingDictCache();
-//
-//    /**
-//     * 清空字典缓存数据
-//     */
-//    public void clearDictCache();
-//
-//    /**
-//     * 重置字典缓存数据
-//     */
-//    public void resetDictCache();
+    public void loadingDictCache();
+
+    /**
+     * 清空字典缓存数据
+     */
+    public void clearDictCache();
+
+    /**
+     * 重置字典缓存数据
+     */
+    public void resetDictCache();
 
     /**
      * 新增保存字典类型信息

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysDictTypeServiceImpl.java

@@ -13,7 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 字典 业务层处理
@@ -131,36 +134,36 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     /**
      * 加载字典缓存数据
      */
-//    @Override
-//    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())
-//        {
-//            DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList()));
-//        }
-//    }
-//
-//    /**
-//     * 清空字典缓存数据
-//     */
-//    @Override
-//    public void clearDictCache()
-//    {
-//        DictUtils.clearDictCache();
-//    }
-//
-//    /**
-//     * 重置字典缓存数据
-//     */
-//    @Override
-//    public void resetDictCache()
-//    {
-//        clearDictCache();
-//        loadingDictCache();
-//    }
+    @Override
+    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())
+        {
+            DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList()));
+        }
+    }
+
+    /**
+     * 清空字典缓存数据
+     */
+    @Override
+    public void clearDictCache()
+    {
+        DictUtils.clearDictCache();
+    }
+
+    /**
+     * 重置字典缓存数据
+     */
+    @Override
+    public void resetDictCache()
+    {
+        clearDictCache();
+        loadingDictCache();
+    }
 
     /**
      * 新增保存字典类型信息