ZhuDongming
2019-08-16 0eed861612485a8559379811c0eedf12ad6542a6
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -573,11 +573,7 @@
                for (String key : map.keySet()) {
                    for (Sensor sensor : sensors) {
                        if (sensor.getSensorKey().equals(key)) {
                            if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){
                                new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString())+sensor.getUnit());
                            }else{
                                new_map.put(sensor.getDescription(), map.get(key)+sensor.getUnit());
                            }
                            new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());
                        }
                    }
                }
@@ -617,11 +613,7 @@
                for (String key : map.keySet()) {
                    for (Sensor sensor : sensors) {
                        if (sensor.getSensorKey().equals(key)) {
                            if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){
                                new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString().replace("\"", "")));
                            }else{
                                new_map.put(sensor.getDescription(), map.get(key).toString().replace("\"", ""));
                            }
                            new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
                        }
                    }
                }
@@ -661,11 +653,7 @@
                for (String key : map.keySet()) {
                    for (Sensor sensor : sensors) {
                        if (sensor.getSensorKey().equals(key)) {
                            if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){
                                new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString().replace("\"", "")));
                            }else{
                                new_map.put(sensor.getDescription(), map.get(key).toString().replace("\"", ""));
                            }
                            new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
                        }
                    }
                }