From 30d1267479ad9cb076cb2692befc6fe3a53fa7d9 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 25 Jul 2019 16:04:19 +0800
Subject: [PATCH] 删选监控站点和设备的因子
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 10 +++++
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 17 --------
src/main/resources/mapper/SensorMapper.xml | 16 ++++++++
src/main/java/com/moral/service/SensorService.java | 4 ++
src/main/java/com/moral/mapper/SensorMapper.java | 3 +
src/main/java/com/moral/controller/ScreenController.java | 44 ++++++++++++++++++++++
6 files changed, 77 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 43d6ef5..0b1580d 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -973,6 +973,50 @@
List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
return new ResultBean<List<Map<String, Object>>>(map);
}
+
+ @GetMapping("getSensorByDeviceId")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Map<String, Object>>> getSensorByDeviceId(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String id = (String) parameters.get("id");
+ List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id);
+ Map<String,Object> map = list.get(0);
+ String monitor_point_id = map.get("monitor_point_id").toString();
+ List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
+ System.out.println(sensorUnitList);
+ for (Map<String, Object> sensorMap : list) {
+ for (Map<String, Object> sensorUnitMap : sensorUnitList) {
+ if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
+ sensorMap.put("unit", sensorUnitMap.get("name"));
+ }
+ }
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
+
+ @GetMapping("getSensorWithUnitByMonitorPointId")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitor_point_id", value = "������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Map<String, Object>>> getSensorWithUnitByMonitorPointId(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ 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);
+ for (Map<String, Object> sensorMap : list) {
+ for (Map<String, Object> sensorUnitMap : sensorUnitList) {
+ if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
+ sensorMap.put("unit", sensorUnitMap.get("name"));
+ }
+ }
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
@GetMapping("AIForecast")
@ApiOperation(value = "AI������", notes = "AI������")
diff --git a/src/main/java/com/moral/mapper/SensorMapper.java b/src/main/java/com/moral/mapper/SensorMapper.java
index 6fb9682..bce715d 100644
--- a/src/main/java/com/moral/mapper/SensorMapper.java
+++ b/src/main/java/com/moral/mapper/SensorMapper.java
@@ -21,5 +21,8 @@
List<Sensor> getSensorsByCriteria(Map<String, Object> parameters);
Map<String,Object> getSensorBySensorKey(@Param("sensor_key")String sensor_key);
+
+ List<Map<String,Object>> getSensorByDeviceId(@Param("id")String id);
+ List<Map<String,Object>> getSensorByMonitorPointId(@Param("monitor_point_id")String monitor_point_id);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/SensorService.java b/src/main/java/com/moral/service/SensorService.java
index 1eb869d..0b567a8 100644
--- a/src/main/java/com/moral/service/SensorService.java
+++ b/src/main/java/com/moral/service/SensorService.java
@@ -27,4 +27,8 @@
public List<Sensor> getAllSensors();
Map<String, Object> getSensorBySensorKey(String SensorKey);
+
+ List<Map<String,Object>> getSensorByDeviceId(String id);
+
+ List<Map<String,Object>> getSensorByMonitorPointId(String monitor_point_id);
}
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index fc9b469..fc73e49 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -89,4 +89,14 @@
Map<String, Object> map = sensorMapper.getSensorBySensorKey(sensorKey);
return map;
}
+ @Override
+ public List<Map<String, Object>> getSensorByDeviceId(String id) {
+ List<Map<String,Object>> list = sensorMapper.getSensorByDeviceId(id);
+ return list;
+ }
+ @Override
+ public List<Map<String, Object>> getSensorByMonitorPointId(String monitor_point_id) {
+ List<Map<String,Object>> list = sensorMapper.getSensorByMonitorPointId(monitor_point_id);
+ return list;
+ }
}
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index 7f72281..2d8b897 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -132,23 +132,6 @@
@Override
public List<Map<String, Object>> getSensorsByMonitPointId2(String id) {
List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
- /*if (list!=null && !list.isEmpty()) {
- Map<String, Object> innerMap = new HashMap<>();
- Map<String, Map<String, Object>> sensorUnitMap = new HashMap<>();
- for(Map<String, Object> sensorMap : list) {
- innerMap.put("unit", sensorMap.get("unit"));
- innerMap.put("name", sensorMap.get("name"));
- innerMap.put("rules", sensorMap.get("rules"));
- String sensor_key = (String) sensorMap.get("sensor_key");
- String name = (String) sensorMap.get("name");
- sensorUnitMap.put(sensor_key, innerMap);
- }
- System.out.println(sensorUnitMap);
- return sensorUnitMap;
- } else {
- Map<String, Map<String, Object>> sensorUnitMap = null;
- return sensorUnitMap;
- }*/
return list;
}
}
diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index ecfc2a0..4dfc9d8 100644
--- a/src/main/resources/mapper/SensorMapper.xml
+++ b/src/main/resources/mapper/SensorMapper.xml
@@ -128,4 +128,20 @@
FROM sensor
WHERE sensor_key = #{sensor_key}
</select>
+
+ <select id="getSensorByDeviceId" resultType="java.util.Map">
+ SELECT DISTINCT d.id,d.monitor_point_id,s.*
+ 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
+ AND d.id = #{id}
+ </select>
+
+ <select id="getSensorByMonitorPointId" resultType="java.util.Map">
+ SELECT DISTINCT s.*
+ 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
+ AND d.monitor_point_id = #{monitor_point_id}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0