Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

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

@@ -17,6 +17,7 @@
public class LEDProgramFileService extends BaseServiceImpl<LEDProgramFileMapper, LEDProgramFile> {

    private final LEDProgramFileMapper ledProgramFileMapper;
    private final ClientService clientService;

    public boolean addProgramFile(LEDProgramFileParam param) {
        LEDProgramFile file = new LEDProgramFile();
@@ -25,6 +26,9 @@
        if (SecurityUtils.getClientId() != null) {
            file.setUserName(SecurityUtils.getUsername());
        }
//        if("mp4".equals(fileUploadDto.getFileType())){
//            fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
//        }
        return save(file);
    }

@@ -39,7 +43,6 @@
    public LambdaQueryWrapper<LEDProgramFile> listFile(){
        LambdaQueryWrapper<LEDProgramFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LEDProgramFile.class);
        if(SecurityUtils.getClientId()!=null){

            return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId,SecurityUtils.getUserId());
        }else {
            return ledProgramFileLambdaQueryWrapper;