From b2030052dda62a44875f751ff9fe061736988270 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 24 八月 2022 15:53:31 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 bff2a98..112a717 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
@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.collection.ListUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.CommonPage;
@@ -214,6 +213,8 @@
int faultNumber = 0;
//绛夊緟鎺ュ叆鏁伴噺
int waitConnectNumber = 0;
+ //鍏呯數涓暟閲�
+ int chargingNumber = 0;
for (C3ChargingBo one : c3ChargingBoList) {
String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
@@ -228,6 +229,7 @@
break;
//2.鍏呯數涓�
case 2:
+ chargingNumber++;
onlineNumber = onlineNumber + 1;
break;
//3.鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭
@@ -269,6 +271,7 @@
map.put("offlineNumber", offlineNumber);
map.put("faultNumber", faultNumber);
map.put("waitConnectNumber", waitConnectNumber);
+ map.put("chargingNumber", chargingNumber);
return map;
}
@@ -329,6 +332,10 @@
chargingDto.setPoleId(pole.getId());
//璐圭巼
BigDecimal bigDecimal = SpringContextHolder.getBean(C3mChargingChargeService.class).getchargeDecimalByC3id(one.getC3Id());
+ //宸插厖鐢甸噺
+ chargingDto.setChargedCapacity(beatDataPackage.getChargedCapacity());
+ //鍏呯數鏃堕暱
+ chargingDto.setAlreadyChargingTime(beatDataPackage.getAlreadyChargingTime());
chargingDto.setRate(bigDecimal);
}
--
Gitblit v1.9.3