From 2c90ca6754397903904ca8efabb4c9c93889b970 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 05 Feb 2018 14:01:31 +0800
Subject: [PATCH] 报表 相关
---
src/main/java/com/moral/controller/ScreenController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 6a1e617..4d1f9e2 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -20,6 +20,7 @@
import org.dom4j.io.SAXReader;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSON;
@@ -28,7 +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.HistoryMinutelyService;
import com.moral.service.DeviceService;
import com.moral.service.HistoryService;
import com.moral.service.MachineActivateService;
@@ -38,8 +39,8 @@
* The Class ScreenController.������������
*/
@RestController
-@RequestMapping("screen")
-@CrossOrigin(origins = "*", maxAge = 3600)
+@RequestMapping("/screen")
+//@CrossOrigin(origins = "*", maxAge = 3600)
public class ScreenController {
/** The screen service. */
@@ -55,7 +56,7 @@
private DeviceService deviceService;
@Resource
- private DataService dataService;
+ private HistoryMinutelyService historyMinutelyService;
@Resource
private MachineActivateService machineActivateService;
@@ -99,7 +100,8 @@
* the request
* @return the equipment states
*/
- @GetMapping("equipment-state")
+ @GetMapping("/equipment-state")
+ @PreAuthorize("hasAnyRole('USER', 'ADMIN')")
public Map<String, Object> getDeviceStatesByAccount(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
return deviceService.getDeviceStatesByAccount(parameters);
@@ -158,7 +160,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