From a3f77113c91067790d699a6f3970679f7059c109 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Tue, 1 Jul 2025 22:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xzzn/ems/domain/vo/PcsBranchInfo.java |  6 +++---
 .../ems/domain/vo/SingleSiteBaseInfo.java     | 20 +++++++++----------
 .../ems/service/impl/HomePageServiceImpl.java |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsBranchInfo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsBranchInfo.java
index 4b0d923..e75cc2c 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsBranchInfo.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsBranchInfo.java
@@ -31,7 +31,7 @@ public class PcsBranchInfo
     private String deviceId;
 
     /** 支路id */
-    private Long branchId;
+    private String branchId;
 
     public String getDischargeStatus() {
         return dischargeStatus;
@@ -81,11 +81,11 @@ public class PcsBranchInfo
         this.deviceId = deviceId;
     }
 
-    public Long getBranchId() {
+    public String getBranchId() {
         return branchId;
     }
 
-    public void setBranchId(Long branchId) {
+    public void setBranchId(String branchId) {
         this.branchId = branchId;
     }
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SingleSiteBaseInfo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SingleSiteBaseInfo.java
index 2ed5d77..4bd14b9 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SingleSiteBaseInfo.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SingleSiteBaseInfo.java
@@ -51,12 +51,12 @@ public class SingleSiteBaseInfo {
     /**
      * 装机功率（MW）
      */
-    private BigDecimal installedPower;
+    private BigDecimal installPower;
 
     /**
      * 装机容量（MW）
      */
-    private BigDecimal installedCap;
+    private BigDecimal installCapacity;
 
     /**
      * 七天放电统计
@@ -79,20 +79,20 @@ public class SingleSiteBaseInfo {
         this.dayChargedCap = dayChargedCap;
     }
 
-    public BigDecimal getInstalledCap() {
-        return installedCap;
+    public BigDecimal getInstallPower() {
+        return installPower;
     }
 
-    public void setInstalledCap(BigDecimal installedCap) {
-        this.installedCap = installedCap;
+    public void setInstallPower(BigDecimal installPower) {
+        this.installPower = installPower;
     }
 
-    public BigDecimal getInstalledPower() {
-        return installedPower;
+    public BigDecimal getInstallCapacity() {
+        return installCapacity;
     }
 
-    public void setInstalledPower(BigDecimal installedPower) {
-        this.installedPower = installedPower;
+    public void setInstallCapacity(BigDecimal installCapacity) {
+        this.installCapacity = installCapacity;
     }
 
     public String getRunningTime() {
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java
index cc11227..744645a 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java
@@ -57,8 +57,8 @@ public class HomePageServiceImpl implements IHomePageService
             if (emsSite != null) {
                 // 装机功率+装机容量
                 singleSiteBaseInfo.setSiteName(emsSite.getSiteName());
-                singleSiteBaseInfo.setInstalledCap(emsSite.getInstallCapacity());
-                singleSiteBaseInfo.setInstalledPower(emsSite.getInstallPower());
+                singleSiteBaseInfo.setInstallCapacity(emsSite.getInstallCapacity());
+                singleSiteBaseInfo.setInstallPower(emsSite.getInstallPower());
                 String[] siteLocation = new String[2];
                 siteLocation[0] = emsSite.getLongitude() == null ? ""  : emsSite.getLongitude().toString();
                 siteLocation[1] = emsSite.getLatitude() ==  null ? ""  : emsSite.getLatitude().toString();