From 3b4b297f0da7d5943a50f6bdaea502774ccdc04a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 15 四月 2025 10:02:42 +0800
Subject: [PATCH] 监管平台1
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java
index cffcc2a..e2425a7 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java
@@ -2217,14 +2217,29 @@
equipmentInfo.setEquipmentClassification(equipmentInfo.getEquipmentClassification()==null?1:equipmentInfo.getEquipmentClassification());
}
- stationInfo.setEquipmentOwnerName("明星新能源");
- stationInfo.setResidentNo("A1234");
+ if (org.springframework.util.StringUtils.hasLength(site.getEquipmentOwnerName())){
+ stationInfo.setEquipmentOwnerName(site.getEquipmentOwnerName());
+ }else{
+ stationInfo.setEquipmentOwnerName("明星新能源");
+
+ }
+ if (org.springframework.util.StringUtils.hasLength(site.getResidentNo())){
+ stationInfo.setResidentNo(site.getResidentNo());
+ }else{
+ stationInfo.setResidentNo("A1234");
+
+ }
stationInfo.setSupplyType(stationInfo.getSupplyType()==null?1:stationInfo.getSupplyType());
stationInfo.setWattHourMeterNo(org.springframework.util.StringUtils.hasLength(stationInfo.getWattHourMeterNo())?stationInfo.getWattHourMeterNo():UUID.randomUUID().toString().replaceAll("-", ""));
stationInfo.setForwardPower(stationInfo.getForwardPower()==null?"1.3654":stationInfo.getForwardPower());
String uuid = UUID.randomUUID().toString();
String randomString = uuid.replaceAll("-", ""); // 去除'-'
- stationInfo.setRecordUniqueNo(randomString);
+ if (org.springframework.util.StringUtils.hasLength(site.getRecordUniqueNo())){
+ stationInfo.setRecordUniqueNo(site.getRecordUniqueNo());
+ }else{
+ stationInfo.setRecordUniqueNo("A123998987hjn4");
+
+ }
}
BaseResult baseResult = new BaseResult();
--
Gitblit v1.7.1