From ee53ab137bcd388b21e2940480173fa7aa98860b Mon Sep 17 00:00:00 2001 From: mashili Date: Fri, 26 Sep 2025 16:43:40 +0800 Subject: [PATCH] =?UTF-8?q?0918=E4=BC=98=E5=8C=96-=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=94=B5=E6=B1=A0=E7=B0=87=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java index f64cb44..66d006f 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java @@ -244,12 +244,8 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService for (PointQueryResponse pointInfo : response) { String dataKey = pointInfo.getDataPoint(); Long updateTime = Long.valueOf(bmsdJson.get("timestamp").toString()); - int isNeedDeviceId = pointInfo.getIsNeedDeviceId(); - if (isNeedDeviceId == 1 && "PCS".equals(pointInfo.getDataDevice())) {// 需要根据deviceId拼接point - dataKey = deviceId + dataKey; + if ("PCS".equals(pointInfo.getDataDevice())) { updateTime = Long.valueOf(pcsJson.get("timestamp").toString()); - } else if (isNeedDeviceId == 1 && "BMSD".equals(pointInfo.getDataDevice())){ - dataKey = bmsdDeviceId + dataKey; } pointInfo.setDataPoint(dataKey); pointInfo.setPointValue(obj.get(dataKey));