ZhuDongming
2019-10-18 a73c63037e6a5276ce6442873afc627e8cb2c9b0
src/main/java/com/moral/controller/ScreenController.java
@@ -1030,10 +1030,11 @@
        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);
        System.out.println("list:"+list);
        System.out.println("sensorUnitList:"+sensorUnitList);
        for (Map<String, Object> sensorMap : list) {
            for (Map<String, Object> sensorUnitMap : sensorUnitList) {
                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {
                    sensorMap.put("unit", sensorUnitMap.get("name"));
                }
            }
@@ -1057,14 +1058,12 @@
        Date date = new SimpleDateFormat("yy-MM-dd").parse(intoTime);
        DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd");
        String alterTime = df1.format(date.getTime()-15*24*60*60*1000);
        System.out.println("startTime:"+alterTime);
        parameters.put("time", alterTime);
        ParameterUtils.getTimeType4Time(parameters);
        String monitor_point_id = (String) parameters.get("monitorPoint");
        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
        String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
        parameters.put("sensors", Arrays.asList(sensorKeys));
        // monitorPointService.isCompensateCalculation(parameters);
        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
        Map<String, Object> mpMap = new HashMap<>();
@@ -1074,8 +1073,18 @@
        weatherParameters.put("organizationId", mpMap.get("organization_id"));
        weatherParameters.put("time", intoTime);
        //获取天气信息
        Map<String, Object> weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);
        Map<String, Object> tempMap = TempAllocationUtils.tempAllocation(weatherMap);
        Map<String, Object> weatherMap = new HashMap<>();
        Map<String, Object> tempMap = new HashMap<>();
        Boolean tf = false;
        for(int i=0;i<sensorKeys.length;i++) {
           if(sensorKeys[i].equals("e7")) {
              tf = true;
           }
        }
        if (tf) {
            weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);
            tempMap = TempAllocationUtils.tempAllocation(weatherMap);
      }
        //获取单位信息
        Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
@@ -1083,7 +1092,9 @@
            String time = map.get("time").toString();
            time = time.substring(time.length() - 2);
            map.put("time", Integer.valueOf(time));
            map.put("temp", tempMap.get(map.get("time").toString()));
            if (tempMap!=null) {
               map.put("temp", tempMap.get(map.get("time").toString()));
         }
            List<Number> values = new ArrayList<Number>();
            List<String> units = new ArrayList<String>();
            for (String string : sensorKeys) {