From 9f66544a29c942e26a1dc115b0abb8a5bf9b52ad Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Sat, 27 Sep 2025 23:28:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(source):=20=E5=A4=84=E7=90=86ZT-Source?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=97=B6=E6=94=AF=E6=8C=81=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=A3=81=E5=89=AA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增DeviceRepository依赖注入 - 获取设备配置管理器并检查裁剪配置 - 根据裁剪配置设置缩略图URL -优化sourceEntity数据处理逻辑 --- .../com/ycwl/basic/service/ZTSourceDataService.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/ycwl/basic/service/ZTSourceDataService.java b/src/main/java/com/ycwl/basic/service/ZTSourceDataService.java index f99c2e76..38ac0b4d 100644 --- a/src/main/java/com/ycwl/basic/service/ZTSourceDataService.java +++ b/src/main/java/com/ycwl/basic/service/ZTSourceDataService.java @@ -1,11 +1,14 @@ package com.ycwl.basic.service; import com.ycwl.basic.dto.ZTSourceMessage; +import com.ycwl.basic.integration.common.manager.DeviceConfigManager; import com.ycwl.basic.mapper.SourceMapper; import com.ycwl.basic.model.pc.source.entity.SourceEntity; +import com.ycwl.basic.repository.DeviceRepository; import com.ycwl.basic.utils.SnowFlakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.logging.log4j.util.Strings; import org.springframework.stereotype.Service; import java.sql.Timestamp; @@ -25,6 +28,7 @@ import java.util.Date; public class ZTSourceDataService { private final SourceMapper sourceMapper; + private final DeviceRepository deviceRepository; /** * 处理ZT-Source消息,仅处理照片类型(sourceType=2) @@ -49,6 +53,12 @@ public class ZTSourceDataService { // 转换为SourceEntity SourceEntity sourceEntity = convertToSourceEntity(message); + DeviceConfigManager configManager = deviceRepository.getDeviceConfigManager(sourceEntity.getDeviceId()); + if (configManager != null) { + if (Strings.isNotBlank(configManager.getString("crop_config"))) { + sourceEntity.setUrl(message.getThumbnailUrl()); + } + } // 保存到数据库 int result = sourceMapper.addFromZTSource(sourceEntity);