ZhuDongming
2019-08-09 def4359b55046dfb32d806f3778cf5a813310e7a
src/main/java/com/moral/controller/ScreenController.java
@@ -362,6 +362,16 @@
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        return historyMinutelyService.getDayAQIByDevice(parameters);
    }
    @GetMapping("hour-aqi")
    @ApiOperation(value = "获取一小时AQI", notes = "获取一小时AQI")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "mac", value = "设备mac地址", required = true, paramType = "query", dataType = "String")
    })
    public Map<String, Object> getHourAQIByDevice(HttpServletRequest request) {
       Map<String, Object> parameters = getParametersStartingWith(request, null);
       return historyService.gitHourlyAQIByMacAndTimeslot(parameters);
    }
    /**
     * Gets the average by all. 获取某账号某区域10分钟前到5分钟前所有传感器平均数值排名
@@ -851,7 +861,9 @@
            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "登录账号的组织id", required = true, paramType = "query", dataType = "Integer"),
            @ApiImplicitParam(name = "time", defaultValue = "2019", value = "查询的时间", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "sensorKey", defaultValue = "e27", value = "查询的监测因子的key", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "区域码", required = true, paramType = "query", dataType = "String")})
            @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "区域码", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "monitorPointId", value = "监测点id", required = false, paramType = "query", dataType = "int"),
            @ApiImplicitParam(name = "mac", value = "设备mac", required = false, paramType = "query", dataType = "String")})
    public ResultBean<List<Map<String, Object>>> getemissionsData(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);
@@ -973,6 +985,50 @@
        List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
        return new ResultBean<List<Map<String, Object>>>(map);
    }
    @GetMapping("getSensorByDeviceId")
   @ApiOperation(value = "通过设备获取因子", notes = "通过设备获取因子")
   @ApiImplicitParams(value = {
         @ApiImplicitParam(name = "id", value = "设备id", required = true, paramType = "query", dataType = "String")
   })
   public ResultBean<List<Map<String, Object>>> getSensorByDeviceId(HttpServletRequest request) throws Exception {
      Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
      String id = (String) parameters.get("id");
      List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id);
      Map<String,Object> map = list.get(0);
      String monitor_point_id = map.get("monitor_point_id").toString();
      List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
      System.out.println(sensorUnitList);
      for (Map<String, Object> sensorMap : list) {
         for (Map<String, Object> sensorUnitMap : sensorUnitList) {
            if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
               sensorMap.put("unit", sensorUnitMap.get("name"));
            }
         }
      }
      return new ResultBean<List<Map<String, Object>>>(list);
   }
   @GetMapping("getSensorWithUnitByMonitorPointId")
   @ApiOperation(value = "通过站点获取因子", notes = "通过站点获取因子")
   @ApiImplicitParams(value = {
         @ApiImplicitParam(name = "monitor_point_id", value = "站点id", required = true, paramType = "query", dataType = "String")
   })
   public ResultBean<List<Map<String, Object>>> getSensorWithUnitByMonitorPointId(HttpServletRequest request) throws Exception {
      Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
      String monitor_point_id = (String) parameters.get("monitor_point_id");
      List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
      List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
      System.out.println(sensorUnitList);
      for (Map<String, Object> sensorMap : list) {
         for (Map<String, Object> sensorUnitMap : sensorUnitList) {
            if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
               sensorMap.put("unit", sensorUnitMap.get("name"));
            }
         }
      }
      return new ResultBean<List<Map<String, Object>>>(list);
   }
    @GetMapping("AIForecast")
    @ApiOperation(value = "AI预测", notes = "AI预测")
@@ -1134,4 +1190,25 @@
        }
    }
    @GetMapping("/getSensors")
    @ApiOperation(value = "查询无人机因子", notes = "查询无人机因子")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "mac", value = "设备mac(格式:p5dnd7a0392068)", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "startTime", value = "开始时间(格式:2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "endTime", value = "结束时间(格式:2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String")
    })
    public ResultBean getSensors(HttpServletRequest request) throws Exception{
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        String mac = parameters.get("mac").toString();
        if (mac != null && mac.length() != 0) {
            List<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters);
            if(sensorList.size()==0){
                return new ResultBean("查询不到数据",1);
            }else{
                return new ResultBean("查询到数据",0);
            }
        }
        return null;
    }
}