Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

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

@@ -0,0 +1,101 @@
+package com.fs.course.controller;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.DateUtils;
+import com.fs.course.domain.FsVideoResource;
+import com.fs.course.service.IFsVideoResourceService;
+import com.github.pagehelper.PageHelper;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 资源库管理
+ */
+@RestController
+@RequestMapping("/course/videoResource")
+@AllArgsConstructor
+public class FsVideoResourceController extends BaseController {
+
+    private final IFsVideoResourceService fsVideoResourceService;
+
+    /**
+     * 查询视频素材库列表
+     */
+    @PreAuthorize("@ss.hasPermi('course:videoResource:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(@RequestParam(required = false) String resourceName,
+                              @RequestParam(required = false, defaultValue = "1") Integer pageNum,
+                              @RequestParam(required = false, defaultValue = "10") Integer pageSize)
+    {
+        Map<String, Object> params = new HashMap<>();
+        params.put("resourceName", resourceName);
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<FsVideoResource> list = fsVideoResourceService.selectVideoResourceListByMap(params);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取视频素材库详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('course:videoResource:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(fsVideoResourceService.getById(id));
+    }
+
+    /**
+     * 新增视频素材库
+     */
+    @PreAuthorize("@ss.hasPermi('course:videoResource:add')")
+    @Log(title = "视频素材库", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FsVideoResource fsVideoResource)
+    {
+        fsVideoResource.setCreateTime(LocalDateTime.now());
+        fsVideoResourceService.save(fsVideoResource);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改视频素材库
+     */
+    @PreAuthorize("@ss.hasPermi('course:videoResource:edit')")
+    @Log(title = "视频素材库", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FsVideoResource fsVideoResource)
+    {
+        fsVideoResourceService.updateById(fsVideoResource);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 删除视频素材库
+     */
+    @PreAuthorize("@ss.hasPermi('course:videoResource:remove')")
+    @Log(title = "视频素材库", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        Wrapper<FsVideoResource> updateWrapper = Wrappers.<FsVideoResource>lambdaUpdate()
+                .set(FsVideoResource::getIsDel, 1)
+                .in(FsVideoResource::getId, Arrays.asList(ids));
+        fsVideoResourceService.update(updateWrapper);
+        return AjaxResult.success();
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.fs.course.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("fs_video_resource")
+public class FsVideoResource {
+
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 资源名称
+     */
+    private String resourceName;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 缩略图
+     */
+    private String thumbnail;
+
+    /**
+     * 视频URL
+     */
+    private String videoUrl;
+
+    /**
+     * 线路1
+     */
+    private String line1;
+
+    /**
+     * 线路2
+     */
+    private String line2;
+
+    /**
+     * 线路3
+     */
+    private String line3;
+
+    /**
+     * 时长
+     */
+    private Integer duration;
+    /**
+     * 文件大小
+     */
+    private Long fileSize;
+
+    /**
+     * 文件key
+     */
+    private String fileKey;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 是否已删除 0未删除 1已删除
+     */
+    private Integer isDel;
+}

fs-service-system/src/main/java/com/fs/course/mapper/FsVideoResourceMapper.java

@@ -0,0 +1,19 @@
+package com.fs.course.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.course.domain.FsVideoResource;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface FsVideoResourceMapper extends BaseMapper<FsVideoResource> {
+
+    /**
+     * 查询素材库列表
+     *
+     * @param params    参数
+     * @return  list
+     */
+    List<FsVideoResource> selectVideoResourceListByMap(@Param("params") Map<String, Object> params);
+}

fs-service-system/src/main/java/com/fs/course/service/IFsVideoResourceService.java

@@ -0,0 +1,18 @@
+package com.fs.course.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.course.domain.FsVideoResource;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IFsVideoResourceService extends IService<FsVideoResource> {
+
+    /**
+     * 查询素材库列表
+     *
+     * @param params    参数
+     * @return  list
+     */
+    List<FsVideoResource> selectVideoResourceListByMap(Map<String, Object> params);
+}

fs-service-system/src/main/java/com/fs/course/service/impl/FsVideoResourceServiceImpl.java

@@ -0,0 +1,25 @@
+package com.fs.course.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.course.domain.FsVideoResource;
+import com.fs.course.mapper.FsVideoResourceMapper;
+import com.fs.course.service.IFsVideoResourceService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class FsVideoResourceServiceImpl extends ServiceImpl<FsVideoResourceMapper, FsVideoResource> implements IFsVideoResourceService {
+
+    /**
+     * 查询素材库列表
+     *
+     * @param params    参数
+     * @return  list
+     */
+    @Override
+    public List<FsVideoResource> selectVideoResourceListByMap(Map<String, Object> params) {
+        return baseMapper.selectVideoResourceListByMap(params);
+    }
+}

fs-service-system/src/main/resources/mapper/course/FsVideoResourceMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.course.mapper.FsVideoResourceMapper">
+
+    <select id="selectVideoResourceListByMap" resultType="com.fs.course.domain.FsVideoResource">
+        select
+            rr.*
+        from fs_video_resource rr
+        where rr.is_del = 0
+        <if test="params.resourceName != null and params.resourceName != ''">
+            and rr.resource_name like concat('%', #{params.resourceName}, '%')
+        </if>
+    </select>
+</mapper>