林武泰/新增实验室演示视频功能

lab-admin/src/main/java/com/ruoyi/asset/controller/TbAssetController.java

@@ -3,7 +3,9 @@ package com.ruoyi.asset.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.asset.domain.TbDemoVideo;
 import com.ruoyi.asset.domain.dto.TbAssetDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +50,22 @@ public class TbAssetController extends BaseController
     }
 
     /**
+     * 查询演示视频列表
+     */
+    @PreAuthorize("@ss.hasPermi('asset:asset:list')")
+    @GetMapping("/searchList")
+    public AjaxResult searchList(@RequestParam("assetKey") String assetKey)
+    {
+        if (StrUtil.isBlank(assetKey)) {
+            return error("搜索键不能为空");
+        }
+        TbAsset tbAsset = new TbAsset();
+        tbAsset.setName(assetKey);
+        List<TbAsset> list = tbAssetService.selectTbAssetList(tbAsset);
+        return AjaxResult.success(list);
+    }
+
+    /**
      * 导出资产信息列表
      */
     @ApiOperation("导出资产信息列表")

lab-admin/src/main/java/com/ruoyi/asset/controller/TbAssetVideoController.java

@@ -0,0 +1,130 @@
+package com.ruoyi.asset.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.asset.domain.dto.BatchTbAssetVideoDTO;
+import com.ruoyi.asset.domain.dto.TbAssetVideoDTO;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.asset.domain.TbAssetVideo;
+import com.ruoyi.asset.service.ITbAssetVideoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 设备视频Controller
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+@RestController
+@RequestMapping("/asset/assetVideo")
+public class TbAssetVideoController extends BaseController
+{
+    @Autowired
+    private ITbAssetVideoService tbAssetVideoService;
+
+    /**
+     * 查询设备视频列表
+     */
+    @PreAuthorize("@ss.hasPermi('asset:assetVideo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbAssetVideo tbAssetVideo)
+    {
+        startPage();
+        List<TbAssetVideo> list = tbAssetVideoService.selectTbAssetVideoList(tbAssetVideo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询设备视频列表
+     */
+    @PreAuthorize("@ss.hasPermi('asset:assetVideo:list')")
+    @GetMapping("/list2")
+    public TableDataInfo list2(TbAssetVideo tbAssetVideo)
+    {
+        startPage();
+        List<TbAssetVideoDTO> list = tbAssetVideoService.selectTbAssetVideoList2(tbAssetVideo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设备视频列表
+     */
+    @PreAuthorize("@ss.hasPermi('asset:assetVideo:export')")
+    @Log(title = "设备视频", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TbAssetVideo tbAssetVideo)
+    {
+        List<TbAssetVideo> list = tbAssetVideoService.selectTbAssetVideoList(tbAssetVideo);
+        ExcelUtil<TbAssetVideo> util = new ExcelUtil<TbAssetVideo>(TbAssetVideo.class);
+        util.exportExcel(response, list, "设备视频数据");
+    }
+
+    /**
+     * 获取设备视频详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('asset:assetVideo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tbAssetVideoService.selectTbAssetVideoById(id));
+    }
+
+    /**
+     * 新增设备视频
+     */
+    @PreAuthorize("@ss.hasPermi('asset:assetVideo:add')")
+    @Log(title = "设备视频", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbAssetVideo tbAssetVideo)
+    {
+        return toAjax(tbAssetVideoService.insertTbAssetVideo(tbAssetVideo));
+    }
+
+    /**
+     * 批量新增演示视频
+     */
+    @PreAuthorize("@ss.hasPermi('asset:assetVideo:add')")
+    @Log(title = "设备视频", businessType = BusinessType.INSERT)
+    @PostMapping("/batch")
+    public AjaxResult batchAdd(@RequestBody BatchTbAssetVideoDTO batchTbAssetVideoDTO)
+    {
+        return toAjax(tbAssetVideoService.batchInsertTbAssetVideo(batchTbAssetVideoDTO));
+    }
+
+    /**
+     * 修改设备视频
+     */
+    @PreAuthorize("@ss.hasPermi('asset:assetVideo:edit')")
+    @Log(title = "设备视频", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbAssetVideo tbAssetVideo)
+    {
+        return toAjax(tbAssetVideoService.updateTbAssetVideo(tbAssetVideo));
+    }
+
+    /**
+     * 删除设备视频
+     */
+    @PreAuthorize("@ss.hasPermi('asset:assetVideo:remove')")
+    @Log(title = "设备视频", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tbAssetVideoService.deleteTbAssetVideoByIds(ids));
+    }
+}

lab-admin/src/main/java/com/ruoyi/asset/controller/TbDemoVideoController.java

@@ -0,0 +1,195 @@
+package com.ruoyi.asset.controller;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.asset.domain.dto.BatchTbAssetVideoDTO;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.ByteUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.file.MimeTypeUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.asset.domain.TbDemoVideo;
+import com.ruoyi.asset.service.ITbDemoVideoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 演示视频Controller
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+@RestController
+@RequestMapping("/asset/demoVideo")
+public class TbDemoVideoController extends BaseController
+{
+    @Autowired
+    private ITbDemoVideoService tbDemoVideoService;
+
+    /**
+     * 查询演示视频列表
+     */
+    @PreAuthorize("@ss.hasPermi('asset:demoVideo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbDemoVideo tbDemoVideo)
+    {
+        startPage();
+        List<TbDemoVideo> list = tbDemoVideoService.selectTbDemoVideoList(tbDemoVideo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询演示视频列表
+     */
+    @PreAuthorize("@ss.hasPermi('asset:demoVideo:list')")
+    @GetMapping("/searchList")
+    public AjaxResult searchList(@RequestParam("videoKey") String videoKey)
+    {
+        if (StrUtil.isBlank(videoKey)) {
+            return error("搜索键不能为空");
+        }
+        TbDemoVideo tbDemoVideo = new TbDemoVideo();
+        tbDemoVideo.setName(videoKey);
+        List<TbDemoVideo> list = tbDemoVideoService.selectTbDemoVideoList(tbDemoVideo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出演示视频列表
+     */
+    @PreAuthorize("@ss.hasPermi('asset:demoVideo:export')")
+    @Log(title = "演示视频", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TbDemoVideo tbDemoVideo)
+    {
+        List<TbDemoVideo> list = tbDemoVideoService.selectTbDemoVideoList(tbDemoVideo);
+        ExcelUtil<TbDemoVideo> util = new ExcelUtil<TbDemoVideo>(TbDemoVideo.class);
+        util.exportExcel(response, list, "演示视频数据");
+    }
+
+    /**
+     * 获取演示视频详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('asset:demoVideo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tbDemoVideoService.selectTbDemoVideoById(id));
+    }
+
+    /**
+     * 新增演示视频
+     */
+    @PreAuthorize("@ss.hasPermi('asset:demoVideo:add')")
+    @Log(title = "演示视频", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbDemoVideo tbDemoVideo)
+    {
+        return toAjax(tbDemoVideoService.insertTbDemoVideo(tbDemoVideo));
+    }
+
+    /**
+     * 上传演示视频
+     */
+    @PreAuthorize("@ss.hasPermi('asset:demoVideo:add')")
+    @Log(title = "演示视频", businessType = BusinessType.INSERT)
+    @PostMapping("/upload")
+    public AjaxResult upload(@RequestPart("file") MultipartFile file) throws Exception{
+        String username = getLoginUser().getUsername();
+
+        String SAVE_VIDEO_PATH = RuoYiConfig.getVideoPath();
+        // 获取原文件名
+        String originalFilename = file.getOriginalFilename();
+        long size = file.getSize();
+        // 获取文件大小
+        String byteSize = ByteUtils.formatByteSize(size);
+        // 获取文件类型
+        String contentType = file.getContentType();
+        // 上传视频并获取视频存放位置
+        String fileName = FileUploadUtils.upload(SAVE_VIDEO_PATH, file, MimeTypeUtils.VIDEO_EXTENSION);
+
+        if (StrUtil.isBlank(fileName)) {
+            return error("视频上传失败");
+        }
+
+        TbDemoVideo tbDemoVideo = new TbDemoVideo(originalFilename, contentType, byteSize, fileName);
+        tbDemoVideo.setCreateBy(username);
+
+        int result = tbDemoVideoService.insertTbDemoVideo(tbDemoVideo);
+        if (result < 1) {
+            FileUtils.deleteFile(fileName);
+        }
+
+        return toAjax(result);
+    }
+
+    @Resource
+    private VideoHttpRequestHandler videoHttpRequestHandler;
+
+    @GetMapping(value = "/player")
+    public void getUploadImage(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "name", required = false) String name) throws Exception{
+
+        if (StrUtil.isNotBlank(name)) {
+            String[] split = name.split("/");
+            StringBuilder res = new StringBuilder();
+            for (int i = 0; i < split.length; i++) {
+                if (i > 2) {
+                    res.append("/");
+                    res.append(split[i]);
+                }
+            }
+            name = String.valueOf(res);
+        }
+
+        Path path = Paths.get(RuoYiConfig.getVideoPath() + name);
+        if (Files.exists(path)) {
+            String mimeType = Files.probeContentType(path);
+            if (!StrUtil.isBlank(mimeType)) {
+                response.setContentType(mimeType);
+            }
+            request.setAttribute(VideoHttpRequestHandler.ATTR_FILE, path);
+            videoHttpRequestHandler.handleRequest(request, response);
+        } else {
+            response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+            response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
+        }
+    }
+
+    /**
+     * 修改演示视频
+     */
+    @PreAuthorize("@ss.hasPermi('asset:demoVideo:edit')")
+    @Log(title = "演示视频", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbDemoVideo tbDemoVideo)
+    {
+        return toAjax(tbDemoVideoService.updateTbDemoVideo(tbDemoVideo));
+    }
+
+    /**
+     * 删除演示视频
+     */
+    @PreAuthorize("@ss.hasPermi('asset:demoVideo:remove')")
+    @Log(title = "演示视频", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tbDemoVideoService.deleteTbDemoVideoByIds(ids));
+    }
+}

lab-admin/src/main/java/com/ruoyi/asset/controller/VideoHttpRequestHandler.java

@@ -0,0 +1,20 @@
+package com.ruoyi.asset.controller;
+
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import java.nio.file.Path;
+
+@Component
+public class VideoHttpRequestHandler extends ResourceHttpRequestHandler {
+    public final static String ATTR_FILE = "NON-STATIC-FILE";
+
+    @Override
+    protected Resource getResource(HttpServletRequest request) {
+        final Path filePath = (Path) request.getAttribute(ATTR_FILE);
+        return new FileSystemResource(filePath);
+    }
+}

lab-admin/src/main/java/com/ruoyi/asset/domain/TbAssetVideo.java

@@ -0,0 +1,85 @@
+package com.ruoyi.asset.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 设备视频对象 tb_asset_video
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+@TableName("tb_asset_video")
+public class TbAssetVideo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    @TableId("id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    /** 设备条形码 */
+    @Excel(name = "设备条形码")
+    @TableField("asset_bar_code")
+    private String assetBarCode;
+
+    /** 演示视频编号 */
+    @Excel(name = "演示视频编号")
+    @TableField("demo_video_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long demoVideoId;
+
+    public TbAssetVideo() {
+    }
+
+    public TbAssetVideo(String assetBarCode, Long demoVideoId) {
+        this.assetBarCode = assetBarCode;
+        this.demoVideoId = demoVideoId;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setAssetBarCode(String assetBarCode) 
+    {
+        this.assetBarCode = assetBarCode;
+    }
+
+    public String getAssetBarCode() 
+    {
+        return assetBarCode;
+    }
+    public void setDemoVideoId(Long demoVideoId) 
+    {
+        this.demoVideoId = demoVideoId;
+    }
+
+    public Long getDemoVideoId() 
+    {
+        return demoVideoId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("assetBarCode", getAssetBarCode())
+            .append("demoVideoId", getDemoVideoId())
+            .toString();
+    }
+}

lab-admin/src/main/java/com/ruoyi/asset/domain/TbDemoVideo.java

@@ -0,0 +1,122 @@
+package com.ruoyi.asset.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 演示视频对象 tb_demo_video
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+@TableName("tb_demo_video")
+public class TbDemoVideo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    @TableId("id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    /** 视频名称 */
+    @Excel(name = "视频名称")
+    @TableField("name")
+    private String name;
+
+    /** 视频类型 */
+    @Excel(name = "视频类型")
+    @TableField("type")
+    private String type;
+
+    /** 视频大小 */
+    @Excel(name = "视频大小")
+    @TableField("size")
+    private String size;
+
+    /** 视频位置 */
+    @Excel(name = "视频位置")
+    @TableField("url")
+    private String url;
+
+    public TbDemoVideo() {
+    }
+
+    public TbDemoVideo(String name, String type, String size, String url) {
+        this.name = name;
+        this.type = type;
+        this.size = size;
+        this.url = url;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setSize(String size) 
+    {
+        this.size = size;
+    }
+
+    public String getSize() 
+    {
+        return size;
+    }
+    public void setUrl(String url) 
+    {
+        this.url = url;
+    }
+
+    public String getUrl() 
+    {
+        return url;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("type", getType())
+            .append("size", getSize())
+            .append("url", getUrl())
+            .append("remark", getRemark())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

lab-admin/src/main/java/com/ruoyi/asset/domain/dto/BatchTbAssetVideoDTO.java

@@ -0,0 +1,14 @@
+package com.ruoyi.asset.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BatchTbAssetVideoDTO {
+    private List<String> assetBarCodes;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private List<Long> videoIds;
+}

lab-admin/src/main/java/com/ruoyi/asset/domain/dto/TbAssetVideoDTO.java

@@ -0,0 +1,25 @@
+package com.ruoyi.asset.domain.dto;
+
+import com.ruoyi.asset.domain.TbAssetVideo;
+import com.ruoyi.asset.domain.TbDemoVideo;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+public class TbAssetVideoDTO extends TbAssetVideo {
+    private TbDemoVideo tbDemoVideo;
+
+    public TbDemoVideo getTbDemoVideo() {
+        return tbDemoVideo;
+    }
+
+    public void setTbDemoVideo(TbDemoVideo tbDemoVideo) {
+        this.tbDemoVideo = tbDemoVideo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("tbDemoVideo", getTbDemoVideo())
+                .toString();
+    }
+}

lab-admin/src/main/java/com/ruoyi/asset/mapper/TbAssetVideoMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.asset.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.asset.domain.TbAssetVideo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 设备视频Mapper接口
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+@Mapper
+public interface TbAssetVideoMapper extends BaseMapper<TbAssetVideo>
+{
+    /**
+     * 查询设备视频
+     * 
+     * @param id 设备视频主键
+     * @return 设备视频
+     */
+    public TbAssetVideo selectTbAssetVideoById(Long id);
+
+    /**
+     * 查询设备视频列表
+     * 
+     * @param tbAssetVideo 设备视频
+     * @return 设备视频集合
+     */
+    public List<TbAssetVideo> selectTbAssetVideoList(TbAssetVideo tbAssetVideo);
+
+    /**
+     * 新增设备视频
+     * 
+     * @param tbAssetVideo 设备视频
+     * @return 结果
+     */
+    public int insertTbAssetVideo(TbAssetVideo tbAssetVideo);
+
+    /**
+     * 修改设备视频
+     * 
+     * @param tbAssetVideo 设备视频
+     * @return 结果
+     */
+    public int updateTbAssetVideo(TbAssetVideo tbAssetVideo);
+
+    /**
+     * 删除设备视频
+     * 
+     * @param id 设备视频主键
+     * @return 结果
+     */
+    public int deleteTbAssetVideoById(Long id);
+
+    /**
+     * 批量删除设备视频
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTbAssetVideoByIds(Long[] ids);
+}

lab-admin/src/main/java/com/ruoyi/asset/mapper/TbDemoVideoMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.asset.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.asset.domain.TbDemoVideo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 演示视频Mapper接口
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+@Mapper
+public interface TbDemoVideoMapper extends BaseMapper<TbDemoVideo>
+{
+    /**
+     * 查询演示视频
+     * 
+     * @param id 演示视频主键
+     * @return 演示视频
+     */
+    public TbDemoVideo selectTbDemoVideoById(Long id);
+
+    /**
+     * 查询演示视频列表
+     * 
+     * @param tbDemoVideo 演示视频
+     * @return 演示视频集合
+     */
+    public List<TbDemoVideo> selectTbDemoVideoList(TbDemoVideo tbDemoVideo);
+
+    /**
+     * 新增演示视频
+     * 
+     * @param tbDemoVideo 演示视频
+     * @return 结果
+     */
+    public int insertTbDemoVideo(TbDemoVideo tbDemoVideo);
+
+    /**
+     * 修改演示视频
+     * 
+     * @param tbDemoVideo 演示视频
+     * @return 结果
+     */
+    public int updateTbDemoVideo(TbDemoVideo tbDemoVideo);
+
+    /**
+     * 删除演示视频
+     * 
+     * @param id 演示视频主键
+     * @return 结果
+     */
+    public int deleteTbDemoVideoById(Long id);
+
+    /**
+     * 批量删除演示视频
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTbDemoVideoByIds(Long[] ids);
+}

lab-admin/src/main/java/com/ruoyi/asset/service/ITbAssetVideoService.java

@@ -0,0 +1,81 @@
+package com.ruoyi.asset.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.asset.domain.TbAssetVideo;
+import com.ruoyi.asset.domain.dto.BatchTbAssetVideoDTO;
+import com.ruoyi.asset.domain.dto.TbAssetVideoDTO;
+
+/**
+ * 设备视频Service接口
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+public interface ITbAssetVideoService extends IService<TbAssetVideo>
+{
+    /**
+     * 查询设备视频
+     * 
+     * @param id 设备视频主键
+     * @return 设备视频
+     */
+    public TbAssetVideo selectTbAssetVideoById(Long id);
+
+    /**
+     * 查询设备视频列表
+     * 
+     * @param tbAssetVideo 设备视频
+     * @return 设备视频集合
+     */
+    public List<TbAssetVideo> selectTbAssetVideoList(TbAssetVideo tbAssetVideo);
+
+    /**
+     * 查询设备视频列表
+     *
+     * @param tbAssetVideo 设备视频
+     * @return 设备视频集合
+     */
+    public List<TbAssetVideoDTO> selectTbAssetVideoList2(TbAssetVideo tbAssetVideo);
+
+    /**
+     * 新增设备视频
+     * 
+     * @param tbAssetVideo 设备视频
+     * @return 结果
+     */
+    public int insertTbAssetVideo(TbAssetVideo tbAssetVideo);
+
+    /**
+     * 批量新增设备视频
+     *
+     * @param batchTbAssetVideoDTO 多个设备视频
+     * @return 结果
+     */
+    public boolean batchInsertTbAssetVideo(BatchTbAssetVideoDTO batchTbAssetVideoDTO);
+
+    /**
+     * 修改设备视频
+     * 
+     * @param tbAssetVideo 设备视频
+     * @return 结果
+     */
+    public int updateTbAssetVideo(TbAssetVideo tbAssetVideo);
+
+    /**
+     * 批量删除设备视频
+     * 
+     * @param ids 需要删除的设备视频主键集合
+     * @return 结果
+     */
+    public int deleteTbAssetVideoByIds(Long[] ids);
+
+    /**
+     * 删除设备视频信息
+     * 
+     * @param id 设备视频主键
+     * @return 结果
+     */
+    public int deleteTbAssetVideoById(Long id);
+}

lab-admin/src/main/java/com/ruoyi/asset/service/ITbDemoVideoService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.asset.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.asset.domain.TbDemoVideo;
+
+/**
+ * 演示视频Service接口
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+public interface ITbDemoVideoService extends IService<TbDemoVideo>
+{
+    /**
+     * 查询演示视频
+     * 
+     * @param id 演示视频主键
+     * @return 演示视频
+     */
+    public TbDemoVideo selectTbDemoVideoById(Long id);
+
+    /**
+     * 查询演示视频列表
+     * 
+     * @param tbDemoVideo 演示视频
+     * @return 演示视频集合
+     */
+    public List<TbDemoVideo> selectTbDemoVideoList(TbDemoVideo tbDemoVideo);
+
+    /**
+     * 新增演示视频
+     * 
+     * @param tbDemoVideo 演示视频
+     * @return 结果
+     */
+    public int insertTbDemoVideo(TbDemoVideo tbDemoVideo);
+
+    /**
+     * 修改演示视频
+     * 
+     * @param tbDemoVideo 演示视频
+     * @return 结果
+     */
+    public int updateTbDemoVideo(TbDemoVideo tbDemoVideo);
+
+    /**
+     * 批量删除演示视频
+     * 
+     * @param ids 需要删除的演示视频主键集合
+     * @return 结果
+     */
+    public int deleteTbDemoVideoByIds(Long[] ids);
+
+    /**
+     * 删除演示视频信息
+     * 
+     * @param id 演示视频主键
+     * @return 结果
+     */
+    public int deleteTbDemoVideoById(Long id);
+}

lab-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetVideoServiceImpl.java

@@ -0,0 +1,163 @@
+package com.ruoyi.asset.service.impl;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.asset.domain.TbAsset;
+import com.ruoyi.asset.domain.TbDemoVideo;
+import com.ruoyi.asset.domain.dto.BatchTbAssetVideoDTO;
+import com.ruoyi.asset.domain.dto.TbAssetVideoDTO;
+import com.ruoyi.asset.mapper.TbAssetMapper;
+import com.ruoyi.asset.mapper.TbDemoVideoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.asset.mapper.TbAssetVideoMapper;
+import com.ruoyi.asset.domain.TbAssetVideo;
+import com.ruoyi.asset.service.ITbAssetVideoService;
+
+import javax.annotation.Resource;
+
+/**
+ * 设备视频Service业务层处理
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+@Service
+public class TbAssetVideoServiceImpl extends ServiceImpl<TbAssetVideoMapper, TbAssetVideo> implements ITbAssetVideoService
+{
+    @Autowired
+    private TbAssetVideoMapper tbAssetVideoMapper;
+
+    @Resource
+    private TbAssetMapper tbAssetMapper;
+
+    @Resource
+    private TbDemoVideoMapper tbDemoVideoMapper;
+
+    /**
+     * 查询设备视频
+     * 
+     * @param id 设备视频主键
+     * @return 设备视频
+     */
+    @Override
+    public TbAssetVideo selectTbAssetVideoById(Long id)
+    {
+        return tbAssetVideoMapper.selectTbAssetVideoById(id);
+    }
+
+    /**
+     * 查询设备视频列表
+     * 
+     * @param tbAssetVideo 设备视频
+     * @return 设备视频
+     */
+    @Override
+    public List<TbAssetVideo> selectTbAssetVideoList(TbAssetVideo tbAssetVideo)
+    {
+        return tbAssetVideoMapper.selectTbAssetVideoList(tbAssetVideo);
+    }
+
+    /**
+     * 查询设备视频列表
+     *
+     * @param tbAssetVideo 设备视频
+     * @return 设备视频
+     */
+    @Override
+    public List<TbAssetVideoDTO> selectTbAssetVideoList2(TbAssetVideo tbAssetVideo)
+    {
+        ArrayList<TbAssetVideoDTO> videoDTOS = new ArrayList<>();
+        List<TbAssetVideo> tbAssetVideos = tbAssetVideoMapper.selectTbAssetVideoList(tbAssetVideo);
+        List<TbAssetVideo> collect = tbAssetVideos.stream().sorted(Comparator.comparing(TbAssetVideo::getAssetBarCode)).collect(Collectors.toList());
+        for (TbAssetVideo assetVideo : collect) {
+            Long demoVideoId = assetVideo.getDemoVideoId();
+            TbDemoVideo tbDemoVideo = tbDemoVideoMapper.selectTbDemoVideoById(demoVideoId);
+
+            TbAssetVideoDTO tbAssetVideoDTO = BeanUtil.toBean(assetVideo, TbAssetVideoDTO.class);
+            tbAssetVideoDTO.setTbDemoVideo(tbDemoVideo);
+            videoDTOS.add(tbAssetVideoDTO);
+        }
+
+        return videoDTOS;
+    }
+
+    /**
+     * 新增设备视频
+     * 
+     * @param tbAssetVideo 设备视频
+     * @return 结果
+     */
+    @Override
+    public int insertTbAssetVideo(TbAssetVideo tbAssetVideo)
+    {
+        return tbAssetVideoMapper.insertTbAssetVideo(tbAssetVideo);
+    }
+
+    @Override
+    public boolean batchInsertTbAssetVideo(BatchTbAssetVideoDTO batchTbAssetVideoDTO) {
+        List<String> assetBarCodes = batchTbAssetVideoDTO.getAssetBarCodes();
+        List<Long> videoIds = batchTbAssetVideoDTO.getVideoIds();
+        if (assetBarCodes.isEmpty() || videoIds.isEmpty()) {
+            return false;
+        }
+        for (String assetBarCode : assetBarCodes) {
+            TbAsset tbAsset = tbAssetMapper.selectTbAssetByBarCode(assetBarCode);
+            if (tbAsset == null) {
+               continue;
+            }
+            for (Long videoId : videoIds) {
+                TbDemoVideo tbDemoVideo = tbDemoVideoMapper.selectTbDemoVideoById(videoId);
+                if (tbDemoVideo == null) {
+                    continue;
+                }
+                Integer count = query().eq("asset_bar_code", assetBarCode).eq("demo_video_id", videoId).count();
+                if (count < 1) {
+                    tbAssetVideoMapper.insertTbAssetVideo(new TbAssetVideo(assetBarCode, videoId));
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 修改设备视频
+     * 
+     * @param tbAssetVideo 设备视频
+     * @return 结果
+     */
+    @Override
+    public int updateTbAssetVideo(TbAssetVideo tbAssetVideo)
+    {
+        return tbAssetVideoMapper.updateTbAssetVideo(tbAssetVideo);
+    }
+
+    /**
+     * 批量删除设备视频
+     * 
+     * @param ids 需要删除的设备视频主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbAssetVideoByIds(Long[] ids)
+    {
+        return tbAssetVideoMapper.deleteTbAssetVideoByIds(ids);
+    }
+
+    /**
+     * 删除设备视频信息
+     * 
+     * @param id 设备视频主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbAssetVideoById(Long id)
+    {
+        return tbAssetVideoMapper.deleteTbAssetVideoById(id);
+    }
+}

lab-admin/src/main/java/com/ruoyi/asset/service/impl/TbDemoVideoServiceImpl.java

@@ -0,0 +1,98 @@
+package com.ruoyi.asset.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.asset.mapper.TbDemoVideoMapper;
+import com.ruoyi.asset.domain.TbDemoVideo;
+import com.ruoyi.asset.service.ITbDemoVideoService;
+
+/**
+ * 演示视频Service业务层处理
+ * 
+ * @author 原动力
+ * @date 2023-05-06
+ */
+@Service
+public class TbDemoVideoServiceImpl extends ServiceImpl<TbDemoVideoMapper, TbDemoVideo> implements ITbDemoVideoService
+{
+    @Autowired
+    private TbDemoVideoMapper tbDemoVideoMapper;
+
+    /**
+     * 查询演示视频
+     * 
+     * @param id 演示视频主键
+     * @return 演示视频
+     */
+    @Override
+    public TbDemoVideo selectTbDemoVideoById(Long id)
+    {
+        return tbDemoVideoMapper.selectTbDemoVideoById(id);
+    }
+
+    /**
+     * 查询演示视频列表
+     * 
+     * @param tbDemoVideo 演示视频
+     * @return 演示视频
+     */
+    @Override
+    public List<TbDemoVideo> selectTbDemoVideoList(TbDemoVideo tbDemoVideo)
+    {
+        return tbDemoVideoMapper.selectTbDemoVideoList(tbDemoVideo);
+    }
+
+    /**
+     * 新增演示视频
+     * 
+     * @param tbDemoVideo 演示视频
+     * @return 结果
+     */
+    @Override
+    public int insertTbDemoVideo(TbDemoVideo tbDemoVideo)
+    {
+        tbDemoVideo.setCreateTime(DateUtils.getNowDate());
+        return tbDemoVideoMapper.insertTbDemoVideo(tbDemoVideo);
+    }
+
+    /**
+     * 修改演示视频
+     * 
+     * @param tbDemoVideo 演示视频
+     * @return 结果
+     */
+    @Override
+    public int updateTbDemoVideo(TbDemoVideo tbDemoVideo)
+    {
+        tbDemoVideo.setUpdateTime(DateUtils.getNowDate());
+        return tbDemoVideoMapper.updateTbDemoVideo(tbDemoVideo);
+    }
+
+    /**
+     * 批量删除演示视频
+     * 
+     * @param ids 需要删除的演示视频主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbDemoVideoByIds(Long[] ids)
+    {
+        return tbDemoVideoMapper.deleteTbDemoVideoByIds(ids);
+    }
+
+    /**
+     * 删除演示视频信息
+     * 
+     * @param id 演示视频主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbDemoVideoById(Long id)
+    {
+        return tbDemoVideoMapper.deleteTbDemoVideoById(id);
+    }
+}

lab-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: E:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -74,7 +74,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 1
+    database: 0
     # 密码
     password: foobared
     # 连接超时时间

lab-admin/src/main/resources/mapper/asset/TbAssetVideoMapper.xml

@@ -0,0 +1,61 @@
+<?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.ruoyi.asset.mapper.TbAssetVideoMapper">
+
+    <resultMap type="TbAssetVideo" id="TbAssetVideoResult">
+        <result property="id"    column="id"    />
+        <result property="assetBarCode"    column="asset_bar_code"    />
+        <result property="demoVideoId"    column="demo_video_id"    />
+    </resultMap>
+
+    <sql id="selectTbAssetVideoVo">
+        select id, asset_bar_code, demo_video_id from tb_asset_video
+    </sql>
+
+    <select id="selectTbAssetVideoList" parameterType="TbAssetVideo" resultMap="TbAssetVideoResult">
+        <include refid="selectTbAssetVideoVo"/>
+        <where>
+            <if test="assetBarCode != null  and assetBarCode != ''"> and asset_bar_code = #{assetBarCode}</if>
+            <if test="demoVideoId != null "> and demo_video_id = #{demoVideoId}</if>
+        </where>
+    </select>
+
+    <select id="selectTbAssetVideoById" parameterType="Long" resultMap="TbAssetVideoResult">
+        <include refid="selectTbAssetVideoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTbAssetVideo" parameterType="TbAssetVideo" useGeneratedKeys="true" keyProperty="id">
+        insert into tb_asset_video
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="assetBarCode != null and assetBarCode != ''">asset_bar_code,</if>
+            <if test="demoVideoId != null">demo_video_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="assetBarCode != null and assetBarCode != ''">#{assetBarCode},</if>
+            <if test="demoVideoId != null">#{demoVideoId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTbAssetVideo" parameterType="TbAssetVideo">
+        update tb_asset_video
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="assetBarCode != null and assetBarCode != ''">asset_bar_code = #{assetBarCode},</if>
+            <if test="demoVideoId != null">demo_video_id = #{demoVideoId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTbAssetVideoById" parameterType="Long">
+        delete from tb_asset_video where id = #{id}
+    </delete>
+
+    <delete id="deleteTbAssetVideoByIds" parameterType="String">
+        delete from tb_asset_video where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

lab-admin/src/main/resources/mapper/asset/TbDemoVideoMapper.xml

@@ -0,0 +1,90 @@
+<?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.ruoyi.asset.mapper.TbDemoVideoMapper">
+    
+    <resultMap type="TbDemoVideo" id="TbDemoVideoResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="type"    column="type"    />
+        <result property="size"    column="size"    />
+        <result property="url"    column="url"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectTbDemoVideoVo">
+        select id, name, type, size, url, remark, create_by, create_time, update_by, update_time from tb_demo_video
+    </sql>
+
+    <select id="selectTbDemoVideoList" parameterType="TbDemoVideo" resultMap="TbDemoVideoResult">
+        <include refid="selectTbDemoVideoVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="size != null  and size != ''"> and size &lt;= #{size}</if>
+        </where>
+    </select>
+    
+    <select id="selectTbDemoVideoById" parameterType="Long" resultMap="TbDemoVideoResult">
+        <include refid="selectTbDemoVideoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTbDemoVideo" parameterType="TbDemoVideo" useGeneratedKeys="true" keyProperty="id">
+        insert into tb_demo_video
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">name,</if>
+            <if test="type != null and type != ''">type,</if>
+            <if test="size != null and size != ''">size,</if>
+            <if test="url != null and url != ''">url,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="type != null and type != ''">#{type},</if>
+            <if test="size != null and size != ''">#{size},</if>
+            <if test="url != null and url != ''">#{url},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTbDemoVideo" parameterType="TbDemoVideo">
+        update tb_demo_video
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="type != null and type != ''">type = #{type},</if>
+            <if test="size != null and size != ''">size = #{size},</if>
+            <if test="url != null and url != ''">url = #{url},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTbDemoVideoById" parameterType="Long">
+        delete from tb_demo_video where id = #{id}
+    </delete>
+
+    <delete id="deleteTbDemoVideoByIds" parameterType="String">
+        delete from tb_demo_video where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

lab-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

@@ -118,6 +118,14 @@ public class RuoYiConfig
     }
 
     /**
+     * 获取视频上传路径
+     */
+    public static String getVideoPath()
+    {
+        return getProfile() + "/video";
+    }
+
+    /**
      * 获取下载路径
      */
     public static String getDownloadPath()

lab-common/src/main/java/com/ruoyi/common/utils/ByteUtils.java

@@ -0,0 +1,94 @@
+package com.ruoyi.common.utils;
+
+/**
+ * 字节转换工具类
+ */
+public class ByteUtils {
+    private static final int UNIT = 1024;
+
+    /**
+     * 格式化字节大小
+     *
+     * @param byteSize 字节大小
+     * @return 格式化后字符串
+     */
+    public static String formatByteSize(long byteSize) {
+        if (byteSize <= -1) {
+            return String.valueOf(byteSize);
+        }
+
+        double size = 1.0 * byteSize;
+
+        String type = "B";
+        // 不足1KB
+        if ((int) Math.floor(size / UNIT) <= 0) {
+            type = "B";
+            return format(size, type);
+        }
+
+        size = size / UNIT;
+        // 不足1MB
+        if ((int) Math.floor(size / UNIT) <= 0) {
+            type = "KB";
+            return format(size, type);
+        }
+
+        size = size / UNIT;
+        // 不足1GB
+        if ((int) Math.floor(size / UNIT) <= 0) {
+            type = "MB";
+            return format(size, type);
+        }
+
+        size = size / UNIT;
+        // 不足1TB
+        if ((int) Math.floor(size / UNIT) <= 0) {
+            type = "GB";
+            return format(size, type);
+        }
+
+        size = size / UNIT;
+        // 不足1PB
+        if ((int) Math.floor(size / UNIT) <= 0) {
+            type = "TB";
+            return format(size, type);
+        }
+
+        return ">PB";
+    }
+
+    /**
+     * 格式化字节大小为指定单位
+     *
+     * @param size 字节大小
+     * @param type 单位类型
+     * @return 字符串
+     */
+    private static String format(double size, String type) {
+        int precision = 0;
+
+        if (size * 1000 % 10 > 0) {
+            precision = 3;
+        } else if (size * 100 % 10 > 0) {
+            precision = 2;
+        } else if (size * 10 % 10 > 0) {
+            precision = 1;
+        }
+
+        String formatStr = "%." + precision + "f";
+
+        if ("KB".equals(type)) {
+            return String.format(formatStr, (size)) + "KB";
+        } else if ("MB".equals(type)) {
+            return String.format(formatStr, (size)) + "MB";
+        } else if ("GB".equals(type)) {
+            return String.format(formatStr, (size)) + "GB";
+        } else if ("TB".equals(type)) {
+            return String.format(formatStr, (size)) + "TB";
+        } else if ("PB".equals(type)) {
+            return String.format(formatStr, (size)) + "PB";
+        }
+
+        return String.format(formatStr, (size)) + "B";
+    }
+}

lab-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -23,9 +23,9 @@ import com.ruoyi.common.utils.uuid.Seq;
 public class FileUploadUtils
 {
     /**
-     * 默认大小 50M
+     * 默认大小 50M 修改为 1GB
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 1024 * 1024 * 1024; // 50 * 1024 * 1024
 
     /**
      * 默认的文件名最大长度 100

lab-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -109,7 +109,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage", "/asset/demoVideo/player**").anonymous()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

lab-ui/package.json

@@ -77,6 +77,7 @@
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",
+    "video.js": "^8.3.0",
     "vue-template-compiler": "2.6.12"
   },
   "engines": {

lab-ui/src/api/asset/assetVideo.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询设备视频列表
+export function listAssetVideo(query) {
+  return request({
+    url: '/asset/assetVideo/list2',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备视频详细
+export function getAssetVideo(id) {
+  return request({
+    url: '/asset/assetVideo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增设备视频
+export function addAssetVideo(data) {
+  return request({
+    url: '/asset/assetVideo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量新增设备视频
+export function batchAddAssetVideo(data) {
+  return request({
+    url: '/asset/assetVideo/batch',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备视频
+export function updateAssetVideo(data) {
+  return request({
+    url: '/asset/assetVideo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备视频
+export function delAssetVideo(id) {
+  return request({
+    url: '/asset/assetVideo/' + id,
+    method: 'delete'
+  })
+}

lab-ui/src/api/asset/demoVideo.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询演示视频列表
+export function listDemoVideo(query) {
+  return request({
+    url: '/asset/demoVideo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// searchList
+// 查询演示视频列表
+export function searchDemoVideo(query) {
+  return request({
+    url: '/asset/demoVideo/searchList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询演示视频详细
+export function getDemoVideo(id) {
+  return request({
+    url: '/asset/demoVideo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增演示视频
+export function addDemoVideo(data) {
+  return request({
+    url: '/asset/demoVideo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改演示视频
+export function updateDemoVideo(data) {
+  return request({
+    url: '/asset/demoVideo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除演示视频
+export function delDemoVideo(id) {
+  return request({
+    url: '/asset/demoVideo/' + id,
+    method: 'delete'
+  })
+}
+
+export function uploadVideo() {
+  return `${process.env.VUE_APP_BASE_API}/asset/demoVideo/upload`
+}
+
+export function playerVideo(url) {
+  return `${process.env.VUE_APP_BASE_API}/asset/demoVideo/player?name=${url}`
+}

lab-ui/src/components/AssetDiveo/index.vue

@@ -0,0 +1,164 @@
+<template>
+  <div class="container">
+    <div class="" v-if="!assetData">
+      <h3>设备列表</h3>
+      <div class="search">
+        <el-input
+          v-if="assetData.length < 1"
+          placeholder="请输入设备名称"
+          suffix-icon="el-icon-search"
+          v-model="assetKey">
+        </el-input>
+      </div>
+      <div class="list">
+        <div v-for="asset in assetList" :key="asset.id">{{asset.barCode}}</div>
+      </div>
+    </div>
+    <div class="" v-else>
+      <div class="search" style="margin-top: -20px">
+        <el-input
+          v-if="videoData.length < 1"
+          placeholder="请输入视频名称"
+          suffix-icon="el-icon-search"
+          @input="onVideoSearch"
+          v-model="videoKey">
+        </el-input>
+      </div>
+      <h3>视频列表</h3>
+      <div class="list">
+        <el-checkbox-group v-model="videoIds" @change="handleCheckedVideoChange">
+          <el-checkbox v-for="video in videoList" :label="video.id" :key="video.id" style="width: 100%;padding: 5px 0;">
+            <div class="video" @click="onPlayer(video)">
+              {{video.id}}.&nbsp;{{video.name}}
+            </div>
+          </el-checkbox>
+        </el-checkbox-group>
+      </div>
+    </div>
+    <div class="btn">
+      <el-button type="primary" @click="onSave">保存</el-button>
+    </div>
+    
+    <!-- 上传演示视频对话框 -->
+    <el-dialog :title="videoName" :visible.sync="openPlayer" width="645px" append-to-body style="text-align: center;">
+      <div>
+        <VideoPlayer :options="videoOptions" v-if="openPlayer"/>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDemoVideo, searchDemoVideo } from '@/api/asset/demoVideo.js'
+import { batchAddAssetVideo } from '@/api/asset/assetVideo.js'
+import { playerVideo } from "@/api/asset/demoVideo";
+export default {
+  name: 'AssetVideo',
+  props: {
+    assetData: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    videoData: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      assetKey: '',
+      videoKey: '',
+      assetList: [],
+      videoList: [],
+      assetIds: [],
+      videoIds: [],
+      videoQueryParam: {
+        videoKey: ''
+      },
+      // 视频
+      openPlayer: false,
+      videoName: '',
+      videoOptions: {}
+    }
+  },
+  components: {
+    VideoPlayer: () => import('@/components/VideoPlayer/index.vue')
+  },
+  methods: {
+    async onVideoSearch(value) {
+      this.videoQueryParam.videoKey = value
+      if (value.length) {
+        const res = await searchDemoVideo(this.videoQueryParam)
+        this.videoList = res.data
+      }
+    },
+    // 保存按钮
+    onSave() {
+      const data = {
+        assetBarCodes: this.assetIds,
+        videoIds: this.videoIds
+      }
+      batchAddAssetVideo(data).then(res => {
+        this.$bus.$emit('bindingVideo', 1)
+        console.log('发布成功')
+        this.$modal.msgSuccess("新增成功");
+      })
+    },
+    // 播放视频
+    onPlayer(video) {
+      this.videoName = '正在播放：' + video.name
+      const videoURL = playerVideo(video.url)
+      this.videoOptions = {
+        autoplay: false,
+        controls: true,
+        language: 'zh-CN', // 设置语言
+        width: 600,
+        sources: [
+          {
+            src: videoURL,
+            type: video.type
+          }
+        ]
+      }
+      this.openPlayer = true
+    },
+    onPlayerURL(url) {
+      return playerVideo(url)
+    },
+    handleCheckedVideoChange(value) {
+      this.videoIds = value
+    }
+  },
+  created() {
+    if (this.assetData.length) {
+      this.assetIds = this.assetData.map(item => item.barCode)
+      listDemoVideo({pageNum: 1, pageSize: 20,}).then(res => {
+        if (res.code === 200) {
+          this.videoList = res.rows
+        }
+      })
+    }
+    if (this.videoData.length) {
+      this.videoIds = this.assetIds.map(item => item.id)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container{
+  min-height: 100px;
+}
+.list{
+  margin-top: 20px;
+}
+.btn {
+  margin-top: 30px;
+  width: 100%;
+  text-align: center;
+}
+</style>

lab-ui/src/components/VideoPlayer/index.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="container">
+    <video ref="videoPlayer" class="video-js"></video>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'VideoPlayer',
+  props: {
+    options: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      player: null
+    }
+  },
+  mounted() {
+    this.player = this.$video(this.$refs.videoPlayer, this.options, () => {
+      this.player.log('onPlayerReady', this)
+    })
+  },
+  beforeDestroy() {
+    if (this.player) {
+      this.player.dispose()
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+</style>

lab-ui/src/main.js

@@ -40,6 +40,12 @@ import DictData from '@/components/DictData'
 // 引入echarts
 import echarts from 'echarts'
 
+import Videojs from 'video.js'
+import video_zhCN from 'video.js/dist/lang/zh-CN.json'
+ 
+import 'video.js/dist/video-js.css'
+
+Videojs.addLanguage('zh-CN', video_zhCN)
 
 
 // 全局方法挂载
@@ -54,6 +60,8 @@ Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.$echarts = echarts
 
+Vue.prototype.$video = Videojs
+
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
 Vue.component('Pagination', Pagination)
@@ -87,5 +95,8 @@ new Vue({
   el: '#app',
   router,
   store,
+  beforeCreate() {
+    Vue.prototype.$bus = this
+  },
   render: h => h(App)
 })

lab-ui/src/views/asset/asset/index.vue

@@ -192,6 +192,17 @@
           v-hasPermi="['asset:asset:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-link"
+          size="mini"
+          :disabled="multiple"
+          @click="handleBinding"
+          v-hasPermi="['asset:asset:add']"
+        >绑定视频</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -411,6 +422,12 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+
+    
+    <!-- 批量添加设备视频对话框 -->
+    <el-dialog :title="title" :visible.sync="openBanding" width="700px" append-to-body>
+      <AssetVideoAdd v-if="openBanding" :assetData="assetData"/>
+    </el-dialog>
   </div>
 </template>
 
@@ -522,11 +539,25 @@ export default {
         url: process.env.VUE_APP_BASE_API + "/asset/asset/importData" // todo
       },
       tempValueOptions:[],
+      // 选中的设备
+      assetData: [],
+      openBanding: false
     };
   },
   created() {
     this.initData();
   },
+  mounted() {
+    this.$bus.$on('bindingVideo', (val) => {
+      if (val) {
+        console.log('订阅成功')
+        this.openBanding = false
+      }
+    })
+  },
+  beforeDestroy() {
+    this.$bus.$off('bindingVideo')
+  },
   methods: {
     /** 初始化数据 */
     initData() {
@@ -631,6 +662,8 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      // 新增绑定视频
+      this.assetData = selection
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -716,7 +749,16 @@ export default {
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
+    },
+
+    // 绑定视频
+    handleBinding() {
+      this.title = "绑定视频"
+      this.openBanding = true
     }
-  }
+  },
+  components: {
+    AssetVideoAdd: () => import('@/components/AssetDiveo/index.vue')
+  },
 };
 </script>

lab-ui/src/views/asset/assetVideo/index.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备条形码" prop="assetBarCode">
+        <el-input
+          v-model="queryParams.assetBarCode"
+          placeholder="请输入设备条形码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="演示视频编号" prop="demoVideoId">
+        <el-input
+          v-model="queryParams.demoVideoId"
+          placeholder="请输入演示视频编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['asset:assetVideo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['asset:assetVideo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['asset:assetVideo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['asset:assetVideo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="assetVideoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="编号" align="center" prop="id" /> -->
+      <el-table-column label="设备条形码" align="center" prop="assetBarCode" />
+      <el-table-column label="演示视频名称" align="center" prop="tbDemoVideo.name" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['asset:assetVideo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['asset:assetVideo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改设备视频对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备条形码" prop="assetBarCode">
+          <el-input v-model="form.assetBarCode" placeholder="请输入设备条形码" />
+        </el-form-item>
+        <el-form-item label="演示视频编号" prop="demoVideoId">
+          <el-input v-model="form.demoVideoId" placeholder="请输入演示视频编号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAssetVideo, getAssetVideo, delAssetVideo, addAssetVideo, updateAssetVideo, batchAddAssetVideo } from "@/api/asset/assetVideo";
+
+export default {
+  name: "AssetVideo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备视频表格数据
+      assetVideoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        assetBarCode: null,
+        demoVideoId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        assetBarCode: [
+          { required: true, message: "设备条形码不能为空", trigger: "blur" }
+        ],
+        demoVideoId: [
+          { required: true, message: "演示视频编号不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备视频列表 */
+    getList() {
+      this.loading = true;
+      listAssetVideo(this.queryParams).then(response => {
+        this.assetVideoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        assetBarCode: null,
+        demoVideoId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备视频";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAssetVideo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备视频";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAssetVideo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAssetVideo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除设备视频编号为"' + ids + '"的数据项？').then(function() {
+        return delAssetVideo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('asset/assetVideo/export', {
+        ...this.queryParams
+      }, `assetVideo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

lab-ui/src/views/asset/demoVideo/index.vue

@@ -0,0 +1,413 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="视频名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入视频名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="视频大小" prop="size">
+        <el-input
+          v-model="queryParams.size"
+          placeholder="请输入视频大小"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-upload"
+          size="mini"
+          @click="handleUpload"
+          v-hasPermi="['asset:demoVideo:add']"
+        >上传</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['asset:demoVideo:add']"
+        >新增</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['asset:demoVideo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['asset:demoVideo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['asset:demoVideo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="demoVideoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="视频名称" align="center" prop="name">
+        <template slot-scope="scope">
+          <a style="color: #409EFF" @click="onPlayer(scope.row)">{{scope.row.name}}</a>
+        </template>
+      </el-table-column>
+      <el-table-column label="视频类型" align="center" prop="type" />
+      <el-table-column label="视频大小" align="center" prop="size" />
+      <el-table-column label="视频位置" align="center" prop="url" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['asset:demoVideo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['asset:demoVideo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 上传演示视频对话框 -->
+    <el-dialog :title="videoName" :visible.sync="openPlayer" width="645px" append-to-body style="text-align: center;">
+      <div>
+        <VideoPlayer :options="videoOptions" v-if="openPlayer"/>
+      </div>
+    </el-dialog>
+
+    <!-- 上传演示视频对话框 -->
+    <el-dialog :title="title" :visible.sync="openUpload" width="500px" append-to-body style="text-align: center;">
+      <el-upload
+          class="upload-demo"
+          drag
+          :action="onUploadAction()"
+          :headers="{Authorization}"
+          :auto-upload="false"
+          :multiple="false"
+          :limit="1"
+          accept="video/*"
+          ref="upload"
+          :on-change="onUploadChange"
+          :on-remove="onUploadRemove"
+          :on-success="onUploadSuccess"
+          :on-error="onUploadError"
+          :file-list="fileList">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将视频文件拖到此处，或<em>点击上传</em></div>
+        </el-upload>
+        <el-button size="small" type="primary" :disabled="fileList.length <= 0" @click="onUpload">确认上传</el-button>
+    </el-dialog>
+
+    <!-- 添加或修改演示视频对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="视频名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入视频名称" />
+        </el-form-item>
+        <el-form-item label="视频大小" prop="size">
+          <el-input v-model="form.size" placeholder="请输入视频大小" />
+        </el-form-item>
+        <el-form-item label="视频位置" prop="url">
+          <el-input v-model="form.url" placeholder="请输入视频位置" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDemoVideo, getDemoVideo, delDemoVideo, addDemoVideo, updateDemoVideo, uploadVideo, playerVideo } from "@/api/asset/demoVideo";
+import { getToken } from '@/utils/auth'
+export default {
+  name: "DemoVideo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 演示视频表格数据
+      demoVideoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        type: null,
+        size: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "视频名称不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "视频类型不能为空", trigger: "change" }
+        ],
+        size: [
+          { required: true, message: "视频大小不能为空", trigger: "blur" }
+        ],
+        url: [
+          { required: true, message: "视频位置不能为空", trigger: "blur" }
+        ],
+      },
+      openUpload: false,
+      Authorization: 'Bearer ' + getToken(),
+      fileList: [],
+      openPlayer: false,
+      videoName: '',
+      videoOptions: {}
+    };
+  },
+  components: {
+    VideoPlayer: () => import('@/components/VideoPlayer/index.vue')
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询演示视频列表 */
+    getList() {
+      this.loading = true;
+      listDemoVideo(this.queryParams).then(response => {
+        this.demoVideoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        type: null,
+        size: null,
+        url: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 上传按钮操作 */
+    handleUpload() {
+      this.reset();
+      this.openUpload = true;
+      this.title = "上传演示视频";
+    },
+    // 文件上传路径
+    onUploadAction() {
+      return uploadVideo()
+    },
+    // 文件改变时
+    onUploadChange(file, fileList) {
+      this.fileList = fileList
+    },
+    // 文件移除时
+    onUploadRemove(file, fileList) {
+      this.fileList = fileList
+    },
+    // 文件上传成功时
+    onUploadSuccess(res) {
+      if (res.code === 200) {
+        this.$refs.upload.clearFiles()
+        this.fileList = []
+        this.getList();
+        this.$notify({
+          title: '成功',
+          message: res.message,
+          type: 'success'
+        })
+      } else {
+        this.$notify({
+          title: '失败',
+          message: res.message,
+          type: 'warning'
+        })
+      }
+      this.openUpload = false
+    },
+    // 文件上传失败时
+    onUploadError(err) {
+      this.$notify.error({
+        title: '错误',
+        message: err.message
+      })
+    },
+    // 文件确认上传
+    onUpload() {
+      this.$refs.upload.submit()
+    },
+
+    // 播放视频
+    onPlayer(row) {
+      this.videoName = '正在播放：' + row.name
+      const videoURL = playerVideo(row.url)
+      this.videoOptions = {
+        autoplay: false,
+        controls: true,
+        language: 'zh-CN', // 设置语言
+        width: 600,
+        sources: [
+          {
+            src: videoURL,
+            type: row.type
+          }
+        ]
+      }
+      this.openPlayer = true
+    },
+    onPlayerURL(url) {
+      return playerVideo(url)
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加演示视频";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getDemoVideo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改演示视频";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDemoVideo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDemoVideo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除演示视频编号为"' + ids + '"的数据项？').then(function() {
+        return delDemoVideo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('asset/demoVideo/export', {
+        ...this.queryParams
+      }, `demoVideo_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

lab-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.103:8080`,
+        target: `http://192.168.0.101:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''