feat:trans record

smsb-modules/smsb-source/src/main/java/com/inspur/source/controller/SmsbMinioTransRecordController.java

@@ -0,0 +1,96 @@
+package com.inspur.source.controller;
+
+import java.util.List;
+
+import com.inspur.source.domain.bo.SmsbMinioTransRecordBo;
+import com.inspur.source.domain.vo.SmsbMinioTransRecordVo;
+import com.inspur.source.service.ISmsbMinioTransRecordService;
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 文件转码（压缩）历史记录
+ *
+ * @author Lion Li
+ * @date 2025-02-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/minio/transRecord")
+public class SmsbMinioTransRecordController extends BaseController {
+
+    private final ISmsbMinioTransRecordService smsbMinioTransRecordService;
+
+    /**
+     * 查询文件转码（压缩）历史记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<SmsbMinioTransRecordVo> list(SmsbMinioTransRecordBo bo, PageQuery pageQuery) {
+        return smsbMinioTransRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出文件转码（压缩）历史记录列表
+     */
+    @Log(title = "文件转码历史记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SmsbMinioTransRecordBo bo, HttpServletResponse response) {
+        List<SmsbMinioTransRecordVo> list = smsbMinioTransRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "文件转码（压缩）历史记录", SmsbMinioTransRecordVo.class, response);
+    }
+
+    /**
+     * 获取文件转码历史记录详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<SmsbMinioTransRecordVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(smsbMinioTransRecordService.queryById(id));
+    }
+
+    /**
+     * 新增文件转码（压缩）历史记录
+     */
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SmsbMinioTransRecordBo bo) {
+        return toAjax(smsbMinioTransRecordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改文件转码（压缩）历史记录
+     */
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SmsbMinioTransRecordBo bo) {
+        return toAjax(smsbMinioTransRecordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除文件转码（压缩）历史记录
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "文件转码历史记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(smsbMinioTransRecordService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

smsb-modules/smsb-source/src/main/java/com/inspur/source/domain/SmsbMinioData.java

@@ -130,5 +130,7 @@ public class SmsbMinioData extends TenantEntity {
      */
     private Long marketing;
 
+    private String createUser;
+
 
 }

smsb-modules/smsb-source/src/main/java/com/inspur/source/domain/SmsbMinioTransRecord.java

@@ -0,0 +1,61 @@
+package com.inspur.source.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 文件转码（压缩）历史记录对象 smsb_minio_trans_record
+ *
+ * @author Lion Li
+ * @date 2025-02-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("smsb_minio_trans_record")
+public class SmsbMinioTransRecord extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 资源ID
+     */
+    private Long fileId;
+
+    /**
+     * 资源名称
+     */
+    private String fileName;
+
+    /**
+     * 转码类型
+     */
+    private Long transType;
+
+    /**
+     * 转码进度 0-待转 1-进行中 2-结束
+     */
+    private Long transProgress;
+
+    /**
+     * 转码结果 0-待转 1-成功 2-失败
+     */
+    private Long result;
+
+    /**
+     * 用户名
+     */
+    private String createUser;
+
+
+}

smsb-modules/smsb-source/src/main/java/com/inspur/source/domain/bo/SmsbMinioDataBo.java

@@ -60,4 +60,6 @@ public class SmsbMinioDataBo extends BaseEntity {
      * 原名
      */
     private String originalName;
+
+    private String createUser;
 }

smsb-modules/smsb-source/src/main/java/com/inspur/source/domain/bo/SmsbMinioTransRecordBo.java

@@ -0,0 +1,34 @@
+package com.inspur.source.domain.bo;
+
+import com.inspur.source.domain.SmsbMinioTransRecord;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 文件转码（压缩）历史记录业务对象 smsb_minio_trans_record
+ *
+ * @author Lion Li
+ * @date 2025-02-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SmsbMinioTransRecord.class, reverseConvertGenerate = false)
+public class SmsbMinioTransRecordBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 资源ID
+     */
+    private Long fileId;
+
+
+}

smsb-modules/smsb-source/src/main/java/com/inspur/source/domain/vo/SmsbMinioDataVo.java

@@ -98,4 +98,6 @@ public class SmsbMinioDataVo implements Serializable {
      * 码率
      */
     private Integer codeRate;
+
+    private String createUser;
 }

smsb-modules/smsb-source/src/main/java/com/inspur/source/domain/vo/SmsbMinioTransRecordVo.java

@@ -0,0 +1,72 @@
+package com.inspur.source.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.inspur.source.domain.SmsbMinioTransRecord;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文件转码（压缩）历史记录视图对象 smsb_minio_trans_record
+ *
+ * @author Lion Li
+ * @date 2025-02-18
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SmsbMinioTransRecord.class)
+public class SmsbMinioTransRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 资源名称
+     */
+    @ExcelProperty(value = "资源名称")
+    private String fileName;
+
+    /**
+     * 转码类型
+     */
+    @ExcelProperty(value = "转码类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "smsb_trans_type")
+    private Long transType;
+
+    /**
+     * 转码进度 0-待转 1-进行中 2-结束
+     */
+    @ExcelProperty(value = "转码进度 0-待转 1-进行中 2-结束", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "smsb_trans_progress")
+    private Long transProgress;
+
+    /**
+     * 转码结果 0-待转 1-成功 2-失败
+     */
+    @ExcelProperty(value = "转码结果 0-待转 1-成功 2-失败", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "smsb_trans_result")
+    private Long result;
+
+    /**
+     * 用户名
+     */
+    @ExcelProperty(value = "用户名")
+    private String createUser;
+
+    private Date createTime;
+
+
+}

smsb-modules/smsb-source/src/main/java/com/inspur/source/mapper/SmsbMinioTransRecordMapper.java

@@ -0,0 +1,15 @@
+package com.inspur.source.mapper;
+
+import com.inspur.source.domain.SmsbMinioTransRecord;
+import com.inspur.source.domain.vo.SmsbMinioTransRecordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 文件转码（压缩）历史记录Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-02-18
+ */
+public interface SmsbMinioTransRecordMapper extends BaseMapperPlus<SmsbMinioTransRecord, SmsbMinioTransRecordVo> {
+
+}

smsb-modules/smsb-source/src/main/java/com/inspur/source/service/ISmsbMinioTransRecordService.java

@@ -0,0 +1,68 @@
+package com.inspur.source.service;
+
+import com.inspur.source.domain.bo.SmsbMinioTransRecordBo;
+import com.inspur.source.domain.vo.SmsbMinioTransRecordVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 文件转码（压缩）历史记录Service接口
+ *
+ * @author Lion Li
+ * @date 2025-02-18
+ */
+public interface ISmsbMinioTransRecordService {
+
+    /**
+     * 查询文件转码（压缩）历史记录
+     *
+     * @param id 主键
+     * @return 文件转码（压缩）历史记录
+     */
+    SmsbMinioTransRecordVo queryById(Long id);
+
+    /**
+     * 分页查询文件转码（压缩）历史记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 文件转码（压缩）历史记录分页列表
+     */
+    TableDataInfo<SmsbMinioTransRecordVo> queryPageList(SmsbMinioTransRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的文件转码（压缩）历史记录列表
+     *
+     * @param bo 查询条件
+     * @return 文件转码（压缩）历史记录列表
+     */
+    List<SmsbMinioTransRecordVo> queryList(SmsbMinioTransRecordBo bo);
+
+    /**
+     * 新增文件转码（压缩）历史记录
+     *
+     * @param bo 文件转码（压缩）历史记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SmsbMinioTransRecordBo bo);
+
+    /**
+     * 修改文件转码（压缩）历史记录
+     *
+     * @param bo 文件转码（压缩）历史记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SmsbMinioTransRecordBo bo);
+
+    /**
+     * 校验并批量删除文件转码（压缩）历史记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

smsb-modules/smsb-source/src/main/java/com/inspur/source/service/impl/SmsbMinioDataServiceImpl.java

@@ -17,10 +17,12 @@ import com.inspur.source.mapper.SmsbSourceTreeMapper;
 import com.inspur.source.mapper.SmsbSourceTreeRelMapper;
 import com.inspur.source.service.ISmsbMinioDataService;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.mapper.SysOssMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -157,6 +159,7 @@ public class SmsbMinioDataServiceImpl implements ISmsbMinioDataService {
             add.setResolution(sysOssVo.getResolution());
             // validEntityBeforeSave(add);
             add.setValue(ossId.toString());
+            add.setCreateUser(LoginHelper.getLoginUser().getUsername());
             boolean flag = baseMapper.insert(add) > 0;
             if (flag) {
                 bo.setId(add.getId());

smsb-modules/smsb-source/src/main/java/com/inspur/source/service/impl/SmsbMinioTransRecordServiceImpl.java

@@ -0,0 +1,128 @@
+package com.inspur.source.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.inspur.source.domain.SmsbMinioTransRecord;
+import com.inspur.source.domain.bo.SmsbMinioTransRecordBo;
+import com.inspur.source.domain.vo.SmsbMinioTransRecordVo;
+import com.inspur.source.mapper.SmsbMinioTransRecordMapper;
+import com.inspur.source.service.ISmsbMinioTransRecordService;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件转码（压缩）历史记录Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-02-18
+ */
+@RequiredArgsConstructor
+@Service
+public class SmsbMinioTransRecordServiceImpl implements ISmsbMinioTransRecordService {
+
+    private final SmsbMinioTransRecordMapper baseMapper;
+
+    /**
+     * 查询文件转码（压缩）历史记录
+     *
+     * @param id 主键
+     * @return 文件转码（压缩）历史记录
+     */
+    @Override
+    public SmsbMinioTransRecordVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询文件转码（压缩）历史记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 文件转码（压缩）历史记录分页列表
+     */
+    @Override
+    public TableDataInfo<SmsbMinioTransRecordVo> queryPageList(SmsbMinioTransRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SmsbMinioTransRecord> lqw = buildQueryWrapper(bo);
+        Page<SmsbMinioTransRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的文件转码（压缩）历史记录列表
+     *
+     * @param bo 查询条件
+     * @return 文件转码（压缩）历史记录列表
+     */
+    @Override
+    public List<SmsbMinioTransRecordVo> queryList(SmsbMinioTransRecordBo bo) {
+        LambdaQueryWrapper<SmsbMinioTransRecord> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SmsbMinioTransRecord> buildQueryWrapper(SmsbMinioTransRecordBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SmsbMinioTransRecord> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getFileId() != null, SmsbMinioTransRecord::getFileId, bo.getFileId());
+        return lqw;
+    }
+
+    /**
+     * 新增文件转码（压缩）历史记录
+     *
+     * @param bo 文件转码（压缩）历史记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SmsbMinioTransRecordBo bo) {
+        SmsbMinioTransRecord add = MapstructUtils.convert(bo, SmsbMinioTransRecord.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改文件转码（压缩）历史记录
+     *
+     * @param bo 文件转码（压缩）历史记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SmsbMinioTransRecordBo bo) {
+        SmsbMinioTransRecord update = MapstructUtils.convert(bo, SmsbMinioTransRecord.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SmsbMinioTransRecord entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除文件转码（压缩）历史记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

smsb-modules/smsb-source/src/main/resources/mapper/SmsbMinioTransRecordMapper.xml

@@ -0,0 +1,7 @@
+<?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.inspur.source.mapper.SmsbMinioTransRecordMapper">
+
+</mapper>

smsb-modules/smsb-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java

@@ -282,7 +282,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         // 分辨率
         String resolution = "0x0";
         // 视频时长
-        String duration = "0";
+        Integer duration = 0;
         // 视频码率
         Integer codeRate = 0;
         if (fileType == 1) {
@@ -293,13 +293,13 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
             if (StringUtils.isEmpty(videoInfo)) {
                 return;
             }
-            resolution = videoInfo.split(",")[0];
-            codeRate = Integer.parseInt(videoInfo.split(",")[1].split("kbps")[0]);
-            duration = videoInfo.split(",")[2].split("s")[0];
+            resolution = videoInfo.split(",")[0].trim();
+            codeRate = Integer.parseInt(videoInfo.split(",")[1].trim()) / 1000;
+            duration = Integer.parseInt(videoInfo.split(",")[2].trim());
         }
         oss.setResolution(resolution);
         oss.setCodeRate(codeRate);
-        oss.setDuration(Integer.parseInt(duration));
+        oss.setDuration(duration);
     }
 
     /**
@@ -337,10 +337,11 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
                 if (values.length >= 4) {
                     // 分辨率
                     String resolution = values[0] + "x" + values[1];
-                    // 码率 (转换为 kbps)
-                    String bitrate = (Integer.parseInt(values[2]) / 1000) + "kbps";
                     // 视频时长
-                    String duration = String.format("%.2f", Double.parseDouble(values[3])) + "s";
+                    // String duration = String.format("%.2f", Double.parseDouble(values[3])) + "s";
+                    String duration = values[2].split("\\.")[0];
+                    // 码率 (转换为 kbps)
+                    String bitrate = values[3].split("\\.")[0];
                     return resolution + ", " + bitrate + ", " + duration;
                 }
             }

smsb-plus-ui/src/api/smsb/source/transRecord.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MinioTransRecordVO, MinioTransRecordForm, MinioTransRecordQuery } from '@/api/smsb/source/transRecord_type';
+
+/**
+ * 查询文件转码（压缩）历史记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMinioTransRecord = (query?: MinioTransRecordQuery): AxiosPromise<MinioTransRecordVO[]> => {
+  return request({
+    url: '/minio/transRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询文件转码（压缩）历史记录详细
+ * @param id
+ */
+export const getMinioTransRecord = (id: string | number): AxiosPromise<MinioTransRecordVO> => {
+  return request({
+    url: '/minio/transRecord/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增文件转码（压缩）历史记录
+ * @param data
+ */
+export const addMinioTransRecord = (data: MinioTransRecordForm) => {
+  return request({
+    url: '/minio/transRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改文件转码（压缩）历史记录
+ * @param data
+ */
+export const updateMinioTransRecord = (data: MinioTransRecordForm) => {
+  return request({
+    url: '/minio/transRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除文件转码（压缩）历史记录
+ * @param id
+ */
+export const delMinioTransRecord = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/minio/transRecord/' + id,
+    method: 'delete'
+  });
+};

smsb-plus-ui/src/api/smsb/source/transRecord_type.ts

@@ -0,0 +1,55 @@
+export interface MinioTransRecordVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 资源名称
+   */
+  fileName: string;
+
+  /**
+   * 转码类型
+   */
+  transType: number;
+
+  /**
+   * 转码进度 0-待转 1-进行中 2-结束
+   */
+  transProgress: number;
+
+  /**
+   * 转码结果 0-待转 1-成功 2-失败
+   */
+  result: number;
+
+  /**
+   * 用户名
+   */
+  createUser: string;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+}
+
+export interface MinioTransRecordForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+}
+
+export interface MinioTransRecordQuery extends PageQuery {
+  /**
+   * 资源ID
+   */
+  fileId?: string | number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

smsb-plus-ui/src/types/global.d.ts

@@ -53,6 +53,7 @@ declare global {
     /** 其他参数 */
     [key: string]: any;
   }
+
   /**
    * 字典数据  数据配置
    */
@@ -81,6 +82,16 @@ declare global {
     queryParams: D;
     rules: ElFormRules;
   }
+
+  /**
+   * 分页数据 trans
+   * T : 表单数据
+   * D : 查询参数
+   */
+  declare interface TransPageData<D> {
+    transQueryParams: D;
+  }
+
   /**
    * 分页查询参数
    */
@@ -88,6 +99,7 @@ declare global {
     pageNum: number;
     pageSize: number;
   }
+
   declare interface LayoutSetting {
     /**
      * 是否显示顶部导航

smsb-plus-ui/src/views/smsb/minioData/index.vue

@@ -62,7 +62,7 @@
                 placeholder="请选择归属目录"
                 check-strictly
                 @change="handleQuery"
-                style="width: 150px"
+                style="width: 200px"
                 clearable
               />
             </el-form-item>
@@ -80,13 +80,14 @@
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['source:minioData:add']"> 新增 </el-button>
-              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['source:minioData:edit']"
-                >修改
-              </el-button>
-              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['source:minioData:remove']"
-                >删除
-              </el-button>
+              <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['source:minioData:add']"> 上传 </el-button>
+              <el-button type="primary" plain icon="Switch" @click="handleTrans" v-hasPermi="['source:minioData:add']"> 转码进度 </el-button>
+              <!--              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['source:minioData:edit']"
+                              >修改
+                            </el-button>
+                            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['source:minioData:remove']"
+                              >删除
+                            </el-button>-->
             </el-form-item>
           </el-form>
         </el-card>
@@ -167,6 +168,38 @@
         </div>
       </template>
     </el-dialog>
+    <el-dialog :title="trans.title" v-model="trans.visible" width="1000px" append-to-body :style="{ height: '850px' }">
+      <el-card shadow="never">
+        <el-table v-loading="loading" :data="transRecordList">
+          <el-table-column label="资源名称" align="left" prop="fileName" width="200" :show-overflow-tooltip="true" />
+          <el-table-column label="转码类型" align="center" prop="transType">
+            <template #default="scope">
+              <dict-tag :options="smsb_trans_type" :value="scope.row.transType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="转码进度" align="center" prop="transProgress">
+            <template #default="scope">
+              <dict-tag :options="smsb_trans_progress" :value="scope.row.transProgress" />
+            </template>
+          </el-table-column>
+          <el-table-column label="转码结果" align="center" prop="result">
+            <template #default="scope">
+              <dict-tag :options="smsb_trans_result" :value="scope.row.result" />
+            </template>
+          </el-table-column>
+          <el-table-column label="用户名" align="left" prop="createUser" width="100" :show-overflow-tooltip="true" />
+          <el-table-column label="创建时间" align="left" prop="createTime" width="160" />
+        </el-table>
+
+        <pagination
+          v-show="transTotal > 0"
+          :total="transTotal"
+          v-model:page="transQueryParams.pageNum"
+          v-model:limit="transQueryParams.pageSize"
+          @pagination="getTransList"
+        />
+      </el-card>
+    </el-dialog>
   </div>
 </template>
 
@@ -174,7 +207,8 @@
 import { listMinioData, getMinioData, delMinioData, addMinioData, updateMinioData, fileStatistics } from '@/api/smsb/source/minioData';
 import { MinioDataVO, MinioDataQuery, MinioDataForm } from '@/api/smsb/source/minioData_type';
 import { listSourceTree } from '@/api/smsb/source/sourceTree';
-import { listOss } from '@/api/system/oss';
+import { listMinioTransRecord } from '@/api/smsb/source/transRecord';
+import { MinioTransRecordQuery, MinioTransRecordVO } from '@/api/smsb/source/transRecord_type';
 
 type SourceTreeOption = {
   id: number;
@@ -183,9 +217,11 @@ type SourceTreeOption = {
 };
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { smsb_source_classify, smsb_source_type, sys_yes_no } = toRefs<any>(proxy?.useDict('smsb_source_classify', 'smsb_source_type', 'sys_yes_no'));
-const uploadRef = ref<ElUploadInstance>();
+const { smsb_source_classify, smsb_source_type, smsb_trans_type, smsb_trans_progress, smsb_trans_result } = toRefs<any>(
+  proxy?.useDict('smsb_source_classify', 'smsb_source_type', 'smsb_trans_type', 'smsb_trans_progress', 'smsb_trans_result')
+);
 const minioDataList = ref<MinioDataVO[]>([]);
+const transRecordList = ref<MinioTransRecordVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -193,6 +229,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
+const transTotal = ref(0);
 const sourceTreeOptions = ref<SourceTreeOption[]>([]);
 const queryFormRef = ref<ElFormInstance>();
 const minioDataFormRef = ref<ElFormInstance>();
@@ -206,6 +243,11 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const trans = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
 const initFormData: MinioDataForm = {
   tag: undefined,
   marketing: undefined,
@@ -226,7 +268,15 @@ const data = reactive<PageData<MinioDataForm, MinioDataQuery>>({
   },
   rules: {}
 });
+const transData = reactive<TransPageData<MinioTransRecordQuery>>({
+  transQueryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    params: {}
+  }
+});
 const { queryParams, form, rules } = toRefs(data);
+const { transQueryParams } = toRefs(transData);
 
 /** 查询文件资源列表 */
 const getList = async () => {
@@ -241,6 +291,12 @@ const getList = async () => {
   loading.value = false;
 };
 
+const getTransList = async () => {
+  const res = await listMinioTransRecord(transQueryParams.value);
+  transRecordList.value = res.rows;
+  transTotal.value = res.total;
+};
+
 /** 查询文件目录下拉树结构 */
 const getTreeselect = async () => {
   const res = await listSourceTree();
@@ -293,6 +349,12 @@ const handleAdd = () => {
   dialog.title = '添加文件资源';
 };
 
+const handleTrans = () => {
+  trans.visible = true;
+  trans.title = '转码进度';
+  getTransList();
+};
+
 /** 修改按钮操作 */
 const handleUpdate = async (row?: MinioDataVO) => {
   reset();