From f04802851ffecf0e85b30f4ea7b73da5fbdbf188 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 15:52:23 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
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 2f7a04b..3064528 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
@@ -14,6 +14,7 @@
import com.sandu.ximon.admin.vo.TerminalVO;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,17 +71,20 @@
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
}
+
//鎺掑簭瀛楁
- String orderByResult = "id";
+ String orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
//姝ｅ簭銆佸�掑彊
- String orderBySeq = "ASC";
+ String orderBySeq = OrderByEnums.ASC.getCode();
if (order != null) {
switch (order) {
case 1:
- orderByResult = "create_time";
+ orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
break;
case 2:
- orderByResult = "create_time";
+ orderByResult = OrderByEnums.IP_VOLUME_NAME.getCode();
+ case 3:
+ orderByResult = OrderByEnums.IP_VOLUME_POLE_NAME.getCode();
default:
}
}
@@ -96,11 +100,12 @@
break;
}
}
-
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
//鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
}
List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
--
Gitblit v1.9.3