From b28a5002a58d8d0b37082da12e5b218f0951de47 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 04 Dec 2017 16:46:44 +0800
Subject: [PATCH] 更新

---
 src/main/java/com/moral/controller/ReportController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 73c0897..5b782d0 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -2,17 +2,17 @@
 
 import static com.moral.common.util.ExportExcelUtils.exportData;
 import static com.moral.common.util.WebUtils.getParametersStartingWith;
+import static org.springframework.util.ObjectUtils.isEmpty;
 
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import static org.springframework.util.ObjectUtils.*;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,10 +27,10 @@
 @CrossOrigin(origins = "*", maxAge = 3600)
 public class ReportController {
 
-	@Autowired
+	@Resource
 	private HistoryService historyService;
 	
-	@Autowired
+	@Resource
 	private DeviceService deviceService;
 
 	@GetMapping("sensors-average")

--
Gitblit v1.8.0