ZhuDongming
2019-08-05 60be667ecb355f7b7fca6e95f9c1d2b73fe4bb24
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -41,6 +41,7 @@
import com.moral.common.util.ParameterUtils;
import com.moral.common.util.ReportTimeFormat;
import com.moral.common.util.ResourceUtil;
import com.moral.common.util.StringUtils;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Sensor;
import com.moral.entity.charts.DataCondition;
@@ -546,10 +547,14 @@
                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()));
                            }else{
                            new_map.put(sensor.getDescription(), map.get(key));
                        }
                    }
                }
                }
                new_map.put("时间", map.get("uavDate"));
                listMapNew.add(new_map);
                new_map = new LinkedHashMap<>();