优化 大屏数据排名接口

xufenglei

2018-07-02 b6f21e8f50518a54ac49249863f5d140252bca0f

 src/main/java/com/moral/controller/ScreenController.java

@@ -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")