From 3c378a12577695f4de03fd2fbe83c033f1369c3f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 29 六月 2025 19:58:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/form/KitchenVideoForm.java | 6 +++++-
framework/src/main/java/cn/lili/modules/lmk/domain/form/HealthVideoForm.java | 6 +++++-
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/HealthVideoForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/HealthVideoForm.java
index d372d82..37ba636 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/HealthVideoForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/HealthVideoForm.java
@@ -42,13 +42,17 @@
/** 瑙嗛闀垮害(绉�) */
-// @NotNull(message = "瑙嗛闀垮害涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @NotNull(message = "瑙嗛闀垮害涓嶈兘涓虹┖", groups = {Add.class, Update.class})
private Long videoDuration;
/** 瑙嗛鏍囬 */
@NotBlank(message = "鏍囬涓嶈兘涓虹┖", groups = {Add.class, Update.class})
private String title;
+ @NotBlank(message = "瑙嗛濉厖妯″紡涓嶈兘涓虹┖",groups = {Add.class, Update.class})
+ /** 瑙嗛濉厖妯″紡 */
+ private String videoFit;
+
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/KitchenVideoForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/KitchenVideoForm.java
index cb7906c..9809ccf 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/KitchenVideoForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/KitchenVideoForm.java
@@ -10,6 +10,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.util.List;
@@ -41,7 +42,7 @@
/** 瑙嗛闀垮害(绉�) */
-// @NotNull(message = "瑙嗛闀垮害涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @NotNull(message = "瑙嗛闀垮害涓嶈兘涓虹┖", groups = {Add.class, Update.class})
private Long videoDuration;
/** 瑙嗛鏍囬 */
@@ -52,6 +53,9 @@
@Size(min = 1,max = 5, message = "鏍囩鍒楄〃涓嶈兘涓虹┖",groups = {Add.class, Update.class})
private List<String> checkKitchenType;
+ @NotBlank(message = "瑙嗛濉厖妯″紡涓嶈兘涓虹┖",groups = {Add.class, Update.class})
+ /** 瑙嗛濉厖妯″紡 */
+ private String videoFit;
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
index 5f7b7ad..116f4f6 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
@@ -633,7 +633,7 @@
video.setAuthorId(UserContext.getCurrentUserId());
video.setVideoType(VideoTypeEnum.HEALTH.getValue());
//璁剧疆濉厖妯″紡 淇濇寔姣斾緥锛屽畬鏁存樉绀�
- video.setVideoFit("contain");
+ video.setVideoFit(form.getVideoFit());
video.setVideoContentType(VideoContentTypeEnum.VIDEO.getValue());
video.setStatus(VideoStatusEnum.PUBLISHED.getValue());
baseMapper.insert(video);
@@ -690,7 +690,7 @@
video.setAuthorId(UserContext.getCurrentUserId());
video.setVideoType(VideoTypeEnum.COOK.getValue());
//璁剧疆濉厖妯″紡 淇濇寔姣斾緥锛屽畬鏁存樉绀�
- video.setVideoFit("contain");
+ video.setVideoFit(form.getVideoFit());
video.setVideoContentType(VideoContentTypeEnum.VIDEO.getValue());
video.setStatus(VideoStatusEnum.PUBLISHED.getValue());
baseMapper.insert(video);
--
Gitblit v1.8.0