From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdvisementPlayerFileService.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdvisementPlayerFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdvisementPlayerFileService.java
index 741e83b..fe79431 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdvisementPlayerFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdvisementPlayerFileService.java
@@ -27,28 +27,33 @@
public boolean addFile(IpVolumeFileParam fileParam) {
AdvisementPlayerFile file = new AdvisementPlayerFile();
file.setUserId(SecurityUtils.getClientId());
- file.setUserName(SecurityUtils.getUsername());
- file.setClientId(clientService.getClientId());
+ if(SecurityUtils.getClientId()!=null){
+ file.setUserName(SecurityUtils.getUsername());
+ }
+ if(clientService.getClientId()!=null){
+ file.setClientId(clientService.getClientId());
+ }
file.setFileName(fileParam.getFileName());
file.setFileSize(fileParam.getFileSize());
- file.setFileBase64(fileParam.getFileBase64());
+ file.setFileUrl(fileParam.getFileUrl());
+ file.setFileType(fileParam.getFileType());
return save(file);
}
- public boolean deleteFile(Long fileId) {
- AdvisementPlayerFile byId = getById(fileId);
+ public boolean deleteFile(Long id) {
+ AdvisementPlayerFile byId = getById(id);
if (byId == null) {
throw new BusinessException("鎵句笉鍒板搴旀枃浠�");
}
- return removeById(fileId);
+ return removeById(id);
}
- public LambdaQueryWrapper<AdvisementPlayerFile> listFile(ReceiveParam receiveParam) {
+ public LambdaQueryWrapper<AdvisementPlayerFile> listFile(String keyword) {
LambdaQueryWrapper<AdvisementPlayerFile> wrapper = Wrappers.lambdaQuery(AdvisementPlayerFile.class).eq(AdvisementPlayerFile::getClientId, clientService.getClientId());
- if (receiveParam.getKeyWord() == null) {
+ if (keyword == null) {
return wrapper;
} else {
- return wrapper.like(AdvisementPlayerFile::getFileName, receiveParam.getKeyWord());
+ return wrapper.like(AdvisementPlayerFile::getFileName, keyword);
}
}
}
--
Gitblit v1.9.3