add轨迹信息显示按秒级显示,update轨迹数据先从history表查询,update报表单位问题

ZhuDongming

2020-05-11 1babbf1c0b2bc8d27f2874c85369e394b545594a

 src/main/java/com/moral/service/impl/SensorServiceImpl.java

@@ -200,7 +200,11 @@
                Map<String, Object> data = new LinkedHashMap<>();
                for (Map.Entry<String, Object> kv : list.get(j).entrySet()) {
                    if ("monitorPointName".equals(kv.getKey())) {
                        data.put("站点名称(单位:" + sensorInfos.get(2).get(i) + ")", kv.getValue());
                        if ("null".equals(sensorInfos.get(2).get(i))) {
                            data.put("站点名称(单位:)", kv.getValue());
                        } else {
                            data.put("站点名称(单位:" + sensorInfos.get(2).get(i) + ")", kv.getValue());
                        }
                    } else if ("name".equals(kv.getKey())) {
                        data.put("设备名称", kv.getValue());
                    } else {