From b9ee5a0fe712592241e246ae28a8c0e4b2379f0b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 31 五月 2022 16:46:50 +0800
Subject: [PATCH] 排序

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
index 2f37b84..bb3e406 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
@@ -56,23 +56,17 @@
     }
 
     @GetMapping("/list")
-    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
-            , @RequestParam(value = "orderBy", required = false) String orderBy) {
+    public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
+                                   @RequestParam(value = "keyword", required = false) String keyword,
+                                   @RequestParam(value = "order", required = false) Integer order,
+                                   @RequestParam(value = "seq", required = false) Integer seq) {
         if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_LIST.getCode())) {
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
 
-        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 = ipVolumeFileService.listFile(baseConditionVO, keyword, orderBy);
-        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
-        return ResponseUtil.success(ipVolumeFileService.list(wrapper));
+        List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.ipVolumeFileList(baseConditionVO, keyword, order, seq);
+
+        return ResponseUtil.success(ipVolumeFiles);
     }
 
 

--
Gitblit v1.9.3