fs_video_resource 新增视频展示方式

fs-admin/src/main/java/com/fs/course/business/FsVideoResourceBusinessService.java

@@ -36,6 +36,7 @@ public class FsVideoResourceBusinessService {
                 .set("file_key", fsVideoResource.getFileKey())
                 .set("file_name", fsVideoResource.getFileName())
                 .set("thumbnail", fsVideoResource.getThumbnail())
+                .set("display_type", fsVideoResource.getDisplayType())
         );
     }
 }

fs-admin/src/main/java/com/fs/course/controller/FsVideoResourceController.java

@@ -107,6 +107,10 @@ public class FsVideoResourceController extends BaseController {
         if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
             fsVideoResource.setUserId(userId);
         }
+        // 视频展示类型：前端未传时默认横屏
+        if (com.fs.common.utils.StringUtils.isBlank(fsVideoResource.getDisplayType())) {
+            fsVideoResource.setDisplayType("landscape");
+        }
 
         fsVideoResource.setCreateTime(LocalDateTime.now());
         boolean save = fsVideoResourceService.save(fsVideoResource);
@@ -128,6 +132,10 @@ public class FsVideoResourceController extends BaseController {
     @Log(title = "视频素材库", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FsVideoResource fsVideoResource) {
+        // 视频展示类型：前端未传时默认横屏
+        if (com.fs.common.utils.StringUtils.isBlank(fsVideoResource.getDisplayType())) {
+            fsVideoResource.setDisplayType("landscape");
+        }
         if (("今正科技".equals(cloudHostProper.getCompanyName()))) {
             // 同步资源到课程
             videoResourceBusinessService.edit(fsVideoResource);
@@ -203,6 +211,10 @@ public class FsVideoResourceController extends BaseController {
 
         list.forEach(v -> {
             v.setCreateTime(LocalDateTime.now());
+            // 视频展示类型：前端未传时默认横屏
+            if (com.fs.common.utils.StringUtils.isBlank(v.getDisplayType())) {
+                v.setDisplayType("landscape");
+            }
             if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
                 v.setUserId(userId);
             }

fs-service/src/main/java/com/fs/course/domain/FsVideoResource.java

@@ -104,4 +104,9 @@ public class FsVideoResource {
     private String hsyVid;
 
     private String jobId;
+
+    /**
+     * 视频展示类型：landscape-横屏，portrait-竖屏，默认横屏
+     */
+    private String displayType;
 }

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -2479,6 +2479,19 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         FsUserCourseVideoDetailsVO fsUserCourseVideoDetailsVO = new FsUserCourseVideoDetailsVO();
         BeanUtils.copyProperties(fsUserCourseVideo, fsUserCourseVideoDetailsVO);
 
+        // 默认展示横屏
+        if (StringUtils.isNotEmpty(fsUserCourseVideo.getFileKey())) {
+            FsVideoResource fsVideoResource = fsVideoResourceMapper.selectByFileKey(fsUserCourseVideo.getFileKey());
+            if (fsVideoResource != null) {
+                fsUserCourseVideoDetailsVO.setDisplayType(fsVideoResource.getDisplayType());
+            } else {
+                fsUserCourseVideoDetailsVO.setDisplayType("landscape");
+            }
+        } else {
+            fsUserCourseVideoDetailsVO.setDisplayType("landscape");
+        }
+
+
         //从配置中读取默认线路
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
@@ -4589,9 +4602,9 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                     JsonNode originalNode = productIdToJsonNodeMap.get(validProduct.getProductId());
 
                     fsStoreProductScrm.setProductId(validProduct.getProductId());
-                    fsStoreProductScrm.setImages(validProduct.getImages() != null ? validProduct.getImages() :
+                    fsStoreProductScrm.setImages(validProduct.getImage() != null ? validProduct.getImage() :
                             (originalNode != null ? originalNode.path("image").asText() : ""));
-                    fsStoreProductScrm.setImgUrl(validProduct.getImgUrl() != null ? validProduct.getImgUrl() :
+                    fsStoreProductScrm.setImgUrl(validProduct.getSliderImage() != null ? validProduct.getSliderImage() :
                             (originalNode != null ? originalNode.path("imgUrl").asText() : ""));
                     fsStoreProductScrm.setBarCode(validProduct.getBarCode());
                     fsStoreProductScrm.setPrice(validProduct.getPrice());

fs-service/src/main/java/com/fs/course/vo/FsVideoResourceVO.java

@@ -87,4 +87,9 @@ public class FsVideoResourceVO {
     private String projectIds;
 
     private Integer sort;
+
+    /**
+     * 视频展示类型：landscape-横屏，portrait-竖屏
+     */
+    private String displayType;
 }

fs-service/src/main/java/com/fs/course/vo/newfs/FsUserCourseVideoDetailsVO.java

@@ -49,4 +49,9 @@ public class FsUserCourseVideoDetailsVO {
      * 是否展示商品 0展示 1不展示
      */
     private String showProduct;
+
+    /**
+     * 视频展示类型：landscape-横屏，portrait-竖屏
+     */
+    private String displayType;
 }