优化

entity/src/main/java/com/kym/entity/admin/vo/DetailStationVo.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.kym.entity.admin.Activity;
 import com.kym.entity.admin.ConnectorInfo;
-import com.kym.entity.admin.EquipmentInfo;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.beans.BeanUtils;
 
 import java.util.List;
 
@@ -91,11 +91,9 @@ public class DetailStationVo {
      * 站点活动
      */
     private List<Activity> activityList;
-
     /**
      * 充电枪信息
      */
-    private List<ConnectorInfo> connectInfoList;
-
+    private List<ConnectorInfoVo> connectInfoList;
 
 }

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

@@ -17,10 +17,7 @@ import com.kym.common.utils.PlatformAesUtil;
 import com.kym.common.utils.PlatformConvertUtil;
 import com.kym.entity.admin.*;
 import com.kym.entity.admin.queryParams.StationQueryParam;
-import com.kym.entity.admin.vo.DetailStationVo;
-import com.kym.entity.admin.vo.LocalStationVo;
-import com.kym.entity.admin.vo.SimpleStationVo;
-import com.kym.entity.admin.vo.StationVo;
+import com.kym.entity.admin.vo.*;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.platform.PlatformStationStatsInfo;
 import com.kym.entity.platform.PlatformStationStatusInfo;
@@ -163,7 +160,9 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
     @DynamicCache(timeout = 15 * 60 * 1000L)
     @Override
     public Map<String, List<ConnectorInfo>> getCachedStationConnectorMap(String... stationId) {
-        var list = connectorInfoService.lambdaQuery().eq(CommUtil.isNotEmptyAndNull(stationId), ConnectorInfo::getStationId, stationId[0]).list();
+        var list = connectorInfoService.lambdaQuery()
+                .eq(CommUtil.isNotEmptyAndNull(stationId), ConnectorInfo::getStationId, stationId[0])
+                .list();
         return list.stream().collect(Collectors.groupingBy(ConnectorInfo::getStationId));
     }
 
@@ -250,7 +249,15 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
             var vo = new DetailStationVo();
             BeanUtils.copyProperties(s, vo);
             // 填充桩信息
-            vo.setConnectInfoList(getCachedStationConnectorMap(s.getStationId()).get(s.getStationId()));
+            var list = getCachedStationConnectorMap(s.getStationId()).get(s.getStationId()).stream()
+                    .map(connectorInfo -> {
+                        ConnectorInfoVo v = new ConnectorInfoVo();
+                        BeanUtils.copyProperties(connectorInfo,v);
+                        v.setShortId(KymCache.INSTANCE.getShortIdByEquipmentIdOrConnectorId(connectorInfo.getConnectorId()));
+                        return v;
+                    })
+                    .toList();
+            vo.setConnectInfoList(list);
             return vo;
         }).orElse(null);
     }