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/controller/IpVolumeMissionController.java | 5 +++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 12 +++++++++---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java | 17 ++++++++++++++---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 13 +++++++++++--
4 files changed, 37 insertions(+), 10 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 442e2d8..2f37b84 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,15 +56,26 @@
}
@GetMapping("/list")
- public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
+ , @RequestParam(value = "orderBy", required = false) String orderBy) {
if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
+ 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));
}
+
@PostMapping("/IpVolumeFileUploading")
public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file) {
if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_UPLOADING.getCode())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
index dc8c7e9..7d2e97e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
@@ -98,12 +98,13 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
+ , @RequestParam(value = "orderBy", required = false) String orderBy) {
if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword));
+ return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword,orderBy));
}
//鑾峰彇浠诲姟璇︽儏
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 0d6a354..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;
@@ -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);
//涓嶆槸瓒呯
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index c2a1ab6..d1c0b33 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -365,8 +365,17 @@
}
- public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ public List<IpVolumeMissionBo> missionList(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";
+ }
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);
--
Gitblit v1.9.3