From 8b59c0bd831149234b7428165501683d72c922a1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 06 Sep 2018 13:26:02 +0800
Subject: [PATCH] 方案助手更新
---
src/main/java/com/moral/controller/ScreenController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 91f21b1..87ca7e3 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -110,6 +110,9 @@
@Resource
private WeatherService weatherService;
+ @Resource
+ private QualityDailyService qualityDailyService;
+
/**
* Screen login. ������������
*
@@ -720,7 +723,7 @@
@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 = "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 {
@@ -736,9 +739,7 @@
})
public ResultBean<Map<String, Object>> getQualityCountDayByRegion(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- //Map<String, Object> map = hangzhouAqiService.getQualityCountDayByRegion(parameters);
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("count", 136);
+ Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);
return new ResultBean<Map<String, Object>>(map);
}
}
--
Gitblit v1.8.0