From 16f4bb3c28fc85cffcc511718c903ada9fdab134 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 26 十二月 2025 16:59:45 +0800
Subject: [PATCH] 调用mes导入工程参数修改，Excel表数据流程卡号一致;增加读取层号/工程号方法; 工程号一致覆盖更新
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceStatusServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceStatusServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceStatusServiceImpl.java
index 48ab167..1e92c44 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceStatusServiceImpl.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceStatusServiceImpl.java
@@ -83,9 +83,9 @@
return false;
}
- String deviceIdStr = device.getDeviceId();
+ String deviceIdStr = String.valueOf(device.getId());
if (deviceIdStr == null || deviceIdStr.trim().isEmpty()) {
- log.warn("璁惧閰嶇疆涓璬evice_id瀛楁涓虹┖: id={}", deviceId);
+ log.warn("璁惧閰嶇疆涓璱d瀛楁涓虹┖: id={}", deviceId);
return false;
}
@@ -188,10 +188,10 @@
}
try {
DeviceConfig device = deviceConfigService.getDeviceById(deviceConfigId);
- if (device == null || device.getDeviceId() == null) {
+ if (device == null || device.getId() == null) {
return null;
}
- return getLatestByDeviceId(device.getDeviceId());
+ return getLatestByDeviceId(String.valueOf(device.getId()));
} catch (Exception e) {
log.error("鏍规嵁璁惧閰嶇疆ID鑾峰彇璁惧鐘舵�佸け璐�: deviceConfigId={}", deviceConfigId, e);
return null;
--
Gitblit v1.8.0