|
|
@ -102,7 +102,7 @@ public class HwMonitorPlatformController extends BaseController {
|
|
|
|
@RequiresPermissions("business:monitor:index")
|
|
|
|
@RequiresPermissions("business:monitor:index")
|
|
|
|
@GetMapping("/getDeviceOperations/{sceneId}")
|
|
|
|
@GetMapping("/getDeviceOperations/{sceneId}")
|
|
|
|
public AjaxResult selectDeviceStatus(@PathVariable("sceneId") Long sceneId) {
|
|
|
|
public AjaxResult selectDeviceStatus(@PathVariable("sceneId") Long sceneId) {
|
|
|
|
System.out.println(("sceneid:" + sceneId));
|
|
|
|
// System.out.println(("sceneid:" + sceneId));
|
|
|
|
return AjaxResult.success(hwDeviceService.getOnlineDevicesCount(sceneId));
|
|
|
|
return AjaxResult.success(hwDeviceService.getOnlineDevicesCount(sceneId));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -280,7 +280,7 @@ public class HwMonitorPlatformController extends BaseController {
|
|
|
|
TdReturnDataVo returnDataVo = hwMonitorPlatformService.getHistoryData(deviceHistoryData);
|
|
|
|
TdReturnDataVo returnDataVo = hwMonitorPlatformService.getHistoryData(deviceHistoryData);
|
|
|
|
if (returnDataVo != null) {
|
|
|
|
if (returnDataVo != null) {
|
|
|
|
List<DeviceDataColumnVo> deviceDataColumnVos = hwMonitorPlatformService.
|
|
|
|
List<DeviceDataColumnVo> deviceDataColumnVos = hwMonitorPlatformService.
|
|
|
|
getDeviceDataColumns(deviceHistoryData.getDeviceModeId(), returnDataVo.getDataList());
|
|
|
|
getDeviceDataColumns(deviceHistoryData.getDeviceModeId());
|
|
|
|
returnObj.put("deviceDataColumns", deviceDataColumnVos);
|
|
|
|
returnObj.put("deviceDataColumns", deviceDataColumnVos);
|
|
|
|
returnObj.put("historyData", returnDataVo);
|
|
|
|
returnObj.put("historyData", returnDataVo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|