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());