From 57ac79239ce487db3447345a349296e9493248ce Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 11:02:22 +0800
Subject: [PATCH] 恢复大屏调用接口
---
src/main/java/com/moral/controller/WebController.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 6924c97..6b6bd26 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -205,8 +205,8 @@
* @Date: 2020/10/19
*/
- @GetMapping("fiveMinuteAvgData")
- public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgData(HttpServletRequest request) {
+ @GetMapping("fiveMinuteAvgDataNew")
+ public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgDataNew(HttpServletRequest request) {
//���������������������������regionCode
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
if ((!parameters.containsKey("sensorKey")) || (!parameters.containsKey("regionCode")))
@@ -273,6 +273,64 @@
return new ResultBean<Map<String, Object>>(datasMap);
}
+ @GetMapping("fiveMinuteAvgData")
+ public ResultBean<Map<String, Object>> getSensorFiveMinuteAvgData(HttpServletRequest request) {
+ //���������������������������monitorpointId
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ if ((!parameters.containsKey("sensorKey")) || (!parameters.containsKey("monitorPointId")))
+ return ResultBean.fail("���������null");
+ String sensorKey = (String) parameters.get("sensorKey");
+ Integer monitorPointId = Integer.parseInt((String) parameters.get("monitorPointId"));
+
+ //������monitorpointId������������������������������mac������
+ List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
+ if (ObjectUtils.isEmpty(devices))
+ return ResultBean.fail("���������������������monitorPointId������");
+ List<String> macs = new ArrayList<>();
+ devices.forEach(p -> {
+ macs.add(p.getMac());
+ });
+
+ //���������������mac���������������������������������������������������������
+ Map<String, Object> timeAndYearMonth = getTimeAndYearMonthForFiveMinuteData();
+ String time = (String) timeAndYearMonth.get("time");
+ String yearAndMonth = (String) timeAndYearMonth.get("yearAndMonth");
+ parameters.put("time", time);
+ parameters.put("yearAndMonth", yearAndMonth);
+ parameters.put("macs", macs);
+ List<Map<String, Object>> datas = historyFiveMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);
+
+ //������������������������������������������������������������������������������
+ if (ObjectUtils.isEmpty(datas)) {
+ time = getFiveMinuteAgoTime(time);
+ parameters.put("time", time);
+ datas = historyFiveMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);
+ }
+ datas = insertDeviceInfo(datas, devices);
+
+ //������monitorPointId���������������������
+ List<Map<String, Object>> coordinate = new ArrayList<>();
+ MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);
+ Integer orgId = monitorPoint.getOrganizationId();
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByOrganizationId(orgId);
+ monitorPoints.forEach(value -> {
+ if ("���������".equals(value.getDescription())) {
+ List list = LatLngTransformation.Convert_BD09_To_GCJ02(value.getLatitude(), value.getLongitude());
+ Map<String, Object> controlStation = new HashMap<>();
+ controlStation.put("name", value.getName());
+ controlStation.put("longitude", list.get(0));
+ controlStation.put("latitude", list.get(1));
+ coordinate.add(controlStation);
+ }
+ });
+
+ Map<String, Object> datasMap = new HashMap<>();
+ datasMap.put("coordinate", coordinate);
+ datasMap.put("device", datas);
+
+ return new ResultBean<Map<String, Object>>(datasMap);
+ }
+
@GetMapping("cangzhouMIdGetAllDevice")
public ResultBean<Map<String, Object>> cangzhouMIdGetAllDevice(HttpServletRequest request) {
//���������������������������monitorpointId
--
Gitblit v1.8.0