From c2eccb2b74e3dbacddc7f0f80028a468e3d2ec41 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Mon, 18 Nov 2024 09:17:59 +0800 Subject: [PATCH] =?UTF-8?q?plc=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=A7=A3=E6=9E=90,=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plc/service/impl/PlcLogsServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java index 8a72156d..7bbf58c1 100644 --- a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java +++ b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java @@ -123,13 +123,14 @@ public class PlcLogsServiceImpl implements PlcLogService { data.remove(0); for (List item : data) { for (int i = 0; i < listField.size(); i++) { - if (map.get(listField.get(i)) == null) { + if (map.get(listField.get(i).trim()) == null) { if (i == 0){ List timeList = new ArrayList<>(); long timestamp = convertToTimestamp(item.get(i), timeFormat); timeList.add(timestamp); map.put(listField.get(i).trim(),timeList); - }else if (i == 1 || i == 2){ + } + else if (i == 1 || i == 2){ continue; } else { @@ -139,10 +140,11 @@ public class PlcLogsServiceImpl implements PlcLogService { } } else { - List valueList = map.get(listField.get(i)); + List valueList = map.get(listField.get(i).trim()); if (i == 0){ valueList.add(convertToTimestamp(item.get(i),timeFormat)); - } else if (i == 1 || i == 2) { + } + else if (i == 1 || i == 2) { continue; } else { valueList.add(Double.valueOf(item.get(i)));