From 21d810aa4ac02a8b7a54d80eafc753c32d376d74 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 19 四月 2022 16:06:20 +0800
Subject: [PATCH] 首页统计
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index f42f3dc..6798e8d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -184,7 +184,9 @@
* @return
*/
public List<C3ChargingBo> getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
if (c3ChargingParam == null) {
c3ChargingParam = new C3ChargingParam();
}
@@ -195,15 +197,20 @@
}
List<C3ChargingBo> c3ChargingBoList;
- if(SecurityUtils.getClientId() == null){
+ if (SecurityUtils.getClientId() == null) {
c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null);
- }else{
+ } else {
c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId());
}
for (C3ChargingBo one : c3ChargingBoList) {
String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
if (s != null) {
- one.setStatusBit(1);
+ try {
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ one.setStatusBit((Integer.valueOf(beatDataPackage.getStatusBit())));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
} else {
one.setStatusBit(0);
}
@@ -221,7 +228,12 @@
C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, udid));
String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
if (s != null) {
- one.setStatusBit(1);
+ try {
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
+ one.setStatusBit((Integer.valueOf(beatDataPackage.getStatusBit())));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
} else {
one.setStatusBit(0);
}
--
Gitblit v1.9.3