From 8beab91730f3e3cd6b53e4d498f763ff9dc65ef5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:16:55 +0800
Subject: [PATCH] 修改污染溯源接口，从history表中获取改为从history天表获取
---
src/main/java/com/moral/controller/WebController.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index 2bd5e3c..f88d02e 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -305,6 +305,70 @@
return new ResultBean<Map<String,Object>>(datasMap);
}
+ @GetMapping("cangzhouMIdGetAllDevice")
+ public ResultBean<Map<String,Object>> cangzhouMIdGetAllDevice(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"));
+ MonitorPoint mPoint = monitorPointService.queryMonitorPointById(monitorPointId);
+ Integer code = mPoint.getCityCode();
+ List<Device> devices = null;
+ if (code == 130900){
+ devices = deviceService.getDeviceByCode();
+ }else {
+ devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
+ }
+ //������monitorpointId������������������������������mac������
+ 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);
+ }
+
/**
* @Description: ������mac���������������������������������������������������������������������������������
* @Param: [request]
--
Gitblit v1.8.0