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 971be3a6..1f3923d0 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 @@ -332,12 +332,10 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { || pile.getMaxElectricCurrent() == null || pile.getMaxElectricCurrent() <= 0 || pile.getMinElectriCurrent() == null || pile.getMinElectriCurrent() <=0 || "".equals(pile.getSerialNumber()) - || "".equals(pile.getTypeName()) || "".equals(pile.getProgramVersion()) + || "".equals(pile.getTypeName()) || pile.getGunNumber() == null || pile.getGunNumber() <=0 || "".equals(pile.getCommunicationProtocolVersion()) || "".equals(pile.getNetworkLinkType()) - || "".equals(pile.getCommunicationOperator()) || "".equals(pile.getSimCard()) || "".equals(pile.getProductionDate()) || "".equals(pile.getManufactureName()) - || pile.getCurrent() == null || pile.getCurrent() <=0 || "".equals(pile.getConnectorTypeName()) || "".equals(pile.getEquipmentTypeName())){ failureNum ++; failureMsg.append("
电站名称: ").append(pile.getChargingStationName()).append(" ,电桩名称: ").append(pile.getName()).append(" 导入失败; 失败原因: 必填字段为空。"); 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 4caa7ffb..80cb5a9f 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 @@ -75,7 +75,7 @@ public class XhpcChargingPile extends BaseEntity { @Excel(name = "通讯运营商", cellType = Excel.ColumnType.STRING) private String communicationOperator; /** Sim卡 */ - @Excel(name = "SIMK", cellType = Excel.ColumnType.STRING) + @Excel(name = "SIM卡号", cellType = Excel.ColumnType.STRING) private String simCard; /** 状态(0正常 1停用) */ private Integer status;