From ef7e5fcc3f3109d946cbb07fb4e2cb806ebf0f2d Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 22 Nov 2024 10:34:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/data/service/impl/DataServiceImpl.java |  2 +-
 .../service/impl/SysIotModelServiceImpl.java       | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
index f9b0787d..94745c55 100644
--- a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
+++ b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
@@ -218,7 +218,7 @@ public class DataServiceImpl implements DataService {
             Map<String, String> HighModelFieldList = allIotModelField.stream().filter(field -> field.getHighSpeed() == 1 && field.getAttributeType() != 199).collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getDataType, (value1, value2) -> value1));
             Map<String, String> calculateFieldList = allIotModelField.stream().filter(field -> field.getAttributeType() == 199).collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getDataType, (value1, value2) -> value1));
             Map<String, String> fieldCodeNameList = allIotModelField.stream().collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getAttributeName, (value1, value2) -> value1));
-            Map<String, Integer> eventLevelList = allIotModelField.stream().filter(field -> field.getAttributeType() == 140).collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getLevel, (value1, value2) -> value1));
+            Map<String, Integer> eventLevelList = allIotModelField.stream().collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getLevel, (value1, value2) -> value1));
             Map<String, Object> map = new HashMap<>();
             for (String field : HighModelFieldList.keySet()) {
                 map.put(field, HighModelFieldList.get(field));
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
index b9ffc771..3d73749b 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
@@ -622,6 +622,17 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         else {
             fieldCodeNameMap.put(sysIotModelField.getAttributeCode(), sysIotModelField.getAttributeName());
         }
+        if (sysIotModelField.getLevel() != null){
+            Map<String, Integer> levelMap = dataService.eventLevelMap.get(modelCode);
+            if (levelMap == null) {
+                Map<String, Integer> calMap = new HashMap<>();
+                calMap.put(sysIotModelField.getAttributeCode(), sysIotModelField.getLevel());
+                dataService.eventLevelMap.put(modelCode, calMap);
+            } else {
+                levelMap.put(sysIotModelField.getAttributeCode(), sysIotModelField.getLevel());
+            }
+
+        }
         if (sysIotModelField.getAttributeType() == 199) {
             Map<String, String> map = dataService.calculateIotFieldMap.get(modelCode);
             if (map == null) {
@@ -670,6 +681,9 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         String modelCode = dataService.iotModelMap.get(sysIotModelField.getIotModelId().toString());
         Map<String, String> fieldCodeName = dataService.fieldCodeNameMap.get(modelCode);
         fieldCodeName.remove(sysIotModelField.getAttributeCode());
+        if (sysIotModelField.getLevel() != null){
+            dataService.eventLevelMap.remove(sysIotModelField.getAttributeCode());
+        }
         if (sysIotModelField.getAttributeType() == 199) {
             Map<String, String> map = dataService.calculateIotFieldMap.get(modelCode);
             map.remove(sysIotModelField.getAttributeCode());