diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/PerceptionDeviceController.java b/gather-app/src/main/java/com/ruoyi/business/controller/PerceptionDeviceController.java index c8e4e9a..ad0c25b 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/PerceptionDeviceController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/PerceptionDeviceController.java @@ -66,7 +66,9 @@ public class PerceptionDeviceController extends BaseController { @ApiOperation("人设备列表") public TableDataInfo PeopleList() { startPage(); - List list = devopsDeviceInfoService.lambdaQuery().eq(DevopsDeviceInfo::getDeviceType, 1).list(); + List list = devopsDeviceInfoService.lambdaQuery() + .eq(DevopsDeviceInfo::getParentMonitoringType,1) + .eq(DevopsDeviceInfo::getDeviceType, 1).list(); return getDataTable(list); } @@ -74,7 +76,9 @@ public class PerceptionDeviceController extends BaseController { @ApiOperation("车设备列表") public TableDataInfo VehicleList() { startPage(); - List list = devopsDeviceInfoService.lambdaQuery().eq(DevopsDeviceInfo::getDeviceType, 2).list(); + List list = devopsDeviceInfoService.lambdaQuery() + .eq(DevopsDeviceInfo::getParentMonitoringType,1) + .eq(DevopsDeviceInfo::getDeviceType, 2).list(); return getDataTable(list); }