From b2cf36ae92e61534f9d2e02068bff0f5127272bc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 14:13:44 +0800
Subject: [PATCH] 接口排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 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 198bfc1..60054af 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,6 +3,7 @@
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;
@@ -18,6 +19,7 @@
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;
@@ -90,17 +92,8 @@
return removeById(fileId);
}
- 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";
- }
+ public List<IpVolumeFile> ipVolumeFileList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);
-
//涓嶆槸瓒呯
if (SecurityUtils.getClientId() != null) {
wrapper = wrapper.eq(IpVolumeFile::getClientId, SecurityUtils.getUserId())
@@ -112,7 +105,38 @@
if (keyword != null && !keyword.isEmpty()) {
wrapper.like(IpVolumeFile::getFileName, keyword);
}
- return wrapper;
+
+ //鎺掑簭瀛楁
+ String orderByResult = "create_time";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = "ASC";
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = "create_time";
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ List<IpVolumeFile> list = list(wrapper);
+
+ return list;
}
public List<IpVolumeFile> listFiles() {
--
Gitblit v1.9.3