From 98e5c3dc39e2ad57669a8dd897f5c12fa9a482b6 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 1 Sep 2025 18:45:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(device):=20=E7=A7=BB=E9=99=A4=E6=9C=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=20deviceNo=20=E6=97=B6=E7=9A=84=E8=A2=AB?=
 =?UTF-8?q?=E5=8A=A8=E5=AD=98=E5=82=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 VptPassiveStorageOperator 和 WvpPassiveStorageOperator 中添加日志警告
- 返回空列表以避免使用未配置的 deviceNo 进行查询
- 移除 DeviceEntity 中的 no2 字段
- 更新 DeviceServiceImpl 中的缓存清除逻辑
---
 .../ycwl/basic/device/operator/VptPassiveStorageOperator.java  | 3 ++-
 .../ycwl/basic/device/operator/WvpPassiveStorageOperator.java  | 3 ++-
 .../com/ycwl/basic/model/pc/device/entity/DeviceEntity.java    | 1 -
 .../java/com/ycwl/basic/service/pc/impl/DeviceServiceImpl.java | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

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);
     }