wanghongbo

素材库接口

@@ -5,6 +5,8 @@ import lombok.Data; @@ -5,6 +5,8 @@ import lombok.Data;
5 @Data 5 @Data
6 public class BackupMaterialDto { 6 public class BackupMaterialDto {
7 7
  8 + private Long id;
  9 +
8 /** 垫片名称 */ 10 /** 垫片名称 */
9 private String backupName ; 11 private String backupName ;
10 12
@@ -37,6 +37,14 @@ public class BackupMaterial extends Model<BackupMaterial> { @@ -37,6 +37,14 @@ public class BackupMaterial extends Model<BackupMaterial> {
37 /** 创建时间 */ 37 /** 创建时间 */
38 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") 38 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
39 private LocalDateTime createdTime ; 39 private LocalDateTime createdTime ;
  40 + /** 时长 */
  41 + private Long duration;
  42 + /** 来源 */
  43 + private String source;
  44 + /** 删除标识 */
  45 + private String del;
  46 + /** 封面路径 */
  47 + private String coverPath;
40 48
41 49
42 } 50 }
  1 +package com.wondertek.enums;
  2 +
  3 +/**
  4 + * @Description:素材来源
  5 + */
  6 +public enum MaterialSourceEnum {
  7 + UPLOAD("upload", "上传"),
  8 + NAS("nas", "nas"),
  9 + clip("clip", "剪辑");
  10 +
  11 + private final String code;
  12 + private final String name;
  13 +
  14 + MaterialSourceEnum(String status, String name) {
  15 + this.code = status;
  16 + this.name = name;
  17 + }
  18 +
  19 + public String getCode() {
  20 + return code;
  21 + }
  22 +
  23 + public String getName() {
  24 + return name;
  25 + }
  26 +}
@@ -64,14 +64,15 @@ public class BackupMaterialServiceImpl extends ServiceImpl<BackupMaterialMapper, @@ -64,14 +64,15 @@ public class BackupMaterialServiceImpl extends ServiceImpl<BackupMaterialMapper,
64 64
65 LambdaQueryWrapper<BackupMaterial> queryWrapper = new LambdaQueryWrapper<>(); 65 LambdaQueryWrapper<BackupMaterial> queryWrapper = new LambdaQueryWrapper<>();
66 66
  67 + if (ObjectUtil.isNotEmpty(backupMaterialDto.getId())){
  68 + queryWrapper.eq(BackupMaterial::getId,backupMaterialDto.getId());
  69 + }
67 if(StringUtils.isNotBlank(backupMaterialDto.getBackupName())){ 70 if(StringUtils.isNotBlank(backupMaterialDto.getBackupName())){
68 queryWrapper.like(BackupMaterial::getBackupName,backupMaterialDto.getBackupName()); 71 queryWrapper.like(BackupMaterial::getBackupName,backupMaterialDto.getBackupName());
69 } 72 }
70 73
71 -  
72 Page<BackupMaterial> pageInfo = new Page<>(page, size); 74 Page<BackupMaterial> pageInfo = new Page<>(page, size);
73 75
74 -  
75 IPage<BackupMaterial> resultPage = backupMaterialMapper.selectPage(pageInfo, queryWrapper); 76 IPage<BackupMaterial> resultPage = backupMaterialMapper.selectPage(pageInfo, queryWrapper);
76 return new PageBean(Integer.parseInt(String.valueOf(resultPage.getPages())),resultPage.getTotal(),resultPage.getRecords()); 77 return new PageBean(Integer.parseInt(String.valueOf(resultPage.getPages())),resultPage.getTotal(),resultPage.getRecords());
77 } 78 }
@@ -28,7 +28,7 @@ public class OperationLogServiceImpl implements OperationLogService { @@ -28,7 +28,7 @@ public class OperationLogServiceImpl implements OperationLogService {
28 Integer size = operationLogDto.getSize(); 28 Integer size = operationLogDto.getSize();
29 LambdaQueryWrapper<OperationLog> queryWrapper = new LambdaQueryWrapper<>(); 29 LambdaQueryWrapper<OperationLog> queryWrapper = new LambdaQueryWrapper<>();
30 queryWrapper.eq(OperationLog::getBusinessType,"cloudMonitor") 30 queryWrapper.eq(OperationLog::getBusinessType,"cloudMonitor")
31 - .eq(OperationLog::getBusinesId,operationLogDto.getRoomId()) 31 + .eq(OperationLog::getBusinessId,operationLogDto.getRoomId())
32 .orderByDesc(OperationLog::getCreatedTime); 32 .orderByDesc(OperationLog::getCreatedTime);
33 Page<OperationLog> pageInfo = new Page<>(page, size); 33 Page<OperationLog> pageInfo = new Page<>(page, size);
34 IPage<OperationLog> resultPage = operationLogMapper.selectPage(pageInfo, queryWrapper); 34 IPage<OperationLog> resultPage = operationLogMapper.selectPage(pageInfo, queryWrapper);