From ec1991af2409134eb6b8813b83b278956bd3d0cc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 26 三月 2025 11:09:37 +0800
Subject: [PATCH] 监管平台

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
index 9e28bdf..db89dda 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
@@ -25,6 +25,7 @@
 import com.ruoyi.other.api.feignClient.SystemConfigurationClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -84,7 +85,8 @@
 	
 	@Resource
 	private SystemConfigurationClient systemConfigurationClient;
-	
+	@Autowired
+	private TCECSuperviseUtil tcecSuperviseUtil;
 	private final static String operatorId = "906171535";
 	
 	/**
@@ -1840,13 +1842,13 @@
 				for (Integer stationID : stationIDList) {
 					StationStatusInfo stationStatusInfo = new StationStatusInfo();
 					stationStatusInfo.setOperatorID(operatorID);
-					stationStatusInfo.setEquipmentOwnerID("999999999");
+					stationStatusInfo.setEquipmentOwnerID(operatorId);
 					stationStatusInfo.setStationID(String.valueOf(stationID));
 					List<ConnectorStatusInfo> connectorStatusInfos = new ArrayList<>();
 					for (TChargingGun chargingGun : chargingGuns) {
 						ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
 						connectorStatusInfo.setOperatorID(operatorId);
-						connectorStatusInfo.setEquipmentOwnerID("999999999");
+						connectorStatusInfo.setEquipmentOwnerID(operatorId);
 						connectorStatusInfo.setStationID(String.valueOf(chargingGun.getSiteId()));
 						connectorStatusInfo.setEquipmentID(String.valueOf(chargingGun.getChargingPileId()));
 						connectorStatusInfo.setConnectorID(chargingGun.getFullNumber());
@@ -1902,7 +1904,7 @@
 	public R pushSuperviseNotificationStationStatus(TChargingGun chargingGun){
 		ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
 		connectorStatusInfo.setOperatorID(operatorId);
-		connectorStatusInfo.setEquipmentOwnerID("999999999");
+		connectorStatusInfo.setEquipmentOwnerID(operatorId);
 		connectorStatusInfo.setStationID(String.valueOf(chargingGun.getSiteId()));
 		connectorStatusInfo.setEquipmentID(String.valueOf(chargingGun.getChargingPileId()));
 		connectorStatusInfo.setConnectorID(chargingGun.getFullNumber());
@@ -1933,7 +1935,7 @@
 		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(operator, connectorStatusInfo);
 		}
 		return R.ok();
 	}
@@ -1945,7 +1947,7 @@
 	public R pushSuperviseNotificationEquipChargeStatus(TChargingOrder chargingOrder){
 		SupEquipChargeStatus supEquipChargeStatus = new SupEquipChargeStatus();
 		supEquipChargeStatus.setOperatorID(operatorId);
-		supEquipChargeStatus.setEquipmentOwnerID("999999999");
+		supEquipChargeStatus.setEquipmentOwnerID(operatorId);
 		supEquipChargeStatus.setStationID(String.valueOf(chargingOrder.getSiteId()));
 		supEquipChargeStatus.setEquipmentID(String.valueOf(chargingOrder.getChargingPileId()));
 		supEquipChargeStatus.setOrderNo(operatorId+chargingOrder.getCode());
@@ -1997,7 +1999,7 @@
 		supEquipChargeStatus.setTotalPower(chargingOrder.getElectrovalence());
 		List<Operator> operators = operatorClient.getAllOperator().getData();
 		for (Operator operator : operators) {
-			TCECSuperviseUtil.notificationSupEquipChargeStatus(operator, supEquipChargeStatus);
+			tcecSuperviseUtil.notificationSupEquipChargeStatus(operator, supEquipChargeStatus);
 		}
 		return R.ok();
 	}
@@ -2009,7 +2011,7 @@
 	public R pushSuperviseNotificationChargeOrderInfo(TChargingOrder chargingOrder){
 		SupChargeOrderInfo supChargeOrderInfo = new SupChargeOrderInfo();
 		supChargeOrderInfo.setOperatorID(operatorId);
-		supChargeOrderInfo.setEquipmentOwnerID("999999999");
+		supChargeOrderInfo.setEquipmentOwnerID(operatorId);
 		supChargeOrderInfo.setStationID(String.valueOf(chargingOrder.getSiteId()));
 		supChargeOrderInfo.setEquipmentID(String.valueOf(chargingOrder.getChargingPileId()));
 		supChargeOrderInfo.setOrderNo(operatorId+chargingOrder.getCode());
@@ -2044,7 +2046,7 @@
 
 		List<Operator> operators = operatorClient.getAllOperator().getData();
 		for (Operator operator : operators) {
-			TCECSuperviseUtil.notificationChargeOrderInfo(operator, supChargeOrderInfo);
+			tcecSuperviseUtil.notificationChargeOrderInfo(operator, supChargeOrderInfo);
 		}
 		return R.ok();
 	}

--
Gitblit v1.7.1