diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/EquipBizRequest.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/EquipBizRequest.java index 9a458817..33d195bc 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/EquipBizRequest.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/EquipBizRequest.java @@ -11,9 +11,10 @@ import lombok.Setter; setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE) public class EquipBizRequest { - @JsonProperty("EquipBizSeq") + //将json当中的键值对为equipBizSeq的数据,封装到该属性中 + @JsonProperty("equipBizSeq") String equipBizSeq; - @JsonProperty("ConnectorID") + @JsonProperty("connectorId") String connectorId; } 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 17bd2232..0b815899 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 @@ -2,57 +2,79 @@ package com.xhpc.common.domain; import com.xhpc.common.core.web.domain.BaseEntity; +import javax.persistence.*; + /** * 终端 xhpc_terminal * * @author yuyang * @date 2021-07-20 */ +@Table(name = "xhpc_terminal") +@Entity public class XhpcTerminal extends BaseEntity { private static final long serialVersionUID = 1L; - /** 终端id */ + /** + * 终端id + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "terminal_id", nullable = false) private Long terminalId; /** 电桩id */ + @Column(name = "charging_pile_id") private Long chargingPileId; /** 电站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_falg", 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 int connectorType; /** * 电桩统计数量 */ + @Column(name = "number", nullable = true) private Integer number; public int getConnectorType() {