From d2ebf3fca8a36fb0ac4f62ac97054ce3e3a12d74 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Wed, 26 Mar 2025 15:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=9D=E5=AE=9A=E5=8A=9F?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/pojo/param/user/UserReportParam.java  |  3 +++
 .../njcn/supervision/pojo/po/user/UserReportPO.java   |  5 ++++-
 .../njcn/supervision/pojo/vo/user/UserReportVO.java   | 11 +++++++++++
 .../mapper/user/mapping/UserReportPOMapper.xml        |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
index cb5c52e19..9018afbf0 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
@@ -122,6 +122,9 @@ public class UserReportParam {
     @ApiModelProperty(value = "纬度")
     private BigDecimal latitude;
 
+    @ApiModelProperty(value = "额定容量")
+    private Double ratePower;
+
     /**
      * 预测评估结论
      */
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
index 6c004b59a..3e2cbe6e7 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
@@ -133,7 +133,10 @@ public class UserReportPO extends BaseEntity {
      */
     private String stationId;
 
-
+    /**
+     * 额定容量
+     */
+    private Double ratePower;
 
     /**
      * 经度
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
index b3a4aa9c2..ebb8f7248 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
@@ -94,10 +94,21 @@ public class UserReportVO {
      * 变电站
      */
     @ApiModelProperty(value = "变电站")
+    @Deprecated
     private String substation;
 
+
+    @ApiModelProperty(value = "变电站id")
     private String stationId;
 
+
+    /**
+     * 额定容量
+     */
+    @ApiModelProperty(value = "额定容量")
+    private Double ratePower;
+
+
     @ApiModelProperty(value = "经度")
     private BigDecimal longitude;
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml
index 8027fcba4..00109a89f 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml
@@ -11,6 +11,7 @@
       supervision_user_report.expected_production_date,
       supervision_user_report.user_type,
       supervision_user_report.city,
+      supervision_user_report.rate_power,
       supervision_user_report.responsible_department,
       supervision_user_report.user_status,
       supervision_user_report.substation,