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

更新对象绑定的Excel单元格类型

Browse Source
This commit is contained in:
panshulin 2021-12-21 16:31:25 +08:00
parent 8926510f78
commit 91154b45b4
2 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,16 +325,16 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
// 所有表格字段数据必须非空且有效 // 所有表格字段数据必须非空且有效
if(StrUtil.hasBlank(pile.getChargingStationName()) || StrUtil.hasBlank(pile.getName()) if(StrUtil.hasBlank(pile.getChargingStationName()) || StrUtil.hasBlank(pile.getName())
|| StrUtil.hasBlank(pile.getBrandModel()) || StrUtil.hasBlank(pile.getNationalStandard()) || StrUtil.hasBlank(pile.getBrandModel()) || StrUtil.hasBlank(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
|| StrUtil.hasBlank(pile.getSerialNumber()) || StrUtil.hasBlank(pile.getSerialNumber())
|| StrUtil.hasBlank(pile.getTypeName()) || StrUtil.hasBlank(pile.getTypeName())
|| pile.getGunNumber() == null || pile.getGunNumber() <0 || pile.getGunNumber() == null || pile.getGunNumber() < 0
|| StrUtil.hasBlank(pile.getCommunicationProtocolVersion()) || StrUtil.hasBlank(pile.getNetworkLinkType()) || StrUtil.hasBlank(pile.getCommunicationProtocolVersion()) || StrUtil.hasBlank(pile.getNetworkLinkType())
|| StrUtil.hasBlank(pile.getProductionDate()) || StrUtil.hasBlank(pile.getManufactureName()) || StrUtil.hasBlank(pile.getProductionDate()) || StrUtil.hasBlank(pile.getManufactureName())
|| StrUtil.hasBlank(pile.getConnectorTypeName())|| StrUtil.hasBlank(pile.getEquipmentTypeName())){ || StrUtil.hasBlank(pile.getConnectorTypeName())|| StrUtil.hasBlank(pile.getEquipmentTypeName())){
@ -394,5 +394,4 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
} }
return successMsg.toString(); return successMsg.toString();
} }
} }

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

@ -18,64 +18,64 @@ public class XhpcChargingPile extends BaseEntity {
private Long chargingStationId; private Long chargingStationId;
/** 场站名称 */ /** 场站名称 */
@Excel(name = "电站", cellType = Excel.ColumnType.STRING) @Excel(name = "电站")
private String chargingStationName; private String chargingStationName;
/** 名称 */ /** 名称 */
@Excel(name = "电桩名称(号桩)", cellType = Excel.ColumnType.STRING) @Excel(name = "电桩名称(号桩)")
private String name; private String name;
/** 品牌型号 */ /** 品牌型号 */
@Excel(name = "品牌型号", cellType = Excel.ColumnType.STRING) @Excel(name = "品牌型号")
private String brandModel; private String brandModel;
/** 国标 */ /** 国标 */
@Excel(name = "电桩国际", cellType = Excel.ColumnType.STRING) @Excel(name = "电桩国际")
private String nationalStandard; private String nationalStandard;
/** 功率 */ /** 功率 */
@Excel(name = "电桩功率(KW)", cellType = Excel.ColumnType.STRING) @Excel(name = "电桩功率(KW)")
private Double power; private Double power;
/** 辅助电源支持 */ /** 辅助电源支持 */
@Excel(name = "辅助电源支持(V)", cellType = Excel.ColumnType.STRING) @Excel(name = "辅助电源支持(V)")
private Double auxiliaryPowerSupply; private Double auxiliaryPowerSupply;
/** 输入电压 */ /** 输入电压 */
@Excel(name = "输入电压(V)", cellType = Excel.ColumnType.STRING) @Excel(name = "输入电压(V)")
private Double inputVoltage; private Double inputVoltage;
/** 最大电压 */ /** 最大电压 */
@Excel(name = "最大电压(V)", cellType = Excel.ColumnType.STRING) @Excel(name = "最大电压(V)")
private Double maxVoltage; private Double maxVoltage;
/** 最小电压 */ /** 最小电压 */
@Excel(name = "最小电压(V)", cellType = Excel.ColumnType.STRING) @Excel(name = "最小电压(V)")
private Double minVoltage; private Double minVoltage;
/** 最大电流 */ /** 最大电流 */
@Excel(name = "最大电流(A)", cellType = Excel.ColumnType.STRING) @Excel(name = "最大电流(A)")
private Double maxElectricCurrent; private Double maxElectricCurrent;
/** 最小电流 */ /** 最小电流 */
@Excel(name = "最小电流(A)", cellType = Excel.ColumnType.STRING) @Excel(name = "最小电流(A)")
private Double minElectriCurrent; private Double minElectriCurrent;
/** 桩编号 */ /** 桩编号 */
@Excel(name = "桩编码", cellType = Excel.ColumnType.STRING) @Excel(name = "桩编码")
private String serialNumber; private String serialNumber;
/** 桩类型 */ /** 桩类型 */
private Integer type; private Integer type;
@Excel(name = "电桩类型", type= Excel.Type.IMPORT) @Excel(name = "电桩类型")
private String typeName; private String typeName;
/** 程序版本 */ /** 程序版本 */
@Excel(name = "程序版本", cellType = Excel.ColumnType.STRING) @Excel(name = "程序版本")
private String programVersion; private String programVersion;
/** 网络链接类型 */ /** 网络链接类型 */
@Excel(name = "网络连接类型", cellType = Excel.ColumnType.STRING) @Excel(name = "网络连接类型")
private String networkLinkType; private String networkLinkType;
/** 终端数量 */ /** 终端数量 */
@Excel(name = "终端数量", cellType = Excel.ColumnType.STRING) @Excel(name = "终端数量")
private Integer gunNumber; private Integer gunNumber;
/** 通讯协议版本 */ /** 通讯协议版本 */
@Excel(name = "通讯协议版本", cellType = Excel.ColumnType.STRING) @Excel(name = "通讯协议版本")
private String communicationProtocolVersion; private String communicationProtocolVersion;
/** 通讯运营商 */ /** 通讯运营商 */
@Excel(name = "通讯运营商", cellType = Excel.ColumnType.STRING) @Excel(name = "通讯运营商")
private String communicationOperator; private String communicationOperator;
/** Sim卡 */ /** Sim卡 */
@Excel(name = "SIM卡号", cellType = Excel.ColumnType.STRING) @Excel(name = "SIM卡号")
private String simCard; private String simCard;
/** 状态（0正常 1停用） */ /** 状态（0正常 1停用） */
private Integer status; private Integer status;
@ -86,13 +86,13 @@ public class XhpcChargingPile extends BaseEntity {
/** /**
* 设备生产日期（格式YYYY-MM-DD） * 设备生产日期（格式YYYY-MM-DD）
*/ */
@Excel(name = "设备生产日期", cellType = Excel.ColumnType.STRING) @Excel(name = "设备生产日期")
private String productionDate; private String productionDate;
/** /**
* 设备生产商名称 * 设备生产商名称
*/ */
@Excel(name = "设备生产商名称", cellType = Excel.ColumnType.STRING) @Excel(name = "设备生产商名称")
private String manufactureName; private String manufactureName;
/** /**
@ -104,12 +104,12 @@ public class XhpcChargingPile extends BaseEntity {
/** /**
* 充电设备接口类型，导入Excel使用 * 充电设备接口类型，导入Excel使用
*/ */
@Excel(name = "充电设备类型", cellType = Excel.ColumnType.STRING) @Excel(name = "充电设备类型")
private String connectorTypeName; private String connectorTypeName;
/** /**
* 额定电流（单位A） * 额定电流（单位A）
*/ */
@Excel(name = "额定电流(A)", cellType = Excel.ColumnType.STRING) @Excel(name = "额定电流(A)")
private Integer current; private Integer current;
/** /**
@ -120,7 +120,7 @@ public class XhpcChargingPile extends BaseEntity {
/** /**
* 设备类型，导入Excel使用 * 设备类型，导入Excel使用
*/ */
@Excel(name = "设备类型", cellType = Excel.ColumnType.STRING, type = Excel.Type.IMPORT) @Excel(name = "设备类型")
private String equipmentTypeName; private String equipmentTypeName;
public String getTypeName() { public String getTypeName() {