fix：充电桩列表去充电编码错误

fix：充电站列表排序

service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -8,6 +8,7 @@ import com.kym.common.utils.AESUtil;
 import com.kym.entity.admin.EquipmentInfo;
 import com.kym.entity.admin.Station;
 import com.kym.entity.admin.vo.StationVo;
+import com.kym.entity.enplus.EnEquipmentInfo;
 import com.kym.entity.enplus.EnStationStatsInfo;
 import com.kym.entity.enplus.EnStationStatusInfo;
 import com.kym.mapper.admin.StationMapper;
@@ -62,6 +63,9 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
         var enStations = JSONObject.parseObject(AESUtil.decrypt(response.getData()));
         var stationList = enStations.getJSONArray("StationInfos").toJavaList(StationVo.class);
         stationList.forEach(station -> station.getEquipmentInfos().forEach(enEquipmentInfo -> enEquipmentInfo.setShortId(kymCache.getShortId(enEquipmentInfo.getEquipmentId()))));
+        stationList.forEach(vo -> {
+            vo.setEquipmentInfos(vo.getEquipmentInfos().stream().sorted(Comparator.comparing(EnEquipmentInfo::getShortId)).toList());
+        });
         return stationList;
 
     }

service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

@@ -156,7 +156,10 @@ public class ChargeServiceImpl implements ChargeService {
 
     public Map<String, String> getConnectorIdAndStationId(String connectorId) {
         var stationId = "";
-        if (connectorId.length() == 6) {
+        if (connectorId.length() == 17) {
+            var equipmentRelation = equipmentRelationService.getByShortId(connectorId);
+            stationId = equipmentRelation.getStationId();
+        } else if (connectorId.length() == 6) {
             // 查询EN+设备SN
             var equipmentRelation = equipmentRelationService.getByShortId(connectorId);
             connectorId = equipmentRelation.getEquipmentId();