ZhuDongming
2019-08-05 f219f570fb3d6a2b4626ea94d3fca04835773cd7
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;
@@ -543,14 +544,18 @@
        Map<String, Object> new_map = new LinkedHashMap<>();
        if (CollectionUtils.isNotEmpty(listMap)) {
            for (Map<String, Object> map : listMap) {
                new_map.put("时间", map.get("uavDate"));
                for (String key : map.keySet()) {
                    for (Sensor sensor : sensors) {
                        if (sensor.getSensorKey().equals(key)) {
                            new_map.put(sensor.getDescription(), map.get(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<>();
            }