From 1097d9b75533cd4686bc24cb06ed98010fcfcecf Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 29 Aug 2018 14:40:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/ScreenController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 48888a9..0321c19 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -106,6 +106,10 @@
private OrganizationService organizationService;
@Resource
private DictionaryDataService dictionaryDataService;
+
+ @Resource
+ private WeatherService weatherService;
+
/**
* Screen login. ������������
*
@@ -547,7 +551,8 @@
@GetMapping("report_alarm_datas")
public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- parameters.put("type", "month");
+ ParameterUtils.getTimeType4Time(parameters);
+ //parameters.put("type", "month");
String sensorKey = "list";
if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
parameters.put("description", "description");
@@ -698,4 +703,29 @@
result.put("device",deviceSummary);
return new ResultBean<>(result);
}
+
+ @GetMapping("weather")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<Map<String, Object>> getWeatherDataByRegion(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Map<String, Object> map = weatherService.getWeatherDataByRegion(parameters);
+ return new ResultBean<Map<String,Object>>(map);
+ }
+
+ @GetMapping("actual")
+ @ApiOperation(value = "���������������������������������", notes = "���������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "accountId",defaultValue = "1", value = "���������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensorKey",defaultValue = "e1,e2,e3", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "time",defaultValue = "", value = "������(long���������������)", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "interval",defaultValue = "30", value = "���������������������", required = true, paramType = "query", dataType = "Integer"),
+ })
+ public ResultBean<Map<String, Object>> getActualDataByRegion(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Map<String, Object> map = historyService.getActualDataByRegion(parameters);
+ return new ResultBean<Map<String, Object>>(map);
+ }
}
--
Gitblit v1.8.0