| | |
|---|
| | |
|
|---|
| | | } 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();
|
|---|
| | |
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | 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")
|
|---|
