jinpengyong
2020-09-07 8bf855c04a807a9fbca86844bbfc30273d8d383e
src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -383,7 +383,8 @@
            }
            returnMap = AQICalculation.hourlyAQI(AQIMap);
        }
        long aqi = Math.round(Double.valueOf(returnMap.get("AQI").toString()));
        returnMap.put("AQI",aqi);
        return returnMap;
    }
@@ -555,14 +556,16 @@
            for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
                for (Sensor sensor : sensors) {
                    if (sensor.getSensorKey().equals(entry.getKey())) {
                        dataMap.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
                        if (entry.getValue() != null) {
                            dataMap.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
                        }
                    }
                }
            }
        }
        Map<String, Object> map = sensorMapper.getSensorBySensorKey(parameters.get("sensorKey").toString());
        parameters.put("unit",map.get("unit"));
        parameters.put("description",map.get("description"));
        parameters.put("unit", map.get("unit"));
        parameters.put("description", map.get("description"));
        return uavSensorData;
    }
@@ -642,4 +645,10 @@
        }
        return maxList;
    }
    @Override
    public String getJsonData(String mac, String time,String table) {
        return historyMapper.getJsonData(mac,time,table);
    }
}