From e47692e7a147f98c298429a2eaa6a4085d6f795d Mon Sep 17 00:00:00 2001
From: shenrongliang <1328040932@qq.com>
Date: 星期一, 26 五月 2025 13:56:29 +0800
Subject: [PATCH] 修改查询数字人类型，视频合成层级
---
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java | 18 ++++++++++++------
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java | 5 +++--
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
index a728365..6721c80 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
import org.springframework.util.StringUtils;
import java.util.Collection;
@@ -40,8 +41,8 @@
}
public LambdaQueryWrapperX<T> eqIfPresent(SFunction<T, ?> column, Object val) {
- if (ObjectUtil.isNotEmpty(val)) {
- return (LambdaQueryWrapperX<T>) super.eq(column, val);
+ if (val != null && !(val instanceof String && StrUtil.isBlank((String) val))) {
+ this.eq(column, val);
}
return this;
}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java
index cb1bf05..86b308f 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java
@@ -170,10 +170,10 @@
// 褰撴病鏈変汉鍍忔椂锛岃棰戞斁鍦� cover 鐨勪笅灞�
builder = new ProcessBuilder(
"ffmpeg",
- "-i", cover1, // 鑳屾櫙鍥� 1
- "-i", substring1, // 瑙嗛
- "-i", cover1, // 鑳屾櫙鍥� 2
- "-i", cover, // PPT鍐呭
+ "-i", cover1, // 鑳屾櫙鍥� 1
+ "-i", substring1, // 瑙嗛锛堝惈闊抽锛�
+ "-i", cover1, // 鑳屾櫙鍥� 2
+ "-i", cover, // PPT 鍐呭
"-filter_complex",
"[0:v]scale=" + Math.round(scene.getBackground().getWidth()) + ":" + Math.round(scene.getBackground().getHeight()) + "[bg1];" +
"[1:v]scale=" + Math.round(scene.getComponents().get(0).getWidth()) + ":" + Math.round(scene.getComponents().get(0).getHeight()) + "[v1];" +
@@ -181,8 +181,14 @@
"[2:v]scale=" + Math.round(scene.getBackground().getWidth()) + ":" + Math.round(scene.getBackground().getHeight()) + "[bg2];" +
"[img1][bg2]overlay=shortest=1[v2];" +
"[3:v]scale=" + Math.round(scene.getComponents().get(1).getWidth()) + ":" + Math.round(scene.getComponents().get(1).getHeight()) + "[v3];" +
- "[v2][v3]overlay=x=" + Math.round(scene.getComponents().get(1).getMarginLeft()) + ":y=" + Math.round(scene.getComponents().get(1).getTop()),
- newFileName2 // 杈撳嚭鏂囦欢鍚�
+ "[v2][v3]overlay=x=" + Math.round(scene.getComponents().get(1).getMarginLeft()) + ":y=" + Math.round(scene.getComponents().get(1).getTop()) + "[outv]",
+ "-map", "[outv]",
+ "-map", "1:a?", // 娣诲姞闊抽娴侊紙濡傛灉瀛樺湪锛�
+ "-c:v", "libx264", // 瑙嗛缂栫爜鏍煎紡锛堝彲閫変絾鎺ㄨ崘锛�
+ "-c:a", "aac", // 闊抽缂栫爜鏍煎紡锛堝彲閫変絾鎺ㄨ崘锛�
+ "-shortest", // 璁╄緭鍑洪暱搴︿笌鏈�鐭祦涓�鑷达紝閬垮厤榛戝睆鎴栭潤闊冲欢闀�
+ "-y", // 瑕嗙洊杈撳嚭鏂囦欢
+ newFileName2 // 杈撳嚭鏂囦欢鍚�
);
}
System.out.println(newFileName2);
--
Gitblit v1.9.3