增加 监控站查询接口

fengxiang

2018-08-14 120b501b7d42daf8b9432d84762feb8d730431b7

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

@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletRequest;



import com.alibaba.fastjson.*;

import com.moral.common.util.ParameterUtils;

import com.moral.common.util.StringUtils;

import com.moral.entity.*;

import com.moral.entity.alarm.AlarmConfig;

@@ -528,17 +529,10 @@
   @GetMapping("report_avg_datas")

   public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception {

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

      int length = ((String)parameters.get("time")).split("-").length;

      if (length == 2) {

         parameters.put("type", "month");

      } else if (length == 3){

         parameters.put("type", "day");

      }

      ParameterUtils.getTimeType4Time(parameters);

      parameters.put("monitorPointId", parameters.remove("monitorPoint"));

      String sensorKey = parameters.remove("sensorKey").toString();

      List<String> sensorKeys = new ArrayList<String>();

      sensorKeys.add(sensorKey);

      parameters.put("sensors", sensorKeys);

      Object sensorKey = parameters.remove("sensorKey");

      parameters.put("sensors", Arrays.asList(sensorKey));

      List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

      

      for (Map<String, Object> map : list) {

@@ -652,12 +646,7 @@
   })

   public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request) throws Exception {

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

      int length = ((String)parameters.get("time")).split("-").length;

      if (length == 2) {

         parameters.put("type", "month");

      } else if (length == 3){

         parameters.put("type", "day");

      }

      ParameterUtils.getTimeType4Time(parameters);

      parameters.put("monitorPointId", parameters.remove("monitorPoint"));

      String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");

      parameters.put("sensors", Arrays.asList(sensorKeys));

@@ -675,5 +664,13 @@
      }

      return new ResultBean<List<Map<String, Object>>>(list);

   }



   @GetMapping("getmpoint-byid")

   @ApiOperation(value = "获取监测站数据", notes = "获取监测站数据,保证名称坐标等等")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "monitorPointId",defaultValue = "1",value = "监控站id", required = true, paramType = "query", dataType = "Integer"),

   })

    public ResultBean<MonitorPoint> getMonitorPointById(Integer monitorPointId){

      MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(monitorPointId);

      return new ResultBean<>(monitorPoint);

   }

}