From a73c63037e6a5276ce6442873afc627e8cb2c9b0 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 18 Oct 2019 14:46:42 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 5733c13..2fa0196 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1030,10 +1030,11 @@
String monitor_point_id = (String) parameters.get("monitor_point_id");
List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
- System.out.println(sensorUnitList);
+ System.out.println("list:"+list);
+ System.out.println("sensorUnitList:"+sensorUnitList);
for (Map<String, Object> sensorMap : list) {
for (Map<String, Object> sensorUnitMap : sensorUnitList) {
- if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
+ if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {
sensorMap.put("unit", sensorUnitMap.get("name"));
}
}
--
Gitblit v1.8.0