yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改导入电桩时对0的判断

Browse Source
This commit is contained in:
panshulin 2021-12-20 17:16:41 +08:00
parent 2e2ac8b278
commit b183436bea
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java
View File

@ -324,16 +324,16 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
// 所有表格字段数据必须非空且有效 // 所有表格字段数据必须非空且有效
if("".equals(pile.getChargingStationName()) || "".equals(pile.getName()) if("".equals(pile.getChargingStationName()) || "".equals(pile.getName())
|| "".equals(pile.getBrandModel()) || "".equals(pile.getNationalStandard()) || "".equals(pile.getBrandModel()) || "".equals(pile.getNationalStandard())
|| pile.getPower() == null || pile.getPower()<=0 || pile.getPower() == null || pile.getPower()<0
|| pile.getAuxiliaryPowerSupply() == null || pile.getAuxiliaryPowerSupply()<=0 || pile.getAuxiliaryPowerSupply() == null || pile.getAuxiliaryPowerSupply()<0
|| pile.getInputVoltage() ==null || pile.getInputVoltage()<=0 || pile.getInputVoltage() ==null || pile.getInputVoltage()<0
|| pile.getMaxVoltage() ==null || pile.getMaxVoltage()<=0 || pile.getMaxVoltage() ==null || pile.getMaxVoltage()<0
|| pile.getMinVoltage() == null || pile.getMinVoltage() <= 0 || pile.getMinVoltage() == null || pile.getMinVoltage() < 0
|| pile.getMaxElectricCurrent() == null || pile.getMaxElectricCurrent() <= 0 || pile.getMaxElectricCurrent() == null || pile.getMaxElectricCurrent() < 0
|| pile.getMinElectriCurrent() == null || pile.getMinElectriCurrent() <=0 || pile.getMinElectriCurrent() == null || pile.getMinElectriCurrent() <0
|| "".equals(pile.getSerialNumber()) || "".equals(pile.getSerialNumber())
|| "".equals(pile.getTypeName()) || "".equals(pile.getTypeName())
|| pile.getGunNumber() == null || pile.getGunNumber() <=0 || pile.getGunNumber() == null || pile.getGunNumber() <0
|| "".equals(pile.getCommunicationProtocolVersion()) || "".equals(pile.getNetworkLinkType()) || "".equals(pile.getCommunicationProtocolVersion()) || "".equals(pile.getNetworkLinkType())
|| "".equals(pile.getProductionDate()) || "".equals(pile.getManufactureName()) || "".equals(pile.getProductionDate()) || "".equals(pile.getManufactureName())
|| "".equals(pile.getConnectorTypeName()) || "".equals(pile.getEquipmentTypeName())){ || "".equals(pile.getConnectorTypeName()) || "".equals(pile.getEquipmentTypeName())){

2
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java
View File

@ -21,7 +21,7 @@ public class XhpcChargingPile extends BaseEntity {
@Excel(name = "电站", cellType = Excel.ColumnType.STRING) @Excel(name = "电站", cellType = Excel.ColumnType.STRING)
private String chargingStationName; private String chargingStationName;
/** 名称 */ /** 名称 */
@Excel(name = "电桩名称(号桩 )", cellType = Excel.ColumnType.STRING) @Excel(name = "电桩名称(号桩)", cellType = Excel.ColumnType.STRING)
private String name; private String name;
/** 品牌型号 */ /** 品牌型号 */
@Excel(name = "品牌型号", cellType = Excel.ColumnType.STRING) @Excel(name = "品牌型号", cellType = Excel.ColumnType.STRING)