From 3e193efc4b8dff74a2c44c0a01c72301cb0e89b9 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Fri, 15 Mar 2024 11:45:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=85=B8=E5=9E=8B=E6=BA=90=E8=8D=B7=EF=BC=8C?=
 =?UTF-8?q?=E7=94=B5=E6=B0=94=E5=8C=96=E9=93=81=E8=B7=AF=E4=B8=8A=E9=80=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java   | 5 +++++
 .../pms/service/gwPush/impl/MonitorSendServiceImpl.java      | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java
index 9967f899e..77b3f0c94 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java
@@ -105,6 +105,11 @@ public class TractionStationDTO extends Unit {
     /*变压器额定容量  是否必填：否*/
     @ExcelProperty(value = "变压器额定容量")
     private BigDecimal transformerNameplateCapacity;
+
+    /*牵引站变电容量  是否必填：是*/
+    @ExcelProperty(value = "牵引站变电容量")
+    private BigDecimal tractionSubCapacity;
+
     /*变压器一次侧额定电压等级  是否必填：否*/
     @ExcelProperty(value = "变压器一次侧额定电压等级")
     private String transformerOneVoltageLevel;
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java
index 9ff0750dc..78e2b284c 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java
@@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -481,7 +482,7 @@ public class MonitorSendServiceImpl implements MonitorSendService {
                 sendVO.setRailwayType(traction.getRailwayType());
                 sendVO.setRailwayNumber(traction.getRailwayLineId());
                 sendVO.setTractionCode(traction.getId());
-                sendVO.setTractionSubstationCapacity(traction.getRatedCapacity());
+                sendVO.setTractionSubCapacity(BigDecimal.valueOf(traction.getRatedCapacity()));
                 sendVO.setTractionSubstationId(monitor.getPowerrId());
                 sendVO.setTractionSubstationName(monitor.getPowerrName());
                 sendVO.setMainSubstationId(monitor.getPowerrId());