From feac6e0c2db4e60d55417fde1971a0bc6d703566 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 15:58:28 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 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 e67b84f..40e45de 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;
@@ -78,9 +69,9 @@
public ResponseVO<Object> getPoleList() {
List<Pole> poleList;
if (SecurityUtils.getClientId() == null) {
- poleList = poleMapper.queryPoleOnLineStatesList(null, null, null, null, null);
+ poleList = poleMapper.queryPoleOnLineStatesList(null, null, null, null, null, null);
} else {
- poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(), null, null, null, null);
+ poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(), null, null, null, null, null);
}
List<Map> mapList = new ArrayList<>();
@@ -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) {
--
Gitblit v1.9.3