From 12b3967ebefcfc31e8e2eeb4fea6c699f5bd04f4 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 25 四月 2022 17:33:43 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index cfd41c4..e317fe5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -33,6 +33,7 @@
import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.bo.*;
import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.mapper.MonitorMapper;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -203,6 +204,16 @@
}
result.put("AirEquipmentOnlineCount", number);
result.put("AirEquipmentTotalCount", airEquipments.size());
+ //澶ф皵(鍐滆��)
+ number = 0;
+ List<AirEquipmentNongGengBo> airEquipmentNongGengBos = SpringContextHolder.getBean(AirEquipmentNongGengService.class).listAirEquipmentByKeyword(null, null);
+ for (AirEquipmentNongGengBo airEquipmentNongGengBo : airEquipmentNongGengBos) {
+ if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG.getCode() + airEquipmentNongGengBo.getMac()) != null) {
+ number++;
+ }
+ }
+ result.put("AirEquipmentNongGengOnlineCount", number);
+ result.put("AirEquipmentNongGengTotalCount", airEquipmentNongGengBos.size());
//姘磋川
number = 0;
List<WaterQualityEquipmentBo> waterQualityEquipments
@@ -851,8 +862,8 @@
// }
- public boolean updateDeviceCode(Long poleId){
- return poleMapper.updateDeviceCode(poleId);
+ public boolean updateDeviceCode(Long poleId) {
+ return poleMapper.updateDeviceCode(poleId);
}
}
\ No newline at end of file
--
Gitblit v1.9.3