Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-11 da823ef0819982dfa74bb0b7a9ce6d534d2fcc2d

 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");