fix bug 站点缺失设备数据

entity/src/main/java/com/kym/entity/admin/Station.java

@@ -1,5 +1,6 @@
 package com.kym.entity.admin;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.annotation.JSONCreator;
 import com.alibaba.fastjson2.annotation.JSONField;
@@ -7,10 +8,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.kym.entity.BaseEntity;
+import com.kym.entity.enplus.EnEquipmentInfo;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -27,8 +30,6 @@ public class Station extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司id
      */
@@ -184,9 +185,16 @@ public class Station extends BaseEntity implements Serializable {
     @JSONField(name = "Remark")
     private String remark;
 
+    /**
+     * 充电设备信息列表
+     */
+    private List<EnEquipmentInfo> equipmentInfos;
+
+
     @JSONCreator
-    public Station(@JSONField(name = "StationLng") Double lng, @JSONField(name = "StationLat") Double lat) {
+    public Station(@JSONField(name = "StationLng") Double lng, @JSONField(name = "StationLat") Double lat, @JSONField(name = "EquipmentInfos") JSONArray array) {
         this.location = JSONObject.of("stationLng", lng, "stationLat", lat);
+        this.equipmentInfos = array.toJavaList(EnEquipmentInfo.class);
     }
 
 }

entity/src/main/java/com/kym/entity/enplus/EnConnectorInfo.java

@@ -1,5 +1,6 @@
 package com.kym.entity.enplus;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 /**
@@ -12,10 +13,12 @@ public class EnConnectorInfo {
     /**
      * 充电设备接口编码
      */
+    @JSONField(name = "")
     private String ConnectorID;
     /**
      * 充电设备接口名称
      */
+    @JSONField(name = "")
     private String ConnectorName;
     /**
      * 充电设备接口类型
@@ -26,37 +29,44 @@ public class EnConnectorInfo {
      * 5：无线充电桩
      * 6：其他
      */
-    private int ConnectorType;
+    @JSONField(name = "ConnectorType")
+    private int connectorType;
 
     /**
      * 额定电压上限（V）
      */
-    private int VoltageUpperLimits;
+    @JSONField(name = "VoltageUpperLimits")
+    private int voltageUpperLimits;
 
     /**
      * 额定电压下限（V）
      */
-    private int VoltageLowerLimits;
+    @JSONField(name = "voltageLowerLimits")
+    private int voltageLowerLimits;
     /**
      * 额定电流(A)
      */
-    private int Current;
+    @JSONField(name = "Current")
+    private int current;
 
     /**
      * 额定功率（KW）
      */
-    private int Power;
+    @JSONField(name = "Power")
+    private int power;
 
     /**
      * 停车场车位编号
      */
-    private String ParkNo;
+    @JSONField(name = "ParkNo")
+    private String parkNo;
     /**
      * 国家标准
      * 1:2011
      * 2:2015
      */
-    private int NationalStandard;
+    @JSONField(name = "NationalStandard")
+    private int nationalStandard;
 
 
 }

entity/src/main/java/com/kym/entity/enplus/EnEquipmentInfo.java

@@ -0,0 +1,71 @@
+package com.kym.entity.enplus;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.annotation.JSONCreator;
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author skyline
+ * @description 充电设备信息
+ * @date 2023-07-31 15:21
+ */
+@Data
+public class EnEquipmentInfo {
+
+    /**
+     * 设备编码
+     */
+    @JSONField(name = "EquipmentID")
+    private String equipmentId;
+
+    /**
+     * 设备生产商组织机构代码
+     */
+    @JSONField(name = "ManufacturerID")
+    private String manufacturerId;
+
+    /**
+     * 设备生产商名称
+     */
+    @JSONField(name = "ManufacturerName")
+    private String manufacturerName;
+
+    /**
+     * 设备型号
+     */
+    @JSONField(name = "EquipmentModel")
+    private String equipmentModel;
+
+    /**
+     * 设备生产日期(YYYY-MM-DD)
+     */
+    @JSONField(name = "ProductionDate")
+    private String productionDate;
+
+    /**
+     * 设备类型
+     * 1：直流设备
+     * 2：交流设备
+     * 3：交直流一体设备
+     * 4：无线设备
+     * 5：其他
+     */
+    @JSONField(name = "EquipmentType")
+    private Integer equipmentType;
+
+    /**
+     * 充电设备接口信息列表
+     */
+    private List<EnConnectorInfo> connectorInfos;
+
+    @JSONCreator
+    public EnEquipmentInfo(@JSONField(name = "ConnectorInfos") JSONArray array) {
+        System.out.println(array);
+        this.connectorInfos = array.toJavaList(EnConnectorInfo.class);
+    }
+
+
+}

entity/src/main/java/com/kym/entity/enplus/EquipmentInfo.java

@@ -1,55 +0,0 @@
-package com.kym.entity.enplus;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author skyline
- * @description 充电设备信息
- * @date 2023-07-31 15:21
- */
-@Data
-public class EquipmentInfo {
-
-    /**
-     * 设备编码
-     */
-    private String EquipmentID;
-
-    /**
-     * 设备生产商组织机构代码
-     */
-    private String ManufacturerID;
-
-    /**
-     * 设备生产商名称
-     */
-    private String ManufacturerName;
-
-    /**
-     * 设备型号
-     */
-    private String EquipmentModel;
-
-    /**
-     * 设备生产日期(YYYY-MM-DD)
-     */
-    private String ProductionDate;
-
-    /**
-     * 设备类型
-     * 1：直流设备
-     * 2：交流设备
-     * 3：交直流一体设备
-     * 4：无线设备
-     * 5：其他
-     */
-    private int EquipmentType;
-
-    /**
-     * 充电设备接口信息列表
-     */
-    private List<EnConnectorInfo> ConnectorInfos;
-
-}