From 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:13:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/ScreenController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index d02d6d6..e0ef646 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -599,7 +599,7 @@
} else {
MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));
- List<DeviceVersion> versionList = deviceVersionService.queryByOrgId(monitorPoint.getOrganizationId());
+ List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());
if(versionList.size() > 0) {
List<Integer> versionNolist = versionList.stream().map(item -> {
return item.getVersion();
@@ -610,10 +610,10 @@
}
}
}
- if(rtdLayout.getDefaultMonitorItems().size() == 0 ) {
+ if(rtdLayout!=null && rtdLayout.getDefaultMonitorItems().size() == 0 ) {
rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());
}
- return new ResultBean(rtdLayout);
+ return new ResultBean(rtdLayout == null? new RealTimeDeviceLayout():rtdLayout);
}
@GetMapping("report_avg_data")
--
Gitblit v1.8.0