diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java index b7f871a9..1b4fe4e3 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java @@ -16,61 +16,77 @@ public class XhpcTerminal extends BaseEntity { private static final long serialVersionUID = 1L; + /** + * 终端id + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "terminal_id", nullable = false) private Long terminalId; - /** 电桩id */ - + /** + * 电桩id + */ + @Column(name = "charging_pile_id") private Long chargingPileId; - /** 电站id */ - + /** + * 电站id + */ + @Column(name = "charging_station_id") private Long chargingStationId; - /** 名称 */ - + /** + * 名称 + */ + @Column(name = "name") private String name; - /** 编号 */ - + /** + * 编号 + */ + @Column(name = "serial_number") private String serialNumber; /** 电桩编号 */ - + @Column(name = "pile_serial_number") private String pileSerialNumber; - /** 插枪状态 */ - + /** + * 插枪状态 + */ + @Column(name = "gun_status", nullable = true) private Integer gunStatus; /** 工作状态(0离线 1故障 2空闲 3充电) */ - + @Column(name = "work_status", nullable = true) private Integer workStatus; /** 状态(0正常 1停用) */ - + @Column(name = "status", nullable = true) private Integer status; /** 删除标志(0代表存在 2代表删除) */ - + @Column(name = "del_flag", nullable = true) private Integer delFlag; /** 费率模型id */ - + @Column(name = "rate_model_id") private Long rateModelId; - + @Column(name = "operator_id_evcs", nullable = true) private String operatorIdEvcs; /** * 充电设备类型 */ - + @Column(name = "connector_type", nullable = true) private Integer connectorType; /** * 电桩统计数量 */ - + @Column(name = "number", nullable = true) private Integer number; public int getConnectorType() { diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java index 570346f7..ce3dc71b 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java @@ -72,7 +72,7 @@ public class PileStartChargingDataLogic implements ServiceLogic { } else { physicCardNo = accountOrCardNo; } -// criteria.andCardidEqualTo(physicCardNo).andCorpnoEqualTo(corpNo); // todo remove corpNo + criteria.andCardidEqualTo(physicCardNo);//.andCorpnoEqualTo(corpNo); // todo remove corpNo alrity List iccardInfos = iccardInfoMapper.selectByExample(example); if (iccardInfos.size() == 1) { IccardInfo iccardInfo = iccardInfos.get(0);