接口 增加校验

xufenglei

2017-12-11 59d80f82ef195f03b714fa0e9aec5d21d119c335

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

@@ -91,14 +91,8 @@
    */

   @GetMapping("equipment-state")

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

      Map<String, Object> result = new LinkedHashMap<String, Object>();

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

      if (!parameters.containsKey("accountId")) {

         result.put("msg", "参数不能为空！");

      } else {

         result = deviceService.getDeviceStatesByAccount(parameters);

      }

      return result;

      return deviceService.getDeviceStatesByAccount(parameters);

   }



   /**

@@ -151,14 +145,8 @@
    */

   @GetMapping("day-aqi")

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

      Map<String, Object> result = new HashMap<String, Object>();

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

      if (!parameters.containsKey("mac")) {

         result.put("msg", "参数不能为空！");

      } else {

         result = historyService.getDayAQIByDevice(parameters);

      }

      return result;

      return historyService.getDayAQIByDevice(parameters);

   }



   /**

@@ -170,14 +158,8 @@
    */

   @GetMapping("all-average")

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

      Map<String, Object> result = new LinkedHashMap<String, Object>();

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

      if (!(parameters.containsKey("areaCode") && parameters.containsKey("accountId"))) {

         result.put("msg", "参数不能为空！");

      } else {

         result = historyService.getAllSensorAverageByDevice(parameters);

      }

      return result;

      return historyService.getAllSensorAverageByDevice(parameters);

   }



   /**

@@ -189,15 +171,8 @@
    */

   @GetMapping("sensor-average")

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

      Map<String, Object> result = new HashMap<String, Object>();

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

      if (!(parameters.containsKey("areaCode") && parameters.containsKey("accountId")

            && parameters.containsKey("macKey"))) {

         result.put("msg", "参数不能为空！");

      } else {

         result = historyService.getDeviceRankingBySensorAverage(parameters);

      }

      return result;

      return historyService.getDeviceRankingBySensorAverage(parameters);

   }



   /**

@@ -209,14 +184,8 @@
    */

   @GetMapping("month-sensor-average")

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

      Map<String, Object> result = new HashMap<String, Object>();

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

      if (!(parameters.containsKey("mac") && parameters.containsKey("macKey"))) {

         result.put("msg", "参数不能为空！");

      } else {

         result = historyService.getMonthAverageBySensor(parameters);

      }

      return result;

      return historyService.getMonthAverageBySensor(parameters);

   }



}