被动刷新改为主动刷新
This commit is contained in:
parent
7fff4fce72
commit
242412d395
|
@ -77,9 +77,9 @@ public class DeviceController extends BaseController {
|
||||||
query.setScope(true);
|
query.setScope(true);
|
||||||
query.addAreaPermission(AreaJoinPermission.DEVICE_VIEW.getCode());
|
query.addAreaPermission(AreaJoinPermission.DEVICE_VIEW.getCode());
|
||||||
List<DeviceVO> list = deviceService.selectDeviceList(query);
|
List<DeviceVO> list = deviceService.selectDeviceList(query);
|
||||||
if (query.getRefresh() != null && query.getRefresh()) {
|
// if (query.getRefresh() != null && query.getRefresh()) {
|
||||||
deviceIotService.refresh(list, IotConstants.ONLINE_TYPE_COMMAND);
|
// deviceIotService.refresh(list, IotConstants.ONLINE_TYPE_COMMAND);
|
||||||
}
|
// }
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,9 +95,9 @@ public class DeviceController extends BaseController {
|
||||||
query.setScope(true);
|
query.setScope(true);
|
||||||
query.addAreaPermission(AreaJoinPermission.DEVICE_VIEW.getCode());
|
query.addAreaPermission(AreaJoinPermission.DEVICE_VIEW.getCode());
|
||||||
List<DeviceVO> list = deviceService.selectDeviceList(query);
|
List<DeviceVO> list = deviceService.selectDeviceList(query);
|
||||||
if (query.getRefresh() != null && query.getRefresh()) {
|
// if (query.getRefresh() != null && query.getRefresh()) {
|
||||||
deviceIotService.refresh(list, IotConstants.ONLINE_TYPE_COMMAND);
|
// deviceIotService.refresh(list, IotConstants.ONLINE_TYPE_COMMAND);
|
||||||
}
|
// }
|
||||||
return success(list);
|
return success(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -125,9 +125,9 @@ public class DeviceController extends BaseController {
|
||||||
@RequestParam(required = false, defaultValue = "false") Boolean refresh) {
|
@RequestParam(required = false, defaultValue = "false") Boolean refresh) {
|
||||||
DeviceVO device = deviceService.selectDevice(id, sn, true, AreaJoinPermission.DEVICE_VIEW);
|
DeviceVO device = deviceService.selectDevice(id, sn, true, AreaJoinPermission.DEVICE_VIEW);
|
||||||
|
|
||||||
if (refresh) {
|
// if (refresh) {
|
||||||
deviceIotService.refresh(device, IotConstants.ONLINE_TYPE_COMMAND);
|
// deviceIotService.refresh(device, IotConstants.ONLINE_TYPE_COMMAND);
|
||||||
}
|
// }
|
||||||
|
|
||||||
return success(device);
|
return success(device);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user