update 污染传播接口

ZhuDongming

2019-09-03 fa7229d6571a73e5691a21f7b4052d681cca8317

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

@@ -1232,12 +1232,9 @@
        String time = YearAndDay + " " + Hour + ":00:00";

        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

        LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);

        System.out.println(timeLocalDateTime);

        int month = timeLocalDateTime.getMonth().getValue();

        Point dirPoint = historyHourlyService.getDirPoint(parameters);

        Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceData(parameters);

        System.out.println(dirPoint.toString());

        System.out.println("getPollutionSourceData:" + getPollutionSourceData);

        String mac = parameters.get("mac").toString();

        Device device = deviceService.getDeviceByMac(mac, false);

        JSONObject params = new JSONObject();

@@ -1271,8 +1268,8 @@
        Map<String, Object> hourAqi = historyService.gitHourlyAQIByMonitorPointIdAndTimeslot(parameters);

        System.out.println("hourAqi:"+hourAqi);

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

        returnMap.put("站点AQI", hourAqi.get("AQI"));

        returnMap.put("国控AQI", StateControl.get("AQI"));

        returnMap.put("MonitorPointAQI", hourAqi.get("AQI"));

        returnMap.put("StateControlAQI", StateControl.get("AQI"));

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

    }

    

@@ -1290,7 +1287,14 @@
      Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);

      //通过组织id来获取站点和设备信息

      account.put("sensor", sensor);

      List<Map<String, Object>> returnList = historyService.getMointorPointRankByOrganizationId(account);

      List<Map<String, Object>> rankList = historyService.getMointorPointRankByOrganizationId(account);

      List<Map<String, Object>> returnList = new ArrayList<>();

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

         boolean contains = map.containsKey("sensor");

         if (contains) {

            returnList.add(map);

         }

      }

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

   }