更新

xufenglei

2017-12-04 b28a5002a58d8d0b37082da12e5b218f0951de47

 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")