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