From c0359a005dab3c7b168ed25db2fa4dfc67c7546a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 18:42:30 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
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 bdbb614..616be99 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
@@ -215,13 +215,13 @@
private final MonitorMapper monitorMapper;
@GetMapping("/getMonitorList")
- public ResponseVO<Object> getMonitorList() {
+ public ResponseVO<Object> getMonitorList(@RequestParam(required = false, value = "keyword") String keyword) {
List<MonitorBo> monitorBos;
//瓒呯
if (SecurityUtils.getClientId() == null) {
- monitorBos = monitorMapper.listMonitorDeviceSerial1(null, null, 2, null);
+ monitorBos = monitorMapper.newListMonitorOnBind(null, keyword);
} else {
- monitorBos = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2, null);
+ monitorBos = monitorMapper.newListMonitorOnBind(SecurityUtils.getUserId(), keyword);
}
List<Map> mapList = new ArrayList<>();
Map map;
@@ -244,12 +244,12 @@
private final IpVolumeService ipVolumeService;
@GetMapping("/getIpVolumeList")
- public ResponseVO<Object> getIpVolumeList() {
+ public ResponseVO<Object> getIpVolumeList(@RequestParam(required = false, value = "keyword") String keyword) {
BroadcastTerminalV2Param param = new BroadcastTerminalV2Param();
param.setBindingState(2);
param.setKeyword(null);
param.setWorkState(2);
- List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.getBroadcastTerminalList(null, null, null, param);
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.newIpTerminalList(keyword);
List<Map> mapList = new ArrayList<>();
Map map;
for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
@@ -271,8 +271,8 @@
private final IpVolumeFileService ipVolumeFileService;
@GetMapping("/getIpFileList")
- public ResponseVO<Object> getIpFileList() {
- List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.listFiles();
+ public ResponseVO<Object> getIpFileList(@RequestParam(required = false, value = "keyword") String keyword) {
+ List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.listFiles(keyword);
List<Map> mapList = new ArrayList<>();
Map map;
for (IpVolumeFile bean : ipVolumeFiles) {
--
Gitblit v1.9.3