From 397cbc65ff2cdbb85e2e48b7ab54d303e51ca3bf Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期一, 15 九月 2025 16:06:30 +0800
Subject: [PATCH] 定时生成csv文件地址修改
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/service/impl/EquipmentServiceImpl.java | 10 +++++++++-
1 files changed, 9 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..5ddb4d9 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());
@@ -512,4 +513,11 @@
throw new RuntimeException("MySQL鎻掑叆鏁版嵁澶辫触", e);
}
}
+
+ @Override
+ public List<Equipment> findEquipmentByTypeList() {
+ return new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(Equipment::getEquipmentType, 0)
+ .list();
+ }
}
--
Gitblit v1.9.3