From 8bdd46a1c98ff6c4113a785764f6b426b64b46de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=AD=E7=90=AA=E6=9E=AB?= <374696376@qq.com>
Date: Sun, 2 Jul 2023 22:22:55 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iotkit/data/service/DeviceInfoDataCache.java | 16 +++++++++++++---
 .../service/DeviceInfoPropertyDataCache.java     |  4 ++--
 .../iotkit/data/service/DeviceInfoDataImpl.java  |  8 ++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java b/iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java
index 36d6ffa5..43f5b7d8 100644
--- a/iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java
+++ b/iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java
@@ -219,8 +219,8 @@ public class DeviceInfoDataCache implements IDeviceInfoData, SmartInitializingSi
     }
 
     @Override
-    public List<DeviceInfo> findByIds(Collection<String> id) {
-        return null;
+    public List<DeviceInfo> findByIds(Collection<String> ids) {
+        return deviceInfoData.findByIds(ids);
     }
 
     @Override
@@ -252,7 +252,17 @@ public class DeviceInfoDataCache implements IDeviceInfoData, SmartInitializingSi
     }
 
     @Override
-    public void deleteByIds(Collection<String> strings) {
+    public void deleteByIds(Collection<String> ids) {
+        List<DeviceInfo> deviceInfos = deviceInfoData.findByIds(ids);
+        deviceInfos.forEach(device -> {
+            deviceInfoCacheEvict.findByDeviceId(device.getDeviceId());
+            deviceInfoCacheEvict.findByProductKeyAndDeviceName(device.getProductKey(), device.getDeviceName());
+            //清除属性缓存
+            clearProperties(device.getDeviceId());
+            //更新子设备列表缓存
+            putSubDeviceIds(device.getParentId());
+        });
+        deviceInfoData.deleteByIds(ids);
     }
 
     @Override
diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java b/iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java
index 60de73c6..2c7b7467 100644
--- a/iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java
+++ b/iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java
@@ -60,8 +60,8 @@ public class DeviceInfoPropertyDataCache implements IDeviceInfoData {
     }
 
     @Override
-    public void deleteByIds(Collection<String> strings) {
-
+    public void deleteByIds(Collection<String> ids) {
+        deviceInfoData.deleteByIds(ids);
     }
 
     @Override
diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
index ca1f0988..98202636 100644
--- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
+++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java
@@ -465,8 +465,8 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceI
     }
 
     @Override
-    public List<DeviceInfo> findByIds(Collection<String> id) {
-        return null;
+    public List<DeviceInfo> findByIds(Collection<String> ids) {
+        return MapstructUtils.convert(deviceInfoRepository.findAllById(ids),DeviceInfo.class);
     }
 
     @Override
@@ -514,8 +514,8 @@ public class DeviceInfoDataImpl implements IDeviceInfoData, IJPACommData<DeviceI
     }
 
     @Override
-    public void deleteByIds(Collection<String> strings) {
-
+    public void deleteByIds(Collection<String> ids) {
+        deviceInfoRepository.deleteAllById(ids);
     }