From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 19 五月 2025 11:48:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECPushUtil.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECPushUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECPushUtil.java
index 05d84e2..095b90d 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECPushUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECPushUtil.java
@@ -6,7 +6,6 @@
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
-import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.api.vo.StartChargeResult;
@@ -28,6 +27,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -72,7 +72,11 @@
connectorStatusInfo.setStationID(String.valueOf(chargingGun.getSiteId()));
connectorStatusInfo.setEquipmentID(String.valueOf(chargingGun.getChargingPileId()));
connectorStatusInfo.setConnectorID(chargingGun.getFullNumber());
- connectorStatusInfo.setEquipmentClassification(1);
+ if (chargingGun.getEquipmentClassification()!=null){
+ connectorStatusInfo.setEquipmentClassification(chargingGun.getEquipmentClassification());
+ }else {
+ connectorStatusInfo.setEquipmentClassification(1);
+ }
switch (chargingGun.getStatus()){
case 1:
connectorStatusInfo.setStatus(0);
@@ -97,10 +101,7 @@
break;
}
connectorStatusInfo.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
- List<Operator> operators = operatorClient.getAllOperator().getData();
- for (Operator operator : operators) {
- tcecSuperviseUtil.notificationStationStatus(operator, connectorStatusInfo);
- }
+ tcecSuperviseUtil.notificationStationStatus(new Operator(), connectorStatusInfo);
return R.ok();
}
/**
@@ -157,14 +158,12 @@
break;
}
supEquipChargeStatus.setCurrentA(chargingOrder.getCurrent());
- supEquipChargeStatus.setSOC(new BigDecimal(chargingOrder.getEndSoc()));
+
+ supEquipChargeStatus.setSOC(StringUtils.hasLength(chargingOrder.getEndSoc())?new BigDecimal(chargingOrder.getEndSoc()):new BigDecimal("1"));
supEquipChargeStatus.setStartTime(chargingOrder.getStartTime() != null ? chargingOrder.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : "");
supEquipChargeStatus.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
supEquipChargeStatus.setTotalPower(chargingOrder.getElectrovalence());
- List<Operator> operators = operatorClient.getAllOperator().getData();
- for (Operator operator : operators) {
- tcecSuperviseUtil.notificationSupEquipChargeStatus(operator, supEquipChargeStatus);
- }
+ tcecSuperviseUtil.notificationSupEquipChargeStatus(new Operator(), supEquipChargeStatus);
return R.ok();
}
/**
@@ -208,10 +207,7 @@
break;
}
- List<Operator> operators = operatorClient.getAllOperator().getData();
- for (Operator operator : operators) {
- tcecSuperviseUtil.notificationChargeOrderInfo(operator, supChargeOrderInfo);
- }
+ tcecSuperviseUtil.notificationChargeOrderInfo(new Operator(), supChargeOrderInfo);
return R.ok();
}
}
--
Gitblit v1.7.1