Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

2026-04-20 11:05:18 +08:00 · 2023-06-28 10:25:29 +08:00
parent 8a735351a8 1de7f0a8dc
commit 9842139be3
7 changed files with 56 additions and 49 deletions
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorInfo.java
@@ -1,6 +1,7 @@
 package com.jsowell.thirdparty.amap.domain;

 import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,7 +19,7 @@ import java.math.BigDecimal;
 public class AMapConnectorInfo {

    // 充电设备接口编码，同一运营商内唯一
-    @JSONField(name = "ConnectorID")
+    @JsonProperty(value = "ConnectorID")
    private String connectorID;

    /**
@@ -29,23 +30,23 @@ public class AMapConnectorInfo {
     * 4：直流接口枪头（带枪线，模式4） 5：无线充电座
     * 6：其他
     */
-    @JSONField(name = "ConnectorType")
+    @JsonProperty(value = "ConnectorType")
    private Integer connectorType;

    // 额定电压上限。单位：V
-    @JSONField(name = "VoltageUpperLimits")
+    @JsonProperty(value = "VoltageUpperLimits")
    private Integer voltageUpperLimits;

-    // 额定电压上限。单位：V
-    @JSONField(name = "VoltageLowerLimits")
+    // 额定电压下限。单位：V
+    @JsonProperty(value = "VoltageLowerLimits")
    private Integer voltageLowerLimits;

    // 额定电流  单位：A
-    @JSONField(name = "Current")
+    @JsonProperty(value = "Current")
    private Integer current;

    // 额定功率  单位：kW  保留小数点后一位
-    @JSONField(name = "Power")
+    @JsonProperty(value = "Power")
    private BigDecimal power;

    /**
@@ -53,10 +54,10 @@ public class AMapConnectorInfo {
     * 1:2011
     * 2:2015
     */
-    @JSONField(name = "NationalStandard")
+    @JsonProperty(value = "NationalStandard")
    private Integer nationalStandard;

    // 所属运营商的品牌名称
-    @JSONField(name = "BrandDesc")
+    @JsonProperty(value = "BrandDesc")
    private String brandDesc;
 }
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorStatusInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorStatusInfo.java
@@ -1,6 +1,7 @@
 package com.jsowell.thirdparty.amap.domain;

 import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -19,11 +20,11 @@ import lombok.NoArgsConstructor;
 public class AMapConnectorStatusInfo {

    //充电设备接口编码，同一运营商内唯一
-    @JSONField(name = "ConnectorID")
+    @JsonProperty(value = "ConnectorID")
    private String connectorID;

    // 充电枪所属的桩设备ID
-    @JSONField(name = "EquipmentID")
+    @JsonProperty(value = "EquipmentID")
    private String equipmentID;

    /**
@@ -35,7 +36,7 @@ public class AMapConnectorStatusInfo {
     * 4：占用（预约锁定）
     * 255：故障
     */
-    @JSONField(name = "Status")
+    @JsonProperty(value = "Status")
    private String status;

 }
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java
@@ -1,6 +1,7 @@
 package com.jsowell.thirdparty.amap.domain;

 import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -21,17 +22,17 @@ import java.math.BigDecimal;
 public class AMapDiscountPriceChargingInfo {

    // 收费时间段 00:00-24:00表示全天电价相同
-    @JSONField(name = "DiscountTime")
+    @JsonProperty(value = "DiscountTime")
    private String discountTime;

    // 站点充电费优惠价
    // 只填数字或数字区间，单位：元/度。
    // 空表示未获取到价格，0.00表示免费
    // 格式：保留四位小数
-    @JSONField(name = "DiscountElectricityFee")
+    @JsonProperty(value = "DiscountElectricityFee")
    private BigDecimal discountElectricityFee;

    // 站点服务费优惠价
-    @JSONField(name = "DiscountServiceFee")
+    @JsonProperty(value = "DiscountServiceFee")
    private BigDecimal discountServiceFee;
 }
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java
@@ -1,6 +1,7 @@
 package com.jsowell.thirdparty.amap.domain;

 import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,11 +19,11 @@ import java.util.List;
@Data
 public class AMapEquipmentInfo {
    // 设备唯一编码，对同一运营商，保证唯一
-    @JSONField(name = "EquipmentID")
+    @JsonProperty(value = "EquipmentID")
    private String equipmentID;

    // 设备生产商名称
-    @JSONField(name = "ManufacturerName")
+    @JsonProperty(value = "ManufacturerName")
    private String manufacturerName;

    /**
@@ -35,14 +36,14 @@ public class AMapEquipmentInfo {
     * 12：直流慢充
     * 13：交流快充
     */
-    @JSONField(name = "EquipmentType")
+    @JsonProperty(value = "EquipmentType")
    private Integer equipmentType;

    // 充电设备接口列表
-    @JSONField(name = "ConnectorInfos")
+    @JsonProperty(value = "ConnectorInfos")
    private List<AMapConnectorInfo> connectorInfos;

    // 充电设备总功率 单位：kW
-    @JSONField(name = "Power")
+    @JsonProperty(value = "Power")
    private BigDecimal power;
 }
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPictures.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPictures.java
@@ -1,6 +1,7 @@
 package com.jsowell.thirdparty.amap.domain;

 import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,14 +19,14 @@ import lombok.NoArgsConstructor;
@Data
 public class AMapPictures {
    // 图片ID
-    @JSONField(name = "PicID")
+    @JsonProperty(value = "PicID")
    private String picID;

    // 图片网址
-    @JSONField(name = "Url")
+    @JsonProperty(value = "Url")
    private String url;

    // 图片标题
-    @JSONField(name = "Title")
+    @JsonProperty(value = "Title")
    private String title;
 }
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPriceChargingInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPriceChargingInfo.java
@@ -1,6 +1,7 @@
 package com.jsowell.thirdparty.amap.domain;

 import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -25,7 +26,7 @@ public class AMapPriceChargingInfo {
     * 02:00-03:00
     * 09:00-17:00
     */
-    @JSONField(name = "FeeTime")
+    @JsonProperty(value = "FeeTime")
    private String feeTime;

    /**
@@ -36,7 +37,7 @@ public class AMapPriceChargingInfo {
     * 示例：
     * 2.0000
     */
-    @JSONField(name = "ElectricityFee")
+    @JsonProperty(value = "ElectricityFee")
    private BigDecimal electricityFee;

    /**
@@ -47,6 +48,6 @@ public class AMapPriceChargingInfo {
     * 示例：
     * 2.0000
     */
-    @JSONField(name = "ServiceFee")
+    @JsonProperty(value = "ServiceFee")
    private BigDecimal serviceFee;
 }
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java
@@ -1,6 +1,7 @@
 package com.jsowell.thirdparty.amap.domain;

 import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,43 +19,43 @@ import java.util.List;
@Data
 public class AMapStationInfo {
    // 充电站ID  运营商自定义的唯一编码
-    @JSONField(name = "StationID")
+    @JsonProperty(value = "StationID")
    private String stationID;

    // 运营商ID
-    @JSONField(name = "OperatorID")
+    @JsonProperty(value = "OperatorID")
    private String operatorID;

    // 设备所属方ID  设备所属运营平台组织机构代码
-    @JSONField(name = "EquipmentOwnerID")
+    @JsonProperty(value = "EquipmentOwnerID")
    private String equipmentOwnerID;

    // 充电站运营商品牌名称
    // -拼接poi名称使用，请谨慎填写
-    @JSONField(name = "OperatorName")
+    @JsonProperty(value = "OperatorName")
    private String operatorName;

    /**
     * 充电站名称的描述
     * -拼接poi名称使用，请谨慎填写
     */
-    @JSONField(name = "StationName")
+    @JsonProperty(value = "StationName")
    private String stationName;

    // 充电站国家代码  比如CN
-    @JSONField(name = "CountryCode")
+    @JsonProperty(value = "CountryCode")
    private String countryCode;

    // 充电站省市辖区编码
-    @JSONField(name = "AreaCode")
+    @JsonProperty(value = "AreaCode")
    private String areaCode;

    // 详细地址，不含省市区
-    @JSONField(name = "Address")
+    @JsonProperty(value = "Address")
    private String address;

    // 平台服务电话，例如400的电话
-    @JSONField(name = "ServiceTel")
+    @JsonProperty(value = "ServiceTel")
    private String serviceTel;

    /**
@@ -70,7 +71,7 @@ public class AMapStationInfo {
     * 106：车企站（专用）
     * 255：其他
     */
-    @JSONField(name = "StationType")
+    @JsonProperty(value = "StationType")
    private Integer stationType;

    /**
@@ -81,7 +82,7 @@ public class AMapStationInfo {
     * 6：维护中
     * 50：正常使用
     */
-    @JSONField(name = "StationStatus")
+    @JsonProperty(value = "StationStatus")
    private Integer stationStatus;

    /**
@@ -89,19 +90,19 @@ public class AMapStationInfo {
     * 0：完全对外
     * 7：不对外开放
     */
-    @JSONField(name = "OpenType")
+    @JsonProperty(value = "OpenType")
    private Integer openType;

    // 车位数量  可停放进行充电的车位总数，默认：0 未知
-    @JSONField(name = "ParkNums")
+    @JsonProperty(value = "ParkNums")
    private Integer parkNums;

    // 经度
-    @JSONField(name = "StationLng")
+    @JsonProperty(value = "StationLng")
    private BigDecimal stationLng;

    // 纬度
-    @JSONField(name = "StationLat")
+    @JsonProperty(value = "StationLat")
    private BigDecimal stationLat;

    /**
@@ -123,7 +124,7 @@ public class AMapStationInfo {
     * 15：酒店
     * 255：其他
     */
-    @JSONField(name = "Construction")
+    @JsonProperty(value = "Construction")
    private Integer construction;

    /**
@@ -132,30 +133,30 @@ public class AMapStationInfo {
     * 00:00-24:00;
     * 08:00-20:00
     */
-    @JSONField(name = "BusineHours")
+    @JsonProperty(value = "BusineHours")
    private String busineHours;

    // 充电收费信息
-    @JSONField(name = "PriceChargingInfo")
+    @JsonProperty(value = "PriceChargingInfo")
    private List<AMapPriceChargingInfo> priceChargingInfo;

    // 站点照片
-    @JSONField(name = "Pictures")
+    @JsonProperty(value = "Pictures")
    private List<AMapPictures> pictures;

    // 站点收费价格明细_优惠价
-    @JSONField(name = "DiscountPriceChargingInfo")
+    @JsonProperty(value = "DiscountPriceChargingInfo")
    private List<AMapDiscountPriceChargingInfo> discountPriceChargingInfo;

    // 快充总桩数
-    @JSONField(name = "FastEquipmentNum")
+    @JsonProperty(value = "FastEquipmentNum")
    private Integer fastEquipmentNum;

    // 慢充总桩数
-    @JSONField(name = "SlowEquipmentNum")
+    @JsonProperty(value = "SlowEquipmentNum")
    private Integer slowEquipmentNum;

    // 充电设备信息列表
-    @JSONField(name = "EquipmentInfos")
+    @JsonProperty(value = "EquipmentInfos")
    private List<AMapEquipmentInfo> equipmentInfos;
 }