From 98a9bf651c3e1e9a44a14bc6ad5143618bd9a0fb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 17:06:42 +0800
Subject: [PATCH] IP音柱任务列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
index 3e581c8..2168ff7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
+++ b/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);
}
@@ -36,12 +40,13 @@
return removeById(id);
}
- public LambdaQueryWrapper<LEDProgramFile> listFile(){
+ public LambdaQueryWrapper<LEDProgramFile> listFile() {
LambdaQueryWrapper<LEDProgramFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LEDProgramFile.class);
- if(SecurityUtils.getClientId()!=null){
-
- return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId,SecurityUtils.getUserId());
- }else {
+ if (SecurityUtils.getClientId() != null) {
+ return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(LEDProgramFile::getClientId, SecurityUtils.getUserId());
+ });
+ } else {
return ledProgramFileLambdaQueryWrapper;
}
--
Gitblit v1.9.3