From cc31761e9ccadea2914af450b5414824ba983f38 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Jun 2020 16:58:08 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index 21b15ac..10e414d 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -200,7 +200,11 @@
Map<String, Object> data = new LinkedHashMap<>();
for (Map.Entry<String, Object> kv : list.get(j).entrySet()) {
if ("monitorPointName".equals(kv.getKey())) {
- data.put("������������(������:" + sensorInfos.get(2).get(i) + ")", kv.getValue());
+ if ("null".equals(sensorInfos.get(2).get(i))) {
+ data.put("������������(������:)", kv.getValue());
+ } else {
+ data.put("������������(������:" + sensorInfos.get(2).get(i) + ")", kv.getValue());
+ }
} else if ("name".equals(kv.getKey())) {
data.put("������������", kv.getValue());
} else {
--
Gitblit v1.8.0