From 8a74d51dafd928a038dfeae9872b513ce8f62ad6 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 13:36:59 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 19 +++++++++++--------
1 files changed, 11 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 36561b4..198bfc1 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
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
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.file.FileUploadDto;
import com.sandu.common.object.BaseConditionVO;
@@ -82,7 +81,7 @@
/**
* 闊虫煴鏂囦欢鍒犻櫎 鏃ュ織璁板綍寮�濮�
*/
- String content = "鍒犻櫎鏂囦欢id:"+fileId+"闊虫煴鏂囦欢鍚嶇О锛�" + byId.getFileName() + "锛屾枃浠跺ぇ灏忥細" + byId.getOriginSize() + "锛屾枃浠惰矾寰勶細" + byId.getFileUrl();
+ String content = "鍒犻櫎鏂囦欢id:" + fileId + "闊虫煴鏂囦欢鍚嶇О锛�" + byId.getFileName() + "锛屾枃浠跺ぇ灏忥細" + byId.getOriginSize() + "锛屾枃浠惰矾寰勶細" + byId.getFileUrl();
StoreOperationRecordsUtils.storeOperationData(null, null, "闊虫煴鏂囦欢鍒犻櫎", content);
/**
* 闊虫煴鏂囦欢鍒犻櫎 鏃ュ織璁板綍缁撴潫
@@ -91,8 +90,15 @@
return removeById(fileId);
}
- public LambdaQueryWrapper<IpVolumeFile> listFile(BaseConditionVO baseConditionVO, String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ public LambdaQueryWrapper<IpVolumeFile> listFile(BaseConditionVO baseConditionVO, String keyword, String orderBy) {
+ if (orderBy.isEmpty() || orderBy == null) {
+ orderBy = "id desc";
+ }
+ if ("createTime-1".equals(orderBy)) {
+ orderBy = "create_time asc";
+ } else if ("createTime-2".equals(orderBy)) {
+ orderBy = "create_time desc";
+ }
LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);
//涓嶆槸瓒呯
@@ -121,9 +127,6 @@
}
return list(wrapper);
}
-
-
-
/**
@@ -168,7 +171,7 @@
/**
* 闊虫煴鏂囦欢涓婁紶 鏃ュ織璁板綍寮�濮�
*/
- String content = "鏂囦欢鍐呭:"+ JSON.toJSONString(fileUploadDto);
+ String content = "鏂囦欢鍐呭:" + JSON.toJSONString(fileUploadDto);
StoreOperationRecordsUtils.storeOperationData(null, null, "闊虫煴鏂囦欢涓婁紶", content);
/**
* 闊虫煴鏂囦欢涓婁紶 鏃ュ織璁板綍缁撴潫
--
Gitblit v1.9.3