From 486428358c6a2252a48630df300873cb4c71a93c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 22:37:45 +0800
Subject: [PATCH] updated
---
src/main/java/com/moral/controller/ScreenController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index ad5b59f..8765b4d 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -29,6 +29,7 @@
import com.moral.common.bean.ResultBean;
import com.moral.common.util.ValidateUtil;
import com.moral.service.AccountService;
+import com.moral.service.DataService;
import com.moral.service.DeviceService;
import com.moral.service.HistoryService;
import com.moral.service.MachineActivateService;
@@ -52,7 +53,10 @@
/** The device service. */
@Resource
private DeviceService deviceService;
-
+
+ @Resource
+ private DataService dataService;
+
@Resource
private MachineActivateService machineActivateService;
@@ -154,7 +158,7 @@
@GetMapping("day-aqi")
public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- return historyService.getDayAQIByDevice(parameters);
+ return dataService.getDayAQIByDevice(parameters);
}
/**
--
Gitblit v1.8.0