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/controller/GetListOnBindingController.java | 19 +----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 9 ++-
dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java | 29 +++++++++
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 17 +++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 6 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 37 +++++++++++-
dao/src/main/resources/mapper/MonitorMapper.xml | 3 +
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 3
9 files changed, 94 insertions(+), 31 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java b/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java
index 90cf2ea..6fc2031 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java
@@ -15,6 +15,33 @@
//鐧诲綍鏃堕棿
ADMIN_LOGIN_TIME("login_time"),
+
+ /**
+ * 鎽勫儚澶村垪琛�
+ */
+ //鐏潌鍚嶇О
+ MONITOR_POLE_NAME("t3.pole_name"),
+ //娣诲姞鏃堕棿
+ MONITOR_CREATE_TIME("t1.update_time"),
+
+
+
+ /**
+ * IP闊虫煴鍒楄〃
+ */
+ //id
+ IP_VOLUME_ID("id"),
+ //缁堢鍚嶇О
+ IP_VOLUME_NAME("t1.terminal_name"),
+ //缁戝畾鐏潌鍚嶇О
+ IP_VOLUME_POLE_NAME("t3.pole_name"),
+
+ /**
+ * 闊虫煴浠诲姟鍒楄〃
+ */
+ //鍒涘缓鏃堕棿
+ IP_VOLUME_MISSION_CREATE_TIME("create_time"),
+
/**
* 闊虫煴绱犳潗鍒楄〃
*/
@@ -22,6 +49,8 @@
IP_VOLUME_FILE_CREATE_TIME("create_time"),
+
+
/**
* 鎺掑簭鏂瑰紡
*/
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
index a8947e9..cbe8139 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
@@ -12,7 +12,7 @@
List<MonitorBo> listMonitorByIds(List<String> list, int equipmentState);
- List<MonitorBo> listMonitorDeviceSerial1(Long userid, String keyword, int bindingState);
+ List<MonitorBo> listMonitorDeviceSerial1(Long userid, String keyword, int bindingState,String orderBy);
}
diff --git a/dao/src/main/resources/mapper/MonitorMapper.xml b/dao/src/main/resources/mapper/MonitorMapper.xml
index a94727a..714675c 100644
--- a/dao/src/main/resources/mapper/MonitorMapper.xml
+++ b/dao/src/main/resources/mapper/MonitorMapper.xml
@@ -63,6 +63,9 @@
AND t1.binding_state = #{bindingState}
</if>
</where>
+ <if test="orderBy!=null ">
+ ORDER BY ${orderBy}
+ </if>
</select>
</mapper>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
index e67b84f..930b884 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
@@ -7,21 +7,12 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.service.ClientService;
-import com.sandu.ximon.admin.service.LedPlayerEntityService;
-import com.sandu.ximon.admin.service.LedSFileService;
-import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
+import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.MonitorBo;
-import com.sandu.ximon.dao.domain.Client;
-import com.sandu.ximon.dao.domain.LedPlayerEntity;
-import com.sandu.ximon.dao.domain.LedSFile;
-import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.mapper.LightMapper;
-import com.sandu.ximon.dao.domain.IpVolumeFile;
-import com.sandu.ximon.dao.domain.LEDProgram;
-import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
@@ -220,9 +211,9 @@
List<MonitorBo> monitorBos;
//瓒呯
if (SecurityUtils.getClientId() == null) {
- monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2);
+ monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2,null);
} else {
- monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2);
+ monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2,null);
}
List<Map> mapList = new ArrayList<>();
Map map;
@@ -250,7 +241,7 @@
param.setBindingState(2);
param.setKeyword(null);
param.setWorkState(2);
- List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.getBroadcastTerminalList(null, param);
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.getBroadcastTerminalList(null, null, null, param);
List<Map> mapList = new ArrayList<>();
Map map;
for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
index 3a9c8ea..2d672a3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -32,7 +32,10 @@
* @return
*/
@PostMapping("/listMonitor")
- public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
+ public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq,
+ @RequestBody(required = false) MonitorParam monitorParam) {
if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -40,9 +43,9 @@
//杩斿洖鏌ヨ鐨勬憚鍍忓ご淇℃伅鍒楄〃
CommonPage commonPage;
if (monitorParam == null) {
- commonPage = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO,order,seq, new MonitorParam());
} else {
- commonPage = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO,order,seq, monitorParam);
}
return ResponseUtil.success(commonPage);
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 6adbf8b..499a668 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
@@ -20,6 +20,7 @@
import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.domain.IpVolumeMission;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -369,7 +370,7 @@
//鎺掑簭瀛楁
- String orderByResult = "create_time";
+ String orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
//姝ｅ簭銆佸�掑彊
String orderBySeq = "ASC";
if (order != null) {
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;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index 8c0a542..8af864d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -19,6 +19,7 @@
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.PoleBinding;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
@@ -58,17 +59,47 @@
/**
* 妯＄硦鏌ヨ
*/
- public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
+ public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO,Integer order,Integer seq, MonitorParam monitorParam) {
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
if (monitorParam.getBindingState() == null) {
//鍏ㄩ儴
monitorParam.setBindingState(2);
}
+ //鎺掑簭瀛楁
+ String orderByResult = "id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq =OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.MONITOR_POLE_NAME.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.MONITOR_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
List<MonitorBo> list;
if (SecurityUtils.getClientId() == null) {
- list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState());
+ list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
} else {
- list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState());
+ list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
}
//娌℃湁鏁版嵁鏃跺�欑洿鎺ヨ繑鍥炵┖鏁扮粍
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index 5004bb3..54c1190 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -188,7 +188,7 @@
BroadcastTerminalV2Param broadcastTerminalV2Param = new BroadcastTerminalV2Param();
broadcastTerminalV2Param.setBindingState(2);
broadcastTerminalV2Param.setWorkState(2);
- List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, broadcastTerminalV2Param);
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, null, null, broadcastTerminalV2Param);
for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
if (bean.getStatus() == 1 || bean.getStatus() == 0) {
number++;
@@ -202,9 +202,9 @@
MonitorParam monitorParam = new MonitorParam();
monitorParam.setEquipmentState(2);
monitorParam.setBindingState(2);
- List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam).getList();
+ List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
monitorParam.setEquipmentState(1);
- List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, monitorParam).getList();
+ List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
result.put("monitorOnlineCount", online.size());
result.put("monitorTotalCount", monitorBos.size());
--
Gitblit v1.9.3