接口 增加校验

xufenglei

2017-12-11 59d80f82ef195f03b714fa0e9aec5d21d119c335

 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;

@@ -12,11 +11,10 @@
import java.util.LinkedHashMap;

import java.util.Map;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.core.io.Resource;

import org.springframework.data.redis.core.RedisTemplate;

import org.springframework.web.bind.annotation.CrossOrigin;

import org.springframework.web.bind.annotation.GetMapping;

@@ -27,15 +25,13 @@
import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONReader;

import com.alibaba.fastjson.TypeReference;

import com.moral.common.bean.ResultBean;

import com.moral.common.exception.BusinessException;

import com.moral.entity.Account;

import com.moral.common.util.ValidateUtil;

import com.moral.service.AccountService;

import com.moral.service.DeviceService;

import com.moral.service.HistoryService;



/**

 * The Class ScreenController.

 * The Class ScreenController.大屏接口

 */

@RestController

@RequestMapping(value = "screen")

@@ -43,24 +39,24 @@
public class ScreenController {



   /** The screen service. */

   @Autowired

   @Resource

   private HistoryService historyService;



   /** The account service. */

   @Autowired

   @Resource

   private AccountService accountService;



   /** The device service. */

   @Autowired

   @Resource

   private DeviceService deviceService;



   /** The resource. */

   @Value(value = "classpath:system/alarmLevels.json")

   private Resource resource;

   private org.springframework.core.io.Resource resource;



   /** The redis template. */

   @javax.annotation.Resource

   RedisTemplate<String, String> redisTemplate;

   @Resource

   private RedisTemplate<String, String> redisTemplate;



   /** The level key. */

   private String levelKey = "alarm_level_config";

@@ -85,22 +81,6 @@
      return resultMap;

   }



   @GetMapping("login1")

   public ResultBean<Account> screenLogin1(HttpServletRequest request) {

      ResultBean<Account> resultBean = new ResultBean<Account>(ResultBean.FAIL);

      try {

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

         if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {

            resultBean.setMsg("用户名及密码不允许为空！");

         } else {

            resultBean = accountService.screenLogin1(parameters);

         }

      } catch (Exception e) {

         e.printStackTrace();

         resultBean = new ResultBean<Account>(e);

      }

      return resultBean;

   }



   /**

    * Gets the equipment states. 获取该账号下所有设备的状态

@@ -111,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);

   }



   /**

@@ -156,12 +130,9 @@
    */

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

      if (isEmpty(macKey)) {

         throw new BusinessException("参数不能为空！");

      } else {

         result.put("standard", getValue(macKey + "-standard"));

      }

      result.put("standard", getValue(macKey + "-standard"));

      return result;

   }



@@ -174,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);

   }



   /**

@@ -193,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);

   }



   /**

@@ -212,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);

   }



   /**

@@ -232,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);

   }



}