From e1c8946bb62af329a06d87b09b5abd7a4c617ee8 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 09 五月 2022 17:00:59 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 1554e7b..3db7a27 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
@@ -34,7 +34,14 @@
* 鍚屾缁堢
*/
public void synchTerminal() {
- List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll("");
+ List<BroadcastTerminalV2Entity> server;
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ server = broadcastTerminalV2EntityMapper.listAll(null);
+ } else {
+ server = broadcastTerminalV2EntityMapper.listAll(SecurityUtils.getUserId());
+ }
+
List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
System.out.println(list);
list.stream().forEach(item -> {
@@ -65,10 +72,9 @@
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
}
- Long clientId = SecurityUtils.getClientId();
//鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
- if (2 == broadcastTerminalV2Param.getWorkState()) {
+ if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
@@ -78,9 +84,19 @@
if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) {
//鍏ㄩ儴
int bindingState = 2;
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, bindingState);
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), bindingState);
+ }
} else {
- broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
+ if (SecurityUtils.getClientId() == null) {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
+ , null, broadcastTerminalV2Param.getBindingState());
+ } else {
+ broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
+ , SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
+ }
}
List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
@@ -185,6 +201,7 @@
/**
* 鏍规嵁缁堢id鑾峰彇缁堢淇℃伅
+ *
* @param name
* @param id
* @return
--
Gitblit v1.9.3