From b99665b30cce4b623c702c9221af897ccd873ba0 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 14:36:21 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java | 8 ++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 29 ++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 35 +++++++++++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java | 5 +-
4 files changed, 63 insertions(+), 14 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
index bc7d1d6..42ac6a4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IPBroadcastController.java
@@ -2,7 +2,6 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.param.ReceiveParam;
@@ -38,11 +37,13 @@
@PostMapping("/getBroadcastTerminalList")
public ResponseVO<Object> getBroadcastTerminalList(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq,
@RequestBody(required = false) BroadcastTerminalV2Param broadcastTerminalV2Param) {
if (!permissionConfig.check(MenuEnum.IP_BROADCAST_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<BroadcastTerminalV2EntityBo> list = broadcastTerminalV2Service.getBroadcastTerminalList(baseConditionVO, broadcastTerminalV2Param);
+ List<BroadcastTerminalV2EntityBo> list = broadcastTerminalV2Service.getBroadcastTerminalList(baseConditionVO, order, seq, broadcastTerminalV2Param);
if (2 != broadcastTerminalV2Param.getWorkState()) {
return ResponseUtil.success(list);
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 7d2e97e..ebf4b1f 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,13 +98,15 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
- , @RequestParam(value = "orderBy", required = false) String orderBy) {
+ public ResponseVO<Object> listMission(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_TASK_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword,orderBy));
+ return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword,order,seq));
}
//鑾峰彇浠诲姟璇︽儏
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 d1c0b33..6adbf8b 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,16 +365,35 @@
}
- public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, String orderBy) {
- if (orderBy.isEmpty() || orderBy == null) {
- orderBy = "id desc";
- }
+ public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, Integer order,Integer seq) {
- if ("createTime-1".equals(orderBy)) {
- orderBy = "create_time asc";
- } else if ("createTime-2".equals(orderBy)) {
- orderBy = "create_time desc";
+
+ //鎺掑簭瀛楁
+ 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<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
index fcdbc2d..2f7a04b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -66,10 +66,37 @@
*/
}
- public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
+ public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, Integer order, Integer seq, BroadcastTerminalV2Param broadcastTerminalV2Param) {
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
}
+ //鎺掑簭瀛楁
+ String orderByResult = "id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = "ASC";
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = "create_time";
+ break;
+ case 2:
+ orderByResult = "create_time";
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+
//鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
--
Gitblit v1.9.3