From 43e2e8143bd715e80598f92e1f78972b95a2a2b2 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 14 十月 2022 16:58:55 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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 60054af..84d3989 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
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.service;
import com.alibaba.fastjson.JSON;
+import com.alipay.service.schema.util.StringUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
@@ -16,10 +17,10 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.IpVolumeFile;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.IpVolumeFileMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -40,15 +41,10 @@
public boolean addFile(IpVolumeFileParam fileParam) {
IpVolumeFile file = new IpVolumeFile();
-// if(SecurityUtils.getClientId()!=null){
-// file.setUserName(SecurityUtils.getUsername());
-// }
-//
- if (SecurityUtils.getClientId() != null) {
- file.setUserName(SecurityUtils.getUsername());
- file.setUserId(SecurityUtils.getClientId());
- file.setClientId(clientService.getClientId());
- }
+
+ file.setUserName(SecurityUtils.getUsername());
+ file.setUserId(SecurityUtils.getClientId());
+ file.setClientId(clientService.getClientId());
file.setFileName(fileParam.getFileName());
file.setFileUrl(fileParam.getFileUrl());
@@ -107,13 +103,13 @@
}
//鎺掑簭瀛楁
- String orderByResult = "create_time";
+ String orderByResult = "id";
//姝ｅ簭銆佸�掑彊
- String orderBySeq = "ASC";
+ String orderBySeq = OrderByEnums.ASC.getCode();
if (order != null) {
switch (order) {
case 1:
- orderByResult = "create_time";
+ orderByResult = OrderByEnums.IP_VOLUME_FILE_CREATE_TIME.getCode();
break;
default:
}
@@ -121,10 +117,10 @@
if (seq != null) {
switch (seq) {
case 1:
- orderBySeq = " ASC";
+ orderBySeq = OrderByEnums.ASC.getCode();
break;
case 2:
- orderBySeq = " DESC";
+ orderBySeq = OrderByEnums.DESC.getCode();
break;
default:
break;
@@ -133,13 +129,15 @@
//鎺掑簭鏂瑰紡
String orderBy = orderByResult + " " + orderBySeq;
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
List<IpVolumeFile> list = list(wrapper);
return list;
}
- public List<IpVolumeFile> listFiles() {
+ public List<IpVolumeFile> listFiles(String keyword) {
LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);
//涓嶆槸瓒呯
@@ -149,6 +147,9 @@
file.eq(IpVolumeFile::getUserId, SecurityUtils.getUserId());
});
}
+ if (keyword != null && !StringUtil.isEmpty(keyword)) {
+ wrapper.like(IpVolumeFile::getFileName, keyword);
+ }
return list(wrapper);
}
--
Gitblit v1.9.3