From 820c6a9e6e0e50f7266b8ccaf9c802a1005bda51 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 11 Jun 2019 17:42:39 +0800
Subject: [PATCH] sensor
---
src/main/java/com/moral/controller/ScreenController.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index e3a4bac..96c1709 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -68,6 +68,8 @@
@Resource
SensorService sensorService;
@Resource
+ SensorUnitService sensorUnitService;
+ @Resource
MonitorPointService monitorPointService;
@Resource
DeviceVersionService deviceVersionService;
@@ -887,5 +889,64 @@
return model;
}
}
+
+ /*@GetMapping("getSensor")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "������MN���", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<Map<String, Object>> getSensor(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String mac = (String) parameters.get("mac");
+ //System.out.println("ScreenController-----getSensor-----mac:"+mac);
+ Map<String, Object> map = sensorUnitService.getSensorByMac(mac);
+ System.out.println("ScreenController-----getSensor-----map:"+map);
+ return new ResultBean<Map<String, Object>>(map);
+ }*/
+
+ @GetMapping("getSensorByMonitorPointId")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitor_point_id", value = "������������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<Map<String, Object>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String monitor_point_id = (String) parameters.get("monitor_point_id");
+ System.out.println("ScreenController-----getSensorByMonitorPointId-----monitor_point_id:"+monitor_point_id);
+ Map<String, Object> map = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
+ System.out.println("ScreenController-----getSensorByMonitorPointId-----map:"+map);
+ return new ResultBean<Map<String, Object>>(map);
+ }
+
+ @GetMapping("AIForecast")
+ @ApiOperation(value = "AI������", notes = "AI������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "monitorPoint", value = "���������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "mac", value = "������mac", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time", value = "������,���(���������2018-03-06)", required = true, paramType = "query", dataType = "String"),
+ })
+ public ResultBean<List<Map<String, Object>>> AIForecast (HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ ParameterUtils.getTimeType4Time(parameters);
+ String monitor_point_id = (String) parameters.get("monitorPoint");
+ parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+ Object sensorKey = parameters.remove("sensorKey");
+ parameters.put("sensors", Arrays.asList(sensorKey));
+ List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+
+ //������������������
+ Map<String, Object> sensorMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
+
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ time = time.substring(time.length() - 2);
+ map.put("time", Integer.valueOf(time));
+ map.put("value", map.remove(sensorKey));
+ }
+
+ return null;
+ //return new ResultBean<List<Map<String, Object>>>(result);
+ }
}
--
Gitblit v1.8.0