From 196a08b1fcf68acdc0082c038e990ee8bb6b6ad5 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Mon, 6 Jul 2026 17:54:58 +0800
Subject: [PATCH] update

---
 .../module/iot/service/device/DeviceServiceImpl.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
index 7a26cb7fa..704215eeb 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
@@ -1352,6 +1352,12 @@ public class DeviceServiceImpl implements DeviceService {
         int invalidCount = 0;
         int duplicateCount = 0;
 
+        Map<String, Long> idToNameMap = deviceAttributeTypeMapper.selectList()
+                .stream()
+                .collect(Collectors.toMap(
+                        DeviceAttributeTypeDO::getName,
+                        DeviceAttributeTypeDO::getId
+                ));
         for (DeviceAttributeImportExcelVO importDeviceAttribute : list) {
             if (importDeviceAttribute == null) {
                 invalidCount++;
@@ -1383,6 +1389,12 @@ public class DeviceServiceImpl implements DeviceService {
             deviceAttribute.setDeviceId(deviceId);
             deviceAttribute.setAttributeCode(attributeCode);
             deviceAttribute.setAttributeName(attributeName);
+            if(!idToNameMap.get(importDeviceAttribute.getAttributeType()).equals(null)){
+                deviceAttribute.setTypeName(deviceAttribute.getAttributeType());
+                deviceAttribute.setAttributeType(idToNameMap.get(deviceAttribute.getAttributeType()).toString());
+            }else{
+                deviceAttribute.setAttributeType(null);
+            }
             insertList.add(deviceAttribute);
         }