From 86cdd920b68274185233383f69ddb974052b6b6f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 17:55:51 +0800
Subject: [PATCH] system模块修改

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/handler/field/FieldCodeCache.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/handler/field/FieldCodeCache.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/handler/field/FieldCodeCache.java
index 30d1c73..2ad25d9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/handler/field/FieldCodeCache.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/handler/field/FieldCodeCache.java
@@ -37,7 +37,7 @@
         }
         List<CustomTemplateFieldColumnVO> columns = this.customTemplateFieldService.getColumns(templateId, configType);
         List<CustomTemplateField> customTemplateFields = CustomTemplateFieldConvert.INSTANCE.convertToFields(columns);
-        List<CustomTemplateField> notSysField = (List) customTemplateFields.stream().filter(c -> {
+        List<CustomTemplateField> notSysField = customTemplateFields.stream().filter(c -> {
             return c.getSystemField().equals(CommonConstant.ZERO);
         }).collect(Collectors.toList());
         this.bladeRedis.setEx(getCacheKey(templateId, configType), notSysField, CACHE_TIMEOUT);
@@ -45,17 +45,19 @@
     }
 
     private Map<String, CustomTemplateField> convertMap(List<CustomTemplateField> columns) {
+    	return columns.parallelStream().collect(Collectors.toMap(CustomTemplateField::getFieldCode, o -> o, (o, n) -> o));
+    	/*
         return (Map) columns.parallelStream().collect(Collectors.toMap((v0) -> {
             return v0.getFieldCode();
         }, o -> {
             return o;
         }, o2, n -> {
             return o2;
-        }));
+        }));*/
     }
 
     public static String getCacheKey(Long templateId, Integer configType) {
-        return FIELDS_KEY + templateId + SystemPropertyUtils.VALUE_SEPARATOR + configType;
+        return FIELDS_KEY + templateId + ":" + configType;
     }
 
     public void clear(Long templateId, Integer configType) {
@@ -63,9 +65,12 @@
     }
 
     public void clear(Long templateId) {
+    	for (ConfigTypeEnum value : ConfigTypeEnum.values()) {
+    	      this.bladeRedis.del(getCacheKey(templateId, value.getCode())); 
+    	}/*
         ConfigTypeEnum[] values;
         for (ConfigTypeEnum value : ConfigTypeEnum.values()) {
             this.bladeRedis.del(getCacheKey(templateId, value.getCode()));
-        }
+        }*/
     }
 }

--
Gitblit v1.9.3