From 782e84d68779471c0640584678d4c4df3afa80a2 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 14 Dec 2020 17:29:08 +0800
Subject: [PATCH] 电子屏
---
src/main/java/com/moral/controller/WebController.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index d346ece..d008ceb 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -64,6 +64,8 @@
OrganizationSensorsService organizationSensorsService;
@Resource
MapPathService mapPathService;
+ @Resource
+ HistoryService historyService;
@GetMapping("test")
@@ -222,7 +224,7 @@
String accountId = WebTokenUtils.getIdBytoken(token);
Account account = accountService.getAccountById(Integer.parseInt(accountId));
parameters.put("organizationId", account.getOrganizationId());
- List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByRegionAndOrgId(parameters);
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegionNew(parameters);
if (ObjectUtils.isEmpty(monitorPoints))
return ResultBean.fail("������������������������������");
@@ -493,6 +495,13 @@
return new ResultBean<>(mapPath);
}
+ /**
+ * @Description: ������������������������
+ * @Param: [request]
+ * @return: com.moral.common.bean.ResultBean<java.util.List<com.moral.entity.MonitorPoint>>
+ * @Author: ������������
+ * @Date: 2020/12/8
+ */
@UserLoginToken
@GetMapping("monitor-points")
public ResultBean<List<MonitorPoint>> getmMnitorPoints(HttpServletRequest request) {
@@ -510,6 +519,41 @@
/**
+ * @Description: ���������������������������������������������������
+ * @Param: [datas, devices]
+ * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+ * @Author: ������������
+ * @Date: 2020/12/8
+ */
+ @UserLoginToken
+ @GetMapping("sensor-monthAvg")
+ public ResultBean<Map<String, Object>> getSensorMonthAvgByMac(HttpServletRequest request){
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ if ((!parameters.containsKey("mac"))||(!parameters.containsKey("macKey")))
+ return ResultBean.fail("���������null");
+ Map<String, Object> result = historyMinutelyService.getAverageBySensor(parameters);
+ return new ResultBean<Map<String, Object>>(result);
+ }
+
+ /**
+ * @Description: ���������������������������������AQI
+ * @Param: [request]
+ * @return: com.moral.common.bean.ResultBean<java.util.Map<java.lang.String,java.lang.Object>>
+ * @Author: ������������
+ * @Date: 2020/12/8
+ */
+ @UserLoginToken
+ @GetMapping("hourly-aqi")
+ public ResultBean<Map<String, Object>> getHourlyAQI(HttpServletRequest request){
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ if (!parameters.containsKey("mac"))
+ return ResultBean.fail("���������null");
+ Map<String, Object> result = historyService.gitHourlyAQIByMacAndTimeslot(parameters);
+ return new ResultBean<Map<String, Object>>(result);
+ }
+
+
+ /**
* @Description: ���������������������������������������state
* @Param: [datas, devices]
* @Author: ������������
--
Gitblit v1.8.0