From e32f231a8f52e12568816f7d179bec332ef7ec20 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 6 Jun 2025 15:09:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=94=AF=E6=8C=81=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=A0=87=E5=AE=9A=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/model/pc/device/entity/DeviceConfigEntity.java | 1 + src/main/java/com/ycwl/basic/task/VideoPieceGetter.java | 7 +++++++ src/main/resources/mapper/DeviceMapper.xml | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java b/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java index 81374c4..7768f75 100644 --- a/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java @@ -61,4 +61,5 @@ public class DeviceConfigEntity { private Integer imageFree; private Integer videoFree; private Long pairDevice; + private String videoCrop; } diff --git a/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java b/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java index 70756be..0d1d9c9 100644 --- a/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java +++ b/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java @@ -23,6 +23,7 @@ import com.ycwl.basic.utils.SnowFlakeUtil; import com.ycwl.basic.utils.VideoReUploader; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; @@ -288,6 +289,9 @@ public class VideoPieceGetter { sourceEntity.setUrl(imgSource.getUrl()); sourceEntity.setPosJson(imgSource.getPosJson()); } + if (StringUtils.isNotBlank(config.getVideoCrop())) { + sourceEntity.setPosJson(config.getVideoCrop()); + } sourceEntity.setVideoUrl(url); sourceEntity.setFaceSampleId(faceSampleId); sourceEntity.setScenicId(device.getScenicId()); @@ -314,6 +318,9 @@ public class VideoPieceGetter { videoReUploader.addTask(sourceEntity.getId()); } else { source.setVideoUrl(url); + if (StringUtils.isNotBlank(config.getVideoCrop())) { + source.setPosJson(config.getVideoCrop()); + } sourceMapper.update(source); videoReUploader.addTask(source.getId()); } diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml index bff21cb..9db25cd 100644 --- a/src/main/resources/mapper/DeviceMapper.xml +++ b/src/main/resources/mapper/DeviceMapper.xml @@ -40,7 +40,8 @@ enable_pre_book = #{enablePreBook}, image_free = #{imageFree}, video_free = #{videoFree}, - pair_device = #{pairDevice} + pair_device = #{pairDevice}, + video_crop = #{videoCrop} where id = #{id}