From ed037879103f9051f9f7381f02f9d93dc681ea42 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 09 三月 2022 15:44:21 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 f8bcee9..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;
@@ -35,7 +36,7 @@
             file.setClientId(clientService.getClientId());
         }
         file.setFileName(fileParam.getFileName());
-        file.setFileSize(fileParam.getFileSizeIp());
+        file.setFileUrl(fileParam.getFileUrl());
         file.setOriginSize(fileParam.getOriginSize());
         return save(file);
     }
@@ -48,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