From 9f79dd626f3a5096acedcae8d7a919c8910ac240 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 14 Oct 2019 10:08:16 +0800
Subject: [PATCH] 修改单位
---
src/main/resources/mapper/SensorMapper.xml | 2 +-
src/main/java/com/moral/controller/ScreenController.java | 5 +++--
2 files changed, 4 insertions(+), 3 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"));
}
}
diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index d55dab1..ccfa2cf 100644
--- a/src/main/resources/mapper/SensorMapper.xml
+++ b/src/main/resources/mapper/SensorMapper.xml
@@ -138,7 +138,7 @@
</select>
<select id="getSensorByMonitorPointId" resultType="java.util.Map">
- SELECT DISTINCT s.*
+ SELECT DISTINCT s.sensor_key sensorKey,s.unit,s.name,s.description,s.id
FROM device d,device_version dv,device_version_sensor dvs,sensor s
WHERE d.device_version_id = dvs.device_version_id
AND dvs.sensor_id = s.id
--
Gitblit v1.8.0