From 1fbc0b82c1bb1aa37a533b3df812db7fc6b60ca0 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Mon, 9 Dec 2024 17:45:45 +0800
Subject: [PATCH] =?UTF-8?q?td=E6=93=8D=E4=BD=9C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/service/impl/SysIotModelServiceImpl.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 406dc2d2..801a19b0 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
@@ -211,12 +211,13 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         if (oldSysIotField == null) {
             throw new ServiceException("未查找到该条记录");
         }
-        sysIotModelFieldMapper.updateById(sysIotModelField);
+
         if (!oldSysIotField.getAttributeCode().equals(sysIotModelField.getAttributeCode()) || !oldSysIotField.getDataType().equals(sysIotModelField.getDataType()) || Objects.equals(oldSysIotField.getHighSpeed(), sysIotModelField.getHighSpeed())) {
             //更新td表结构
             updateTDStableOrColumn(sysIotModelField, oldSysIotField);
             updateModelFieldCache(sysIotModelField, oldSysIotField);
         }
+        sysIotModelFieldMapper.updateById(sysIotModelField);
         SysIotModelFieldVo sysIotModelFieldVo = new SysIotModelFieldVo();
         BeanCopyUtils.copy(sysIotModelField, sysIotModelFieldVo);
         return sysIotModelFieldVo;
@@ -225,9 +226,10 @@ public class SysIotModelServiceImpl implements SysIotModelService {
     @Override
     public void deleteSysIotModelField(SysIotModelFieldDto sysIotModelFieldDto) {
         SysIotModelField sysIotModelField = sysIotModelFieldMapper.selectById(sysIotModelFieldDto.getId());
-        sysIotModelFieldMapper.deleteById(sysIotModelFieldDto.getId());
         //删除td表结构字段
         deleteTDStableOrColumn(sysIotModelField);
+
+        sysIotModelFieldMapper.deleteById(sysIotModelFieldDto.getId());
         //删除物模型属性缓存
         deleteModelFieldCache(sysIotModelField);
     }