jinpengyong
2020-06-22 f3a83f291df05ee8de20fd751e720ac761f8586e
src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -555,14 +555,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;
    }