From 4532b6019294bbaa0478f4669b409207543e5841 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 3 Apr 2023 15:46:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=81=94=E8=81=94=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/thirdparty/dto/ChargeDetail.java | 14 +++---- .../dto/ConnectorChargeStatusInfo.java | 34 +++++++-------- .../jsowell/thirdparty/dto/ConnectorInfo.java | 16 +++---- .../thirdparty/dto/ConnectorStatsInfo.java | 4 +- .../thirdparty/dto/ConnectorStatusInfo.java | 8 ++-- .../com/jsowell/thirdparty/dto/OrderInfo.java | 42 +++++++++---------- ...peratorInfo.java => OrganizationInfo.java} | 14 +++---- .../dto/{EquipmentInfo.java => PileInfo.java} | 30 ++++++------- .../jsowell/thirdparty/dto/StationInfo.java | 4 +- .../thirdparty/dto/StationStatusInfo.java | 4 +- ...pmentStatsInfo.java => pileStatsInfo.java} | 8 ++-- 11 files changed, 89 insertions(+), 89 deletions(-) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/{OperatorInfo.java => OrganizationInfo.java} (71%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/{EquipmentInfo.java => PileInfo.java} (72%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/{EquipmentStatsInfo.java => pileStatsInfo.java} (78%) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ChargeDetail.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ChargeDetail.java index 68b865a9f..5e589e323 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ChargeDetail.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ChargeDetail.java @@ -19,36 +19,36 @@ public class ChargeDetail { * 开始时间 Y * 格式“yyyy-MM-dd HH:mm:ss” */ - private String DetailStartTime; + private String chargingStartTime; /** * 结束时间 Y * 格式“yyyy-MM-dd HH:mm:ss” */ - private String DetailEndTime; + private String chargingEndTime; /** * 时段电价(小数点后4位) Y */ - private BigDecimal ElecPrice; + private BigDecimal electricityPrice; /** * 时段服务费价格(小数点后4位) Y */ - private BigDecimal SevicePrice; + private BigDecimal servicePrice; /** * 时段充电量(单位：度，小数点后2位) Y */ - private BigDecimal DetailPower; + private BigDecimal chargingDegree; /** * 时段电费(小数点后2位) Y */ - private BigDecimal DetailElecMoney; + private BigDecimal electricityAmount; /** * 时段服务费(小数点后2位) Y */ - private BigDecimal DetailSeviceMoney; + private BigDecimal serviceAmount; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorChargeStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorChargeStatusInfo.java index 8796a8e0e..5b71a9bb5 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorChargeStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorChargeStatusInfo.java @@ -19,13 +19,13 @@ public class ConnectorChargeStatusInfo { * 充电订单号 Y * 对接平台系统订单编号 */ - private String StartChargeSeq; + private String orderCode; /** * 充电设备接口编码 Y * 平台下唯一枪口号 */ - private String ConnectorID; + private String pileConnectorCode; /** * 充电设备接口状态 Y @@ -35,88 +35,88 @@ public class ConnectorChargeStatusInfo { * 4：占用（预约锁定） * 255：故障 */ - private Integer ConnectorStatus; + private Integer connectorStatus; /** * 车辆识别码 N * 车辆识别号码或车架号码，由17位英数组成 */ - private String Vin; + private String vinCode; /** * A相电流 Y * 单位：A，默认：0 含直流(输出) */ - private BigDecimal CurrentA; + private BigDecimal currentA; /** * B相电流 N * 单位：A，默认：0 */ - private BigDecimal CurrentB; + private BigDecimal currentB; /** * C相电流 N * 单位：A，默认：0 */ - private BigDecimal CurrentC; + private BigDecimal currentC; /** * A相电压 Y * 单位：V，默认：0含直流(输出) */ - private BigDecimal VoltageA; + private BigDecimal voltageA; /** * B相电压 N * 单位：V，默认：0 */ - private BigDecimal VoltageB; + private BigDecimal voltageB; /** * C相电压 N * 单位：V，默认：0 */ - private BigDecimal VoltageC; + private BigDecimal voltageC; /** * 电池剩余电量(默认：0) Y */ - private BigDecimal Soc; + private BigDecimal soc; /** * 开始充电时间 Y * 格式“yyyy-MM-dd HH:mm:ss” */ - private String StartTime; + private String chargingStartTime; /** * 本次采样时间 Y * 格式“yyyy-MM-dd HH:mm:ss” */ - private String EndTime; + private String chargingEndTime; /** * 累计充电量 Y * 单位：度，小数点后2位 */ - private BigDecimal TotalPower; + private BigDecimal totalUseElectricity; /** * 累计电费 Y * 单位：元，小数点后2位 */ - private BigDecimal ElecMoney; + private BigDecimal totalElectricityAmount; /** * 累计服务费 Y * 单位：元，小数点后2位 */ - private BigDecimal SeviceMoney; + private BigDecimal totalServiceAmount; /** * 累计总金额 Y * 单位：元，小数点后2位 */ - private BigDecimal TotalMoney; + private BigDecimal totalAmount; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorInfo.java index 16d37aa71..001e29b8f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorInfo.java @@ -19,12 +19,12 @@ public class ConnectorInfo { * 充电设备接口编码 Y * 充电设备接口编码，同一对接平台内唯一 */ - private String ConnectorID; + private String PileConnectorCode; /** * 充电设备接口名称 N */ - private String ConnectorName; + private String connectorName; /** * 充电设备接口类型 Y @@ -33,32 +33,32 @@ public class ConnectorInfo { * 3：交流接口插头（带枪线，模式3，连接方式C） * 4：直流接口枪头（带枪线，模式4） */ - private Integer ConnectorType; + private Integer connectorType; /** * 额定电压上限(单位：V) Y */ - private Integer VoltageUpperLimits; + private Integer ratedVoltageMax; /** * 额定电压下限(单位：V) Y */ - private Integer VoltageLowerLimits; + private Integer ratedVoltageMin; /** * 额定电流(单位：A) Y */ - private Integer Current; + private Integer ratedCurrent; /** * 额定功率(单位：kW) Y */ - private BigDecimal Power; + private BigDecimal ratedPower; /** * 车位号 N * 停车场车位编号 */ - private String ParkNo; + private String parkingCode; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatsInfo.java index 92d77e8dc..8e1e9b956 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatsInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatsInfo.java @@ -19,11 +19,11 @@ public class ConnectorStatsInfo { * 充电设备接口编码 Y * 充电设备接口编码，同一对接平台内唯一 */ - private String ConnectorID; + private String pileConnectorCode; /** * 充电设备接口累计电量 * 累计电量，单位kWh，精度0.1 */ - private BigDecimal ConnectorElectricity; + private BigDecimal connectorAccumulateElectricity; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatusInfo.java index f75548708..022d7a06e 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/ConnectorStatusInfo.java @@ -17,7 +17,7 @@ public class ConnectorStatusInfo { * 充电设备接口编码 Y * 充电设备接口编码，同一对接平台内唯一 */ - private String ConnectorID; + private String pileConnectorCode; /** * 充电设备接口状态 Y @@ -28,15 +28,15 @@ public class ConnectorStatusInfo { * 4：占用（预约锁定） * 255：故障 */ - private String Status; + private String connectorStatus; /** * 车位状态(0-未知；10-空闲；50-占用) N */ - private String ParkStatus; + private String parkingStatus; /** * 地锁状态(0-未知；10-已解锁；50-占用) N */ - private String LockStatus; + private String groundLockStatus; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrderInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrderInfo.java index 157f59eba..e2234f27b 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrderInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrderInfo.java @@ -20,37 +20,37 @@ public class OrderInfo { * 对接平台ID Y * 组织机构代码 */ - private String OperatorID; + private String organizationCode; /** * 设备所属运营商ID Y * 设备所属运营商组织机构代码 */ - private String EquipmentOwnerID; + private String merchantId; /** * 充电站ID Y * 对接平台自定义的唯一编码 */ - private String StationID; + private String stationId; /** * 设备编码 Y * 设备唯一编码，对同一对接平台，保证唯一 */ - private String EquipmentID; + private String pileSn; /** * 充电设备接口编码 Y * 充电设备接口编码，同一对接平台内唯一 */ - private String ConnectorID; + private String pileConnectorCode; /** * 充电订单号 Y * 对接平台系统订单编号 */ - private String StartChargeSeq; + private String orderCode; /** * 用户发起充电类型 Y @@ -59,56 +59,56 @@ public class OrderInfo { * 3：互联互通用户 * 10:其他 */ - private Integer UserChargeType; + private Integer userType; /** * 用户手机号 N * 若用户发起充电类型为 APP，用户手机号必填 */ - private String MobileNumber; + private String userPhoneNumber; /** * 本次充电消费总金额(单位：元,保留小数点后2位) Y */ - private BigDecimal Money; + private BigDecimal orderAmount; /** * 本次充电电费总金额(单位：元,保留小数点后2位) Y */ - private BigDecimal ElectMoney; + private BigDecimal electricityAmount; /** * 本次充电服务费金额(单位：元,保留小数点后2位) Y */ - private BigDecimal ServiceMoney; + private BigDecimal serviceAmount; /** * 本次充电电量 Y * 单位kWh，精度0.01,保留小数点后2位 */ - private BigDecimal Elect; + private BigDecimal usedElectricity; /** * 本次充电开始时间 Y * 格式“yyyy-MM-dd HH:mm:ss” */ - private String StartTime; + private String chargingStartTime; /** * 本次充电结束时间 Y * 格式“yyyy-MM-dd HH:mm:ss” */ - private String EndTime; + private String chargingEndTime; /** * 支付金额 Y */ - private BigDecimal PaymentAmount; + private BigDecimal payAmount; /** * 支付时间 N */ - private String PayTime; + private String payTime; /** * 支付方式 Y @@ -119,13 +119,13 @@ public class OrderInfo { * 5：银联 * 6：其他自定义 */ - private Integer PayChannel; + private Integer payMode; /** * 优惠信息描述 N * 描述支付的相关优惠信息，如优惠券，折扣等 */ - private String DiscountInfo; + private String discountDescribe; /** * 充电结束原因 Y @@ -136,15 +136,15 @@ public class OrderInfo { * 4:连接器断开 * 5-99自定义 */ - private Integer StopReason; + private Integer stopReason; /** * 时段数N,范围：0～32 N */ - private Integer SumPeriod; + private Integer timePeriod; /** * 充电明细信息 Y */ - private List ChargeDetails; + private List chargeDetails; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OperatorInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrganizationInfo.java similarity index 71% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OperatorInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrganizationInfo.java index 60ac93091..85843e512 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OperatorInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/OrganizationInfo.java @@ -12,34 +12,34 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor -public class OperatorInfo { +public class OrganizationInfo { /** * 对接平台ID（组织机构代码） Y */ - private String OperatorID; + private String organizationCode; /** * 对接平台名称（机构全称） Y */ - private String OperatorName; + private String organizationName; /** * 对接平台电话（对接平台客服电话1） Y */ - private String OperatorTel1; + private String ServiceTelNumber1; /** * 对接平台电话2（对接平台客服电话2 ） N */ - private String OperatorTel2; + private String ServiceTelNumber2; /** * 对接平台注册地址 N */ - private String OperatorRegAddress; + private String registerAddress; /** * 备注 N */ - private String OperatorNote; + private String mark; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/EquipmentInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/PileInfo.java similarity index 72% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/EquipmentInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/PileInfo.java index ffa511f9d..2eff19696 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/EquipmentInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/PileInfo.java @@ -15,45 +15,45 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Data -public class EquipmentInfo { +public class PileInfo { /** * 设备编码 Y * 设备唯一编码，对同一对接平台，保证唯一 */ - private String EquipmentID; + private String pileSn; /** * 设备生产商组织机构代码 Y */ - private String ManufacturerID; + private String organizationCode; /** * 设备型号 N * 由设备生厂商定义的设备型号 */ - private String EquipmentModel; + private String pileModelName; /** * 设备名称 N */ - private String EquipmentName; + private String pileName; /** * 设备生产日期 N * YYYY-MM-DD */ - private String ProductionDate; + private String productionDate; /** * 建设时间 Y * YYYY-MM-DD */ - private String ConstructionTime; + private String constructionTime; /** * 设备类型(1-直流设备；2-交流设备；3-交直流一体设备) Y */ - private Integer EquipmentType; + private Integer pileType; /** * 设备状态 Y @@ -63,40 +63,40 @@ public class EquipmentInfo { * 6：维护中 * 50：正常使用 */ - private Integer EquipmentStatus; + private Integer pileStatus; /** * 额定功率(单位：kW) Y */ - private BigDecimal EquipmentPower; + private BigDecimal ratedPower; /** * 新国标(0-否；1-是) Y * 是否新国标 */ - private Integer NewNationalStandard; + private Integer newNationalStandard; /** * 充电设备接口列表 Y * 该充电设备所有的充电设备接口的信息对象集合 */ - private List ConnectorInfos; + private List connectorInfos; /** * 充电设备经度 N * GCJ-02坐标系 */ - private BigDecimal EquipmentLng; + private BigDecimal pileLng; /** * 充电设备纬度 N * GCJ-02坐标系 */ - private BigDecimal EquipmentLat; + private BigDecimal pileLat; /** * 是否支持VIN码识别(0-否；1-是) Y */ - private Integer VinFlag; + private Integer supportVinIdentify; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationInfo.java index ad6793675..4849c4e31 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationInfo.java @@ -210,7 +210,7 @@ public class StationInfo { * 营业时间 N * 营业时间描述,推荐格式：周一至周日00:00-24:00 */ - private String BusineHours; + private String BusinessHours; /** * 最低单价 Y @@ -264,7 +264,7 @@ public class StationInfo { * 充电设备信息列表 Y * 该充电站所有充电设备信息对象集合 */ - private List EquipmentInfos; + private List pileInfos; /** * 停车收费类型 Y diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationStatusInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationStatusInfo.java index 5149fb111..d7d49398c 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationStatusInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/StationStatusInfo.java @@ -19,11 +19,11 @@ public class StationStatusInfo { * 充电站ID Y * 对接平台自定义的唯一编码，不足长度在前方补0 */ - private String StationID; + private String stationId; /** * 充电设备接口状态列表 Y * 所有充电设备接口的状态 */ - private List ConnectorStatusInfos; + private List connectorStatusInfos; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/EquipmentStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/pileStatsInfo.java similarity index 78% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/EquipmentStatsInfo.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/pileStatsInfo.java index 7d84eb4f6..c1f8ebe47 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/EquipmentStatsInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dto/pileStatsInfo.java @@ -15,22 +15,22 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Data -public class EquipmentStatsInfo { +public class pileStatsInfo { /** * 设备编码 Y * 设备唯一编码，对同一对接平台，保证唯一 */ - private String EquipmentID; + private String pileSn; /** * 充电设备累计电量 Y * 累计电量，单位kWh，精度0.1 */ - private BigDecimal EquipmentElectricity; + private BigDecimal pileAccumulateElectricity; /** * 充电设备接口统计信息列表 Y * 充设备的所有充电设备接口统计对象集合 */ - private List ConnectorStatsInfos; + private List connectorStatsInfos; }