From e786ed5d01635555dac37c69003bdbbf757d69d8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 18 Nov 2020 17:46:21 +0800
Subject: [PATCH] 从history获取数据接口更新为从history日表获取
---
src/main/java/com/moral/controller/ScreenController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 3fa1e6e..dd33e5f 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -2072,7 +2072,7 @@
} else {
mon = "" + month;
}
- String table = "history_minutely_" + year + mon;
+ String table = "history_five_minutely_" + year + mon;
List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, table);
return list;
}
@@ -2093,7 +2093,7 @@
} else {
mon = "" + month;
}
- String table = "history_minutely_" + year + mon;
+ String table = "history_five_minutely_" + year + mon;
List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, table);
return list;
}
@@ -2693,7 +2693,7 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "monitorPointIds", value = "������monitorid", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "time", value = "������(���������2020-03-19)", required = true, paramType = "query", dataType = "String")})
- public List<List<Map>> monitorAVGData(HttpServletRequest request) throws Exception {
+ public ResultBean<List<List<Map>>> monitorAVGData(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
String monitorPointIds = (String) parameters.get("monitorPointIds");
String time = (String) parameters.get("time");
@@ -2718,6 +2718,6 @@
lists.add(dataAvbByMIdAndTime);
}
}
- return lists;
+ return new ResultBean<List<List<Map>>>(lists);
}
}
--
Gitblit v1.8.0