From 3fa847083d45461b4e5ee7ec3dbd9247e8a5047c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 12 一月 2022 10:28:05 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java
index c9c0884..9fe06aa 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java
@@ -8,6 +8,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.TerminalAPIUtils;
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.domain.BroadcastV2TaskTerminal;
import com.sandu.ximon.dao.mapper.BroadcastV2TaskTerminalMapper;
@@ -55,27 +56,24 @@
});
}
- public List<BroadcastTerminalV2Entity> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
+ public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
if (broadcastTerminalV2Param == null) {
broadcastTerminalV2Param = new BroadcastTerminalV2Param();
}
Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> listBroadcastTerminalId;
+
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) {
//鍏ㄩ儴
int bindingState = 2;
- listBroadcastTerminalId = broadcastV2TaskTerminalMapper.listBroadcastV2TerminalId(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
+ broadcastTerminalV2EntityBos = broadcastV2TaskTerminalMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
} else {
- listBroadcastTerminalId = broadcastV2TaskTerminalMapper.listBroadcastV2TerminalId(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
+ broadcastTerminalV2EntityBos = broadcastV2TaskTerminalMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
}
- if (CollUtil.isEmpty(listBroadcastTerminalId)) {
- return CollUtil.newArrayList();
- }
- List<BroadcastTerminalV2Entity> broadcastTerminalV2Entities = broadcastV2TaskTerminalMapper.getBroadcastTerminalList(listBroadcastTerminalId);
- for (BroadcastTerminalV2Entity bean : broadcastTerminalV2Entities) {
+ for (BroadcastTerminalV2EntityBo bean : broadcastTerminalV2EntityBos) {
TerminalVO terminalVO = TerminalAPIUtils.getTerminalInfo(bean.getId());
bean.setStatus(terminalVO.getStatus());
bean.setIp(terminalVO.getIp());
@@ -88,7 +86,7 @@
bean.setTaskID(terminalVO.getTaskID());
}
- return broadcastTerminalV2Entities;
+ return broadcastTerminalV2EntityBos;
}
/**
--
Gitblit v1.9.3