From e50188e29656c43a6b69b08694dd9ee6e3b6a2f0 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 16 三月 2022 09:28:27 +0800
Subject: [PATCH] 熙讯
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
index ab158d6..c4041fb 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.IpVolumeFileParam;
-import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.mapper.IpVolumeFileMapper;
@@ -27,11 +28,16 @@
public boolean addFile(IpVolumeFileParam fileParam) {
IpVolumeFile file = new IpVolumeFile();
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.setOriginSize(fileParam.getOriginSize());
return save(file);
}
@@ -43,12 +49,13 @@
return removeById(fileId);
}
- public LambdaQueryWrapper<IpVolumeFile> listFile(ReceiveParam receiveParam) {
+ public LambdaQueryWrapper<IpVolumeFile> listFile(BaseConditionVO baseConditionVO, String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class).eq(IpVolumeFile::getClientId, clientService.getClientId());
- if (receiveParam.getKeyWord() == null) {
+ if (keyword.isEmpty()) {
return wrapper;
} else {
- return wrapper.like(IpVolumeFile::getFileName,receiveParam.getKeyWord());
+ return wrapper.like(IpVolumeFile::getFileName,keyword);
}
}
--
Gitblit v1.9.3