From 59d80f82ef195f03b714fa0e9aec5d21d119c335 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Mon, 11 Dec 2017 14:37:30 +0800 Subject: [PATCH] 接口 增加校验 --- src/main/java/com/moral/controller/ScreenController.java | 45 ++++++--------------------------------------- 1 files changed, 6 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 0da945c..a140d21 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -4,7 +4,6 @@ import static com.moral.common.util.RedisUtil.hasKey; import static com.moral.common.util.ResourceUtil.getValue; import static com.moral.common.util.WebUtils.getParametersStartingWith; -import static org.springframework.util.ObjectUtils.isEmpty; import java.io.IOException; import java.io.InputStreamReader; @@ -26,7 +25,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONReader; import com.alibaba.fastjson.TypeReference; -import com.moral.common.exception.BusinessException; import com.moral.common.util.ValidateUtil; import com.moral.service.AccountService; import com.moral.service.DeviceService; @@ -93,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); } /** @@ -138,8 +130,8 @@ */ @GetMapping("sensor-standard") public Map<String, Object> getStandardBySensor(@RequestParam("macKey") String macKey) { + ValidateUtil.notEmpty(macKey, "param.is.null"); Map<String, Object> result = new HashMap<String, Object>(); - ValidateUtil.notEmpty(macKey, "���������������������"); result.put("standard", getValue(macKey + "-standard")); return result; } @@ -153,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); } /** @@ -172,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); } /** @@ -191,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); } /** @@ -211,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); } } -- Gitblit v1.8.0