From b183436bea1af064e4f247085bd5ee46e9216a9a Mon Sep 17 00:00:00 2001 From: panshulin Date: Mon, 20 Dec 2021 17:16:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E7=94=B5?= =?UTF-8?q?=E6=A1=A9=E6=97=B6=E5=AF=B90=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/XhpcChargingPileServiceImpl.java | 16 ++++++++-------- .../com/xhpc/common/domain/XhpcChargingPile.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java index 1f3923d0..49b5f2e5 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java @@ -324,16 +324,16 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { // 所有表格字段数据必须非空且有效 if("".equals(pile.getChargingStationName()) || "".equals(pile.getName()) || "".equals(pile.getBrandModel()) || "".equals(pile.getNationalStandard()) - || pile.getPower() == null || pile.getPower()<=0 - || pile.getAuxiliaryPowerSupply() == null || pile.getAuxiliaryPowerSupply()<=0 - || pile.getInputVoltage() ==null || pile.getInputVoltage()<=0 - || pile.getMaxVoltage() ==null || pile.getMaxVoltage()<=0 - || pile.getMinVoltage() == null || pile.getMinVoltage() <= 0 - || pile.getMaxElectricCurrent() == null || pile.getMaxElectricCurrent() <= 0 - || pile.getMinElectriCurrent() == null || pile.getMinElectriCurrent() <=0 + || pile.getPower() == null || pile.getPower()<0 + || pile.getAuxiliaryPowerSupply() == null || pile.getAuxiliaryPowerSupply()<0 + || pile.getInputVoltage() ==null || pile.getInputVoltage()<0 + || pile.getMaxVoltage() ==null || pile.getMaxVoltage()<0 + || pile.getMinVoltage() == null || pile.getMinVoltage() < 0 + || pile.getMaxElectricCurrent() == null || pile.getMaxElectricCurrent() < 0 + || pile.getMinElectriCurrent() == null || pile.getMinElectriCurrent() <0 || "".equals(pile.getSerialNumber()) || "".equals(pile.getTypeName()) - || pile.getGunNumber() == null || pile.getGunNumber() <=0 + || pile.getGunNumber() == null || pile.getGunNumber() <0 || "".equals(pile.getCommunicationProtocolVersion()) || "".equals(pile.getNetworkLinkType()) || "".equals(pile.getProductionDate()) || "".equals(pile.getManufactureName()) || "".equals(pile.getConnectorTypeName()) || "".equals(pile.getEquipmentTypeName())){ diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java index 80cb5a9f..79410ae2 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java @@ -21,7 +21,7 @@ public class XhpcChargingPile extends BaseEntity { @Excel(name = "电站", cellType = Excel.ColumnType.STRING) private String chargingStationName; /** 名称 */ - @Excel(name = "电桩名称(号桩 )", cellType = Excel.ColumnType.STRING) + @Excel(name = "电桩名称(号桩)", cellType = Excel.ColumnType.STRING) private String name; /** 品牌型号 */ @Excel(name = "品牌型号", cellType = Excel.ColumnType.STRING)