From 7b3517a8680a990dc01e5fd22289eff19fadf033 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 四月 2025 09:56:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECPushUtil.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 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..beed1db 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;
@@ -97,10 +97,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 +154,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 +203,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