From 16cf76055cf6a4a53b39f804b33c1e4936275fc1 Mon Sep 17 00:00:00 2001 From: panshulin Date: Fri, 3 Dec 2021 14:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=85=A5=E5=85=85?= =?UTF-8?q?=E7=94=B5=E6=A1=A9=E7=9A=84=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charging/station/service/XhpcChargingPileServiceImpl.java | 4 +--- .../main/java/com/xhpc/common/domain/XhpcChargingPile.java | 2 +- 2 files changed, 2 insertions(+), 4 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 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;