From 116cd62e594e550ba59d7fcada90dde3af325a57 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Mon, 11 Nov 2024 16:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8Bcode=E2=80=94>name?=
 =?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

---
 .../service/impl/SysIotModelServiceImpl.java  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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 67750e0c..0476b8c3 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
@@ -469,7 +469,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
                     addModelFieldCache(highCreateList.get(i));
                 }
             }
-            for (SysIotModelField item : calCreateList){
+            for (SysIotModelField item : calCreateList) {
                 createTdStableOrColumn(item);
                 addModelFieldCache(item);
             }
@@ -582,7 +582,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         if (sysIotModelField.getAttributeType() == 199) {
             Long iotModelId = sysIotModelField.getIotModelId();
             String modelCode = dataService.iotModelMap.get(iotModelId.toString());
-            tdEngineService.deleteStable("c_" + modelCode +"_"+ sysIotModelField.getAttributeCode());
+            tdEngineService.deleteStable("c_" + modelCode + "_" + sysIotModelField.getAttributeCode());
         } else {
             String stableName = null;
             SysIotModel sysIotModel = sysIotModelMapper.selectById(sysIotModelField.getIotModelId());
@@ -611,6 +611,15 @@ public class SysIotModelServiceImpl implements SysIotModelService {
     private void addModelFieldCache(SysIotModelField sysIotModelField) {
         //获取物模型编码
         String modelCode = dataService.iotModelMap.get(sysIotModelField.getIotModelId().toString());
+        Map<String, String> fieldCodeNameMap = dataService.fieldCodeNameMap.get(modelCode);
+        if (fieldCodeNameMap == null) {
+            Map<String, String> fieldCodeName = new HashMap<>();
+            fieldCodeName.put(sysIotModelField.getAttributeCode(),sysIotModelField.getAttributeName());
+            dataService.fieldCodeNameMap.put(modelCode,fieldCodeName);
+        }
+        else {
+            fieldCodeNameMap.put(sysIotModelField.getAttributeCode(), sysIotModelField.getAttributeName());
+        }
         if (sysIotModelField.getAttributeType() == 199) {
             Map<String, String> map = dataService.calculateIotFieldMap.get(modelCode);
             if (map == null) {
@@ -657,10 +666,12 @@ public class SysIotModelServiceImpl implements SysIotModelService {
     private void deleteModelFieldCache(SysIotModelField sysIotModelField) {
         //获取物模型编码
         String modelCode = dataService.iotModelMap.get(sysIotModelField.getIotModelId().toString());
-        if (sysIotModelField.getAttributeType() == 199){
+        Map<String, String> fieldCodeName = dataService.fieldCodeNameMap.get(modelCode);
+        fieldCodeName.remove(sysIotModelField.getAttributeCode());
+        if (sysIotModelField.getAttributeType() == 199) {
             Map<String, String> map = dataService.calculateIotFieldMap.get(modelCode);
             map.remove(sysIotModelField.getAttributeCode());
-        }else {
+        } else {
             if (sysIotModelField.getHighSpeed() == 0) {
                 Map<String, Object> map = dataService.lowIotFieldMap.get(modelCode);
                 map.remove(sysIotModelField.getAttributeCode());