fengxiang
2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28
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")