From b2c56fdc4361b283e0136a52a482f122d6d07fbd Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 28 Jun 2023 08:35:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=20=E9=AB=98=E5=BE=B7=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/thirdparty/amap/domain/AMapConnectorInfo.java | 2 +- .../jsowell/thirdparty/amap/domain/AMapConnectorStatusInfo.java | 2 +- .../thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java | 2 +- .../com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java | 2 +- .../java/com/jsowell/thirdparty/amap/domain/AMapPictures.java | 2 +- .../jsowell/thirdparty/amap/domain/AMapPriceChargingInfo.java | 2 +- .../com/jsowell/thirdparty/amap/domain/AMapStationInfo.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git 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 index 7ab97945e..a811537cb 100644 --- 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,6 @@ package com.jsowell.thirdparty.amap.domain; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; diff --git 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 index 91cac5254..108ba446c 100644 --- 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,6 @@ package com.jsowell.thirdparty.amap.domain; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; /** diff --git 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 index 5f109eaca..c633b3163 100644 --- 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,6 @@ package com.jsowell.thirdparty.amap.domain; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; diff --git 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 index 5909c6dee..c5ad1e27e 100644 --- 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,6 @@ package com.jsowell.thirdparty.amap.domain; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; diff --git 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 index 5d3d392c3..80c7caed3 100644 --- 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,6 @@ package com.jsowell.thirdparty.amap.domain; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; /** diff --git 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 index a28450165..3fe5e25bd 100644 --- 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,6 @@ package com.jsowell.thirdparty.amap.domain; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; diff --git 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 index 9cec9af1b..760ddf7ba 100644 --- 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,6 @@ package com.jsowell.thirdparty.amap.domain; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; From 36467fd135549c108a41ce3c261bfe9a70bb2130 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 28 Jun 2023 08:51:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=20=E9=AB=98=E5=BE=B7=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/thirdparty/amap/domain/AMapConnectorInfo.java | 7 ++++++- .../thirdparty/amap/domain/AMapConnectorStatusInfo.java | 6 ++++++ .../amap/domain/AMapDiscountPriceChargingInfo.java | 6 ++++++ .../jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java | 7 ++++++- .../com/jsowell/thirdparty/amap/domain/AMapPictures.java | 6 ++++++ .../thirdparty/amap/domain/AMapPriceChargingInfo.java | 6 ++++++ .../jsowell/thirdparty/amap/domain/AMapStationInfo.java | 7 ++++++- 7 files changed, 42 insertions(+), 3 deletions(-) diff --git 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 index a811537cb..26028639c 100644 --- 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,14 +1,19 @@ package com.jsowell.thirdparty.amap.domain; import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; /** * 充电设备接口信息 */ - +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data public class AMapConnectorInfo { diff --git 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 index 108ba446c..ef240229f 100644 --- 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,7 +1,10 @@ package com.jsowell.thirdparty.amap.domain; import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * 高德地图充电枪状态 @@ -9,6 +12,9 @@ import lombok.Data; * @author Lemon * @Date 2023/6/15 16:00 */ +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data public class AMapConnectorStatusInfo { diff --git 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 index c633b3163..e166b13bc 100644 --- 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,7 +1,10 @@ package com.jsowell.thirdparty.amap.domain; import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @@ -11,6 +14,9 @@ import java.math.BigDecimal; * @author Lemon * @Date 2023/6/27 14:46 */ +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data public class AMapDiscountPriceChargingInfo { diff --git 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 index c5ad1e27e..60c51b594 100644 --- 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,7 +1,10 @@ package com.jsowell.thirdparty.amap.domain; import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.List; @@ -9,7 +12,9 @@ import java.util.List; /** * 充电设备信息 */ - +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data public class AMapEquipmentInfo { // 设备唯一编码,对同一运营商,保证唯一 diff --git 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 index 80c7caed3..fbccf1727 100644 --- 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,7 +1,10 @@ package com.jsowell.thirdparty.amap.domain; import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * 图片信息 @@ -9,6 +12,9 @@ import lombok.Data; * @author Lemon * @Date 2023/6/27 14:48 */ +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data public class AMapPictures { // 图片ID diff --git 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 index 3fe5e25bd..a39008e87 100644 --- 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,7 +1,10 @@ package com.jsowell.thirdparty.amap.domain; import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @@ -11,6 +14,9 @@ import java.math.BigDecimal; * @author Lemon * @Date 2023/6/14 11:02 */ +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data public class AMapPriceChargingInfo { /** diff --git 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 index 760ddf7ba..d11217212 100644 --- 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,7 +1,10 @@ package com.jsowell.thirdparty.amap.domain; import com.alibaba.fastjson2.annotation.JSONField; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.List; @@ -9,7 +12,9 @@ import java.util.List; /** * 充电站信息 */ - +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data public class AMapStationInfo { // 充电站ID 运营商自定义的唯一编码