From 9d4cd7bb803ed6516e9f699d41d33032dfa9914e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 02 Jul 2018 10:49:57 +0800
Subject: [PATCH] 获取监控站布局配置。监控站下无设备，返回数组。
---
src/main/java/com/moral/controller/ScreenController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 16dc30f..ee66467 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -609,7 +609,10 @@
}
}
}
- return new ResultBean(rtdLayout);
+ if(rtdLayout!=null && rtdLayout.getDefaultMonitorItems().size() == 0 ) {
+ rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());
+ }
+ return new ResultBean(rtdLayout == null? new RealTimeDeviceLayout():rtdLayout);
}
}
--
Gitblit v1.8.0