diff --git a/src/main/java/com/ycwl/basic/device/operator/VptPassiveStorageOperator.java b/src/main/java/com/ycwl/basic/device/operator/VptPassiveStorageOperator.java index 83bb864..f9877d0 100644 --- a/src/main/java/com/ycwl/basic/device/operator/VptPassiveStorageOperator.java +++ b/src/main/java/com/ycwl/basic/device/operator/VptPassiveStorageOperator.java @@ -84,7 +84,8 @@ public class VptPassiveStorageOperator extends ADeviceStorageOperator { if (StringUtils.isNotBlank(config.getDeviceNo())) { task.deviceNo = config.getDeviceNo(); } else { - task.deviceNo = device.getNo2(); + log.warn("设备未配置deviceNo:{}", device); + return Collections.emptyList(); } task.startTime = startDate; task.endTime = endDate; diff --git a/src/main/java/com/ycwl/basic/device/operator/WvpPassiveStorageOperator.java b/src/main/java/com/ycwl/basic/device/operator/WvpPassiveStorageOperator.java index cd3ad21..86192cd 100644 --- a/src/main/java/com/ycwl/basic/device/operator/WvpPassiveStorageOperator.java +++ b/src/main/java/com/ycwl/basic/device/operator/WvpPassiveStorageOperator.java @@ -81,7 +81,8 @@ public class WvpPassiveStorageOperator extends ADeviceStorageOperator { if (StringUtils.isNotBlank(config.getDeviceNo())) { task.deviceNo = config.getDeviceNo(); } else { - task.deviceNo = device.getNo2(); + log.warn("设备未配置deviceNo:{}", device); + return Collections.emptyList(); } task.startTime = startDate; task.endTime = endDate; diff --git a/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceEntity.java b/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceEntity.java index 88d9bfa..58730f9 100644 --- a/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceEntity.java @@ -28,7 +28,6 @@ public class DeviceEntity { * 设备编号 */ private String no; - private String no2; /** * 经度 */ diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/DeviceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/DeviceServiceImpl.java index 1a42ea2..9235cea 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/DeviceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/DeviceServiceImpl.java @@ -160,7 +160,6 @@ public class DeviceServiceImpl implements DeviceService { deviceMapper.updateSort(item.getId(), item.getSort()); deviceRepository.clearDeviceCache(item.getId()); deviceRepository.clearDeviceCache(item.getNo()); - deviceRepository.clearDeviceCache(item.getNo2()); }); return ApiResponse.success(true); }