From f0b5148973e9437f3651153e53f8f336c4c3c6ff Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/WebController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 71f880f..2bd5e3c 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -248,7 +248,7 @@
*/
@GetMapping("fiveMinuteAvgData")
- public ResultBean<List<Map<String, Object>>> getSensorFiveMinuteAvgData(HttpServletRequest request) {
+ public ResultBean<Map<String,Object>> getSensorFiveMinuteAvgData(HttpServletRequest request) {
//���������������������������monitorpointId
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
if ((!parameters.containsKey("sensorKey")) || (!parameters.containsKey("monitorPointId")))
@@ -280,12 +280,38 @@
parameters.put("time", time);
datas = historyFiveMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);
}
-
datas = insertDeviceInfo(datas, devices);
- return new ResultBean<List<Map<String, Object>>>(datas);
+ //������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);
}
+ /**
+ * @Description: ������mac���������������������������������������������������������������������������������
+ * @Param: [request]
+ * @return: com.moral.common.bean.ResultBean<java.util.Map<java.lang.String,java.lang.Object>>
+ * @Author: ������������
+ * @Date: 2020/10/22
+ */
@GetMapping("fiveMinuteAvgDataByMac")
public ResultBean<Map<String, Object>> fiveMinuteAvgDataByMac(HttpServletRequest request) {
//���������������mac���
@@ -334,7 +360,7 @@
});
//������������������
- Map<String, Object> sortDatas = new LinkedHashMap<>();
+ Map<String, Object> sortDatas = new LinkedHashMap<>();//���������������������������������������
Device device = deviceService.getDeviceByMac(mac, true);
sortDatas.put("������", device.getName());
--
Gitblit v1.8.0