feat:增加导出列装置名称

haikang
郭承 8 months ago
parent 411a933131
commit 0c71c7ea3a

@ -134,6 +134,9 @@ public class ReportServiceImpl implements ReportService {
head.add("主设备名称");
heads.add(head);
head = new ArrayList<>();
head.add("装置名称");
heads.add(head);
head = new ArrayList<>();
head.add("时间");
heads.add(head);
for (ModevTypePoint point : nSensors.get(0).getTypePoints()) {
@ -147,9 +150,10 @@ public class ReportServiceImpl implements ReportService {
for (NSensor nSensor : nSensors) {
List<String> line = new ArrayList<>();
line.add(nSensor.getZsbName());
line.add(nSensor.getName());
HashMap<String, String> lastData = nSensor.getLastData();
if (null != lastData) {
String acquisitionTime = nSensor.getLastData().get("acquisitionTime");
String acquisitionTime = lastData.get("acquisitionTime");
line.add(acquisitionTime);
for (ModevTypePoint typePoint : nSensor.getTypePoints()) {
line.add(lastData.get(typePoint.getField()));

Loading…
Cancel
Save