Merge remote-tracking branch 'origin/master'

沈斌

2018-01-30 b4cabe178f1a36433270c79048beecfab0edc487

 src/main/java/com/moral/controller/ScreenController.java

@@ -29,6 +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.DeviceService;

import com.moral.service.HistoryService;

import com.moral.service.MachineActivateService;

@@ -52,7 +53,10 @@
   /** The device service. */

   @Resource

   private DeviceService deviceService;

	


   @Resource

   private DataService dataService;



   @Resource

   private MachineActivateService machineActivateService;



@@ -154,7 +158,7 @@
   @GetMapping("day-aqi")

   public Map<String, Object> getDayAQIByDevice(HttpServletRequest request) {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      return historyService.getDayAQIByDevice(parameters);

      return dataService.getDayAQIByDevice(parameters);

   }



   /**