Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-11 da823ef0819982dfa74bb0b7a9ce6d534d2fcc2d

Merge remote-tracking branch 'origin/master'

 dao/src/main/java/com/sandu/ximon/dao/domain/FileOperationRecord.java

@@ -71,6 +71,11 @@
     */
    private Integer dataType;

    /**
     * 缩略图
     */
    private String screenShot;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 sandu-common/src/main/java/com/sandu/common/file/FileUploadDto.java

@@ -54,5 +54,9 @@
     * 图片宽度
     */
    private Integer width;
    /**
     * 缩略图
     */
    private String screenShot;

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java

@@ -57,6 +57,9 @@
    @PostMapping("/uploading/{dateType}")
    public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file,@PathVariable Integer dateType) {
        FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
        if("mp4".equals(fileUploadDto.getFileType())){
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
        }
        FileOperationRecord fileOperationRecord = new FileOperationRecord();
        if("mp4".equals(fileUploadDto.getFileType())){
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java

@@ -29,6 +29,9 @@

    public boolean addProgramFile(MultipartFile file) {
        FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
        if("mp4".equals(fileUploadDto.getFileType())){
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
        }
        FileOperationRecord fileOperationRecord=new FileOperationRecord();
        if("mp4".equals(fileUploadDto.getFileType())){
            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");