From 37fd5447c3b7bfdd3d1b31f8d68c6750471f178c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 27 八月 2025 16:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/service/impl/EquipmentServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/service/impl/EquipmentServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/service/impl/EquipmentServiceImpl.java
index e5e80ec..47680dd 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/service/impl/EquipmentServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/service/impl/EquipmentServiceImpl.java
@@ -200,6 +200,7 @@
.ge(Equipment::getCreateTime, deployDate)
.list();
equipmentList.forEach(equipment -> {
+ String code = equipment.getEqptCode();
// 灏嗘墍鏈夌殑 '-' 鏇挎崲涓� '_'
equipment.setEqptCode(equipment.getEqptCode().replace("-", "_"));
if (databaseType.equals("SqlServer")) {
@@ -217,7 +218,7 @@
}
// 缁檓dc璁惧琛ㄥ鍔犺澶囦俊鎭�
org.jeecg.modules.iot.mdc.entity.Equipment mdcEquipment = new org.jeecg.modules.iot.mdc.entity.Equipment();
- mdcEquipment.setEquipmentid(equipment.getEqptCode());
+ mdcEquipment.setEquipmentid(code);
mdcEquipment.setEquipmentname(equipment.getEqptName());
mdcEquipment.setSavetablename(equipment.getControlSystem() + '_' + equipment.getEqptCode());
mdcEquipment.setDrivetype(equipment.getControlSystem());
--
Gitblit v1.9.3