From 48bfa4e57cd2195b86bd8c0debe2e241db0ba80d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 05 Feb 2018 14:49:44 +0800
Subject: [PATCH] 报表
---
src/main/java/com/moral/controller/ScreenController.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 6a1e617..3db332a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -5,7 +5,11 @@
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -13,33 +17,38 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.moral.common.xml.Version;
import org.apache.commons.net.ftp.FTPClient;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.xml.sax.InputSource;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONReader;
import com.alibaba.fastjson.TypeReference;
import com.moral.common.bean.ResultBean;
import com.moral.common.util.ValidateUtil;
+import com.moral.common.xml.Version;
import com.moral.service.AccountService;
-import com.moral.service.DataService;
import com.moral.service.DeviceService;
+import com.moral.service.HistoryMinutelyService;
import com.moral.service.HistoryService;
import com.moral.service.MachineActivateService;
-import org.xml.sax.InputSource;
/**
* The Class ScreenController.������������
*/
@RestController
-@RequestMapping("screen")
-@CrossOrigin(origins = "*", maxAge = 3600)
+@RequestMapping("/screen")
+//@CrossOrigin(origins = "*", maxAge = 3600)
public class ScreenController {
/** The screen service. */
@@ -55,7 +64,7 @@
private DeviceService deviceService;
@Resource
- private DataService dataService;
+ private HistoryMinutelyService historyMinutelyService;
@Resource
private MachineActivateService machineActivateService;
@@ -99,7 +108,7 @@
* the request
* @return the equipment states
*/
- @GetMapping("equipment-state")
+ @GetMapping("/equipment-state")
public Map<String, Object> getDeviceStatesByAccount(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
return deviceService.getDeviceStatesByAccount(parameters);
@@ -158,7 +167,7 @@
@GetMapping("day-aqi")
public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- return dataService.getDayAQIByDevice(parameters);
+ return historyMinutelyService.getDayAQIByDevice(parameters);
}
/**
--
Gitblit v1.8.0