From 5b757eda8dc3967858b3b8bc9deed3b41a1a8faf Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 4 Sep 2025 16:33:29 +0800
Subject: [PATCH] =?UTF-8?q?refactor(basic):=20=E9=87=8D=E6=9E=84=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E9=85=8D=E7=BD=AE=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 getDeviceConfig 方法，使用 DeviceConfigManager替代 List<DeviceConfigV2DTO>
- 更新 convertToDeviceConfigEntity 方法，使用 DeviceConfigManager 作为参数
- 在 convertToDeviceConfigEntity 方法中实现从 configManager 到 deviceConfigEntity 的字段映射
---
 .../basic/repository/DeviceRepository.java    | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/repository/DeviceRepository.java b/src/main/java/com/ycwl/basic/repository/DeviceRepository.java
index 846c310..131f803 100644
--- a/src/main/java/com/ycwl/basic/repository/DeviceRepository.java
+++ b/src/main/java/com/ycwl/basic/repository/DeviceRepository.java
@@ -70,9 +70,9 @@ public class DeviceRepository {
     }
 
     public DeviceConfigEntity getDeviceConfig(Long deviceId) {
-        List<DeviceConfigV2DTO> configList = deviceConfigIntegrationService.getDeviceConfigs(deviceId);
-        if (configList != null && !configList.isEmpty()) {
-            return convertToDeviceConfigEntity(configList, deviceId);
+        DeviceConfigManager configManager = getDeviceConfigManager(deviceId);
+        if (configManager != null) {
+            return convertToDeviceConfigEntity(configManager, deviceId);
         }
         return null;
     }
@@ -96,13 +96,26 @@ public class DeviceRepository {
     /**
      * 将DeviceConfigV2DTO列表转换为DeviceConfigEntity（为了兼容性）
      */
-    private DeviceConfigEntity convertToDeviceConfigEntity(List<DeviceConfigV2DTO> configList, Long deviceId) {
+    private DeviceConfigEntity convertToDeviceConfigEntity(DeviceConfigManager configManager, Long deviceId) {
         DeviceConfigEntity entity = new DeviceConfigEntity();
         entity.setId(SnowFlakeUtil.getLongId());
         entity.setDeviceId(deviceId);
         
-        // 由于DeviceConfigEntity没有通用的configJson字段，这里只设置基本信息
-        // 具体的配置项需要通过DeviceConfigManager来访问
+        // 通过configManager获取对应的字段写入到deviceConfigEntity中
+        entity.setViidType(configManager.getInteger("viid_type"));
+        entity.setStoreType(configManager.getInteger("store_type"));
+        entity.setStoreConfigJson(configManager.getString("store_config_json"));
+        entity.setStoreExpireDay(configManager.getInteger("store_expire_day"));
+        entity.setOnlineCheck(configManager.getInteger("online_check"));
+        entity.setOnlineMaxInterval(configManager.getInteger("online_max_interval"));
+        entity.setCutPre(configManager.getBigDecimal("cut_pre"));
+        entity.setCutPost(configManager.getBigDecimal("cut_post"));
+        entity.setEnablePreBook(configManager.getInteger("enable_pre_book"));
+        entity.setImageFree(configManager.getInteger("image_free"));
+        entity.setVideoFree(configManager.getInteger("video_free"));
+        entity.setPairDevice(configManager.getLong("pair_device"));
+        entity.setVideoCrop(configManager.getString("video_crop"));
+        entity.setCropConfig(configManager.getString("crop_config"));
         
         return entity;
     }