报表 相关

xufenglei

2018-02-05 2c90ca6754397903904ca8efabb4c9c93889b970

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

   }



   /**