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)));