skyline 2 anos atrás
pai
commit
1cf96e6f15

+ 0 - 6
entity/src/main/java/com/kym/entity/enplus/EnConnectorInfo.java

@@ -17,12 +17,6 @@ public class EnConnectorInfo {
     @JSONField(name = "ConnectorID")
     private String connectorId;
 
-    /**
-     * 充电桩短ID
-     */
-    @TableField(exist = false)
-    private String shortId;
-
     /**
      * 充电设备接口名称
      */

+ 6 - 0
entity/src/main/java/com/kym/entity/enplus/EnEquipmentInfo.java

@@ -3,6 +3,7 @@ package com.kym.entity.enplus;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.annotation.JSONCreator;
 import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.List;
@@ -21,6 +22,11 @@ public class EnEquipmentInfo {
     @JSONField(name = "EquipmentID")
     private String equipmentId;
 
+    /**
+     * 充电桩短ID
+     */
+    private String shortId;
+
     /**
      * 设备生产商组织机构代码
      */

+ 1 - 1
service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -52,7 +52,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
         var response = enPlusService.enPlusPost(EnPlusApi.EN_PLUS_QUERY_STATION_INFO.getApi(), enPlusService.buildParams(param));
         var enStations = JSONObject.parseObject(AESUtil.decrypt(response.getData()));
         var stationList = enStations.getJSONArray("StationInfos").toJavaList(Station.class);
-        stationList.forEach(station -> station.getEquipmentInfos().forEach(enEquipmentInfo -> enEquipmentInfo.getConnectorInfos().forEach(connector -> connector.setShortId(kymCache.getShortId(enEquipmentInfo.getEquipmentId())))));
+        stationList.forEach(station -> station.getEquipmentInfos().forEach(enEquipmentInfo -> enEquipmentInfo.setShortId(kymCache.getShortId(enEquipmentInfo.getEquipmentId()))));
         return stationList;
 
     }