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 9d2ea55..92b96b4 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 @@ -119,7 +119,8 @@ public class PerceptionDeviceController extends BaseController { List deviceInfos = devopsDeviceInfoService.lambdaQuery() .eq(DevopsDeviceInfo::getParentMonitoringType, 1) .eq(DevopsDeviceInfo::getDeviceType,1).list(); - List collect = deviceInfos.stream().map(devopsDeviceInfo -> devopsDeviceInfo.getGbsChannelNo()).collect(Collectors.toList()); + List collect = deviceInfos.stream().map(devopsDeviceInfo -> + devopsDeviceInfo.getGbsChannelNo()).collect(Collectors.toList()); // 获取当前日期 LocalDate currentDate = LocalDate.now(); // 创建一个 TreeMap 用于存储每天的数据量 @@ -156,7 +157,8 @@ public class PerceptionDeviceController extends BaseController { List deviceInfos = devopsDeviceInfoService.lambdaQuery() .eq(DevopsDeviceInfo::getParentMonitoringType, 1) .eq(DevopsDeviceInfo::getDeviceType,2).list(); - List collect = deviceInfos.stream().map(devopsDeviceInfo -> devopsDeviceInfo.getGbsChannelNo()).collect(Collectors.toList()); + List collect = deviceInfos.stream().map(devopsDeviceInfo -> + devopsDeviceInfo.getGbsChannelNo()).collect(Collectors.toList()); // 获取当前日期 LocalDate currentDate = LocalDate.now(); // 创建一个 TreeMap 用于存储每天的数据量 diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/DevopsDeviceInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/DevopsDeviceInfoController.java index 8e1decc..5f40f6a 100644 --- a/gather-app/src/main/java/com/ruoyi/database/controller/DevopsDeviceInfoController.java +++ b/gather-app/src/main/java/com/ruoyi/database/controller/DevopsDeviceInfoController.java @@ -4,6 +4,7 @@ package com.ruoyi.database.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.utils.PageUtils; import com.ruoyi.database.domain.DevopsDeviceInfo; import com.ruoyi.database.domain.DevopsDeviceStatus; import com.ruoyi.database.domain.DevopsVideoInfo; @@ -53,7 +54,7 @@ public class DevopsDeviceInfoController extends BaseController { for (DevopsDeviceStatus devopsDeviceStatus : list1) { strings.add(devopsDeviceStatus.getGbsChannelNo()); } - startPage(); + PageUtils.startPage(); QueryWrapper devopsDeviceInfoQueryWrapper = new QueryWrapper<>(); devopsDeviceInfoQueryWrapper.in("gbs_channel_no",strings); devopsDeviceInfoQueryWrapper.eq("device_type",devopsDeviceInfo.getDeviceType());