From 1babbf1c0b2bc8d27f2874c85369e394b545594a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 11 May 2020 11:24:00 +0800
Subject: [PATCH] add轨迹信息显示按秒级显示,update轨迹数据先从history表查询,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