From b00c9d83f57f24178bf63a257a221face060b936 Mon Sep 17 00:00:00 2001
From: Flex <q1406482700@163.com>
Date: 星期四, 12 六月 2025 16:42:03 +0800
Subject: [PATCH] Merge branch 'master' of http://yykjgit.sdyyst.com/r/easegen
---
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/digitalhumans/DigitalHumansMapper.java | 1
easegen-front/src/views/chooseTemplate/index.vue | 40 +++++++++-----------
easegen-front/src/assets/imgs/2.png | 0
easegen-front/src/views/digitalcourse/template/TemplateForm.vue | 21 ++++++----
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java | 3 +
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceImpl.java | 8 ++-
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceUtil.java | 6 +++
7 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/easegen-front/src/assets/imgs/2.png b/easegen-front/src/assets/imgs/2.png
index 92fc48a..fe34de9 100644
--- a/easegen-front/src/assets/imgs/2.png
+++ b/easegen-front/src/assets/imgs/2.png
Binary files differ
diff --git a/easegen-front/src/views/chooseTemplate/index.vue b/easegen-front/src/views/chooseTemplate/index.vue
index 2428fc1..ca8bbe4 100644
--- a/easegen-front/src/views/chooseTemplate/index.vue
+++ b/easegen-front/src/views/chooseTemplate/index.vue
@@ -1808,6 +1808,11 @@
const saveSubmit = async (type) => {
console.log('鏄惁鍒犻櫎', DeleteD.value)
+ if ( selectLanguage.value?.value === undefined || selectLanguage.value.value === 'all_Language' ) {
+ message.error('璇峰厛閫夋嫨璇涓庡０闊崇被鍨�')
+ return
+ }
+
if (ChangeSoundTypeList.value.value === 2) {
//姝ゆ椂涓洪�氱敤
if (selectList.value === undefined || selectList.value === null) {
@@ -1986,8 +1991,7 @@
try {
if (
ChangeSoundTypeList.value?.value === undefined ||
- selectLanguage.value?.value === undefined ||
- selectLanguage.value?.value === 'all_Language'
+ selectLanguage.value?.value === undefined
) {
message.error('璇峰厛閫夋嫨璇涓庡０闊崇被鍨�')
return
@@ -2049,9 +2053,19 @@
pptList.forEach((item) => {
const originalPPT = item.innerPicture?.src || item.pictureUrl
-
- if (template.showBackground) {
+ console.log(template)
item.pictureUrl = template.bgImage
+ item.digitalHuman.show = template.showDigitalHuman
+ item.digitalHuman.w = template.humanW
+ item.digitalHuman.h = template.humanH
+ item.digitalHuman.x = template.humanX
+ item.digitalHuman.y = template.humanY
+ PPTArr.value.forEach((otherItem) => {
+ if (otherItem.templateId === item.templateId) {
+ otherItem.width = item.width
+ otherItem.height = item.height
+ }
+ })
if (template.showPpt) {
item.innerPicture = {
name: '鐢讳腑鐢�',
@@ -2071,23 +2085,6 @@
templateId: template.id
}
}
- } else {
- item.pictureUrl = originalPPT
- item.innerPicture.src = ''
- }
-
- item.digitalHuman.show = template.showDigitalHuman
- item.digitalHuman.w = template.humanW
- item.digitalHuman.h = template.humanH
- item.digitalHuman.x = template.humanX
- item.digitalHuman.y = template.humanY
-
- PPTArr.value.forEach((otherItem) => {
- if (otherItem.templateId === item.templateId) {
- otherItem.width = item.width
- otherItem.height = item.height
- }
- })
})
}
@@ -2387,7 +2384,6 @@
selectTemplate.value = cloneDeep(templates.value[0])
}
}
-
onMounted(async () => {
let data = await TemplateApi.getTemplatePage(queryParams1)
TEMPLATE_PRESETS.value = data.list.map((item) => ({
diff --git a/easegen-front/src/views/digitalcourse/template/TemplateForm.vue b/easegen-front/src/views/digitalcourse/template/TemplateForm.vue
index 4322597..392934e 100644
--- a/easegen-front/src/views/digitalcourse/template/TemplateForm.vue
+++ b/easegen-front/src/views/digitalcourse/template/TemplateForm.vue
@@ -4,9 +4,9 @@
ref="formRef"
:model="formData"
:rules="formRules"
- label-width="200px"
+ label-width="80px"
v-loading="formLoading">
- <el-row>
+ <el-row :gutter="40">
<el-col :span="12">
<el-form-item label="妯℃澘鍚嶇О" prop="templateName">
<el-input v-model="formData.templateName" maxlength="50" placeholder="璇疯緭鍏ユā鏉垮悕绉�" />
@@ -28,15 +28,15 @@
>
<el-button type="primary">涓婁紶鍥剧墖</el-button>
<template #tip>
- <div class="el-upload__tip">
- 鍙兘涓婁紶jpg/png鏂囦欢
- </div>
+ <span class="el-upload__tip" style="display: inline-block;margin-left: 20px">
+ 涓婁紶jpg/png鏂囦欢
+ </span>
</template>
</el-upload>
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="ishasAdminRole==true">
+ <el-row v-if="ishasAdminRole==true" :gutter="40">
<el-col :span="12">
<el-form-item label="妯℃澘绫诲瀷" prop="zg">
<el-select v-model="formData.zg">
@@ -172,7 +172,7 @@
ElMessage.error('鍥剧墖澶у皬涓嶈兘瓒呰繃2MB!');
return false;
}
-
+
return true;
};
async function updataImage(formData1) {
@@ -405,13 +405,13 @@
}
.checkbox-image {
- width: 230px;
+ width: 93%;
height: 150px;
object-fit: cover;
border-radius: 4px;
border: 1px solid #ddd;
transition: all 0.3s;
- margin-left: 20px;
+ margin-left: 10px;
margin-top: 20px;
}
@@ -447,4 +447,7 @@
.checkbox-input:checked ~ .checkbox-image {
border: 1px solid #ddd; /* 閫変腑鏃朵繚鎸佺伆鑹�1px杈规 */
}
+.upload-demo{
+ margin-top: -7px;
+}
</style>
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/digitalhumans/DigitalHumansMapper.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/digitalhumans/DigitalHumansMapper.java
index 0c805fe..d1e96c7 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/digitalhumans/DigitalHumansMapper.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/digitalhumans/DigitalHumansMapper.java
@@ -37,7 +37,6 @@
digitalHumansDOLambdaQueryWrapper.gt(DigitalHumansDO::getExpireDate, reqVO.getExpireDate()).or().isNull(DigitalHumansDO::getExpireDate);
}
})
- .apply(loginUserId != 1, "creator = {0} or type = 0", loginUserId)
.orderByDesc(DigitalHumansDO::getId));
}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java
index a658b82..63b7aaa 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java
@@ -59,7 +59,8 @@
}
- wrapper.orderByAsc(TemplateDO::getId);
+ wrapper.orderByDesc(TemplateDO::getCreateTime);
+
return selectPage(reqVO, wrapper);
}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceImpl.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceImpl.java
index 582cdf2..eab4a43 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceImpl.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceImpl.java
@@ -137,9 +137,11 @@
}
@Override
public PageResult<DigitalHumansDO> getDigitalHumansPage(DigitalHumansPageReqVO pageReqVO) {
- if(pageReqVO.getType() != null && pageReqVO.getType()==1){
- //鏌ヨ闈炲叕鍏辨暟瀛椾汉锛屽彧鑳芥煡璇㈣嚜宸辩殑锛屽叕鍏辨暟瀛椾汉锛屽彲浠ユ煡璇㈡墍鏈夌殑
- if (WebFrameworkUtils.getLoginUserId() != 1) pageReqVO.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
+ if (pageReqVO.getType() == 1){
+ Long loginUserId = WebFrameworkUtils.getLoginUserId();
+ pageReqVO.setCreator(String.valueOf(loginUserId));
+ }else if (pageReqVO.getType() == 0){
+ pageReqVO.setCreator(null);
}
return digitalHumansMapper.selectPage(pageReqVO);
}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceUtil.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceUtil.java
index c64c84c..ee0f906 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceUtil.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/digitalhumans/DigitalHumansServiceUtil.java
@@ -184,6 +184,12 @@
// 澶勭悊涓氬姟閫昏緫閿欒锛屾洿鏂扮姸鎬佸拰閿欒淇℃伅
String referenceAudioText = responseJson.getString("reference_audio_text");
String asrFormatAudioUrl = responseJson.getString("asr_format_audio_url");
+ if (referenceAudioText == null || asrFormatAudioUrl == null) {
+ // 濡傛灉娌℃湁杩斿洖姝ｇ‘鐨勬枃鏈垨闊抽 URL锛岃涓鸿缁冨け璐�
+ digitalHumansMapper.update(new UpdateWrapper<DigitalHumansDO>().lambda().eq(DigitalHumansDO::getCode, digitalHumansTrailVo.getCode()).set(DigitalHumansDO::getStatus, ERROR_STATUS));
+ log.error("璁粌澶辫触锛�->>>>>>>>> 娌℃湁杩斿洖姝ｇ‘鐨勬枃鏈垨闊抽 URL");
+ return;
+ }
// 濡傛灉鎴愬姛锛岃幏鍙栦竴甯у綋鍥剧墖
String picFileName = modelFileName.replace(extname, ".png");
String pngPath = configApi.getConfigValueByKey(EASEGEN_URL) + "\\human_picture";
--
Gitblit v1.9.3