From d877cf557db5452093087fabb4479a10497ee218 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 二月 2022 18:25:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 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..53a458b 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,12 +8,14 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -48,47 +50,63 @@
BroadcastTerminalV2Entity b = new BroadcastTerminalV2Entity();
b.setId(id);
b.setTerminalName(item.getName());
- b.setStreetlightId(0l);
+ b.setStreetlightId(0L);
b.setExist(1);
broadcastV2TaskTerminalMapper.insert(b);
}
});
}
- 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;
+
+ //鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
+ if (2 == broadcastTerminalV2Param.getWorkState()) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos_final = new ArrayList<>();
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
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) {
- TerminalVO terminalVO = TerminalAPIUtils.getTerminalInfo(bean.getId());
- bean.setStatus(terminalVO.getStatus());
- bean.setIp(terminalVO.getIp());
- bean.setVolumn(terminalVO.getVolumn());
- bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
- bean.setPower(terminalVO.getPower());
- bean.setDefaultPower(terminalVO.getDefaultPower());
- bean.setLast(terminalVO.getLast());
- bean.setTaskType(terminalVO.getTaskType());
- bean.setTaskID(terminalVO.getTaskID());
+ List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
+ for (BroadcastTerminalV2EntityBo bean : broadcastTerminalV2EntityBos) {
+ for (TerminalVO terminalVO : list) {
+ if (bean.getId().equals(terminalVO.getId())) {
+ bean.setStatus(terminalVO.getStatus());
+ bean.setIp(terminalVO.getIp());
+ bean.setVolumn(terminalVO.getVolumn());
+ bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
+ bean.setPower(terminalVO.getPower());
+ bean.setDefaultPower(terminalVO.getDefaultPower());
+ bean.setLast(terminalVO.getLast());
+ bean.setTaskType(terminalVO.getTaskType());
+ bean.setTaskID(terminalVO.getTaskID());
+ if (0 == broadcastTerminalV2Param.getWorkState() && 0 == terminalVO.getStatus()) {
+ broadcastTerminalV2EntityBos_final.add(bean);
+ } else if (1 == broadcastTerminalV2Param.getWorkState() && 1 == terminalVO.getStatus()) {
+ broadcastTerminalV2EntityBos_final.add(bean);
+ }
+ break;
+ }
+ }
}
- return broadcastTerminalV2Entities;
+ if (2 == broadcastTerminalV2Param.getWorkState()) {
+ return broadcastTerminalV2EntityBos;
+ } else {
+ return broadcastTerminalV2EntityBos_final;
+ }
}
/**
--
Gitblit v1.9.3