fix bug

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

@@ -1,14 +1,13 @@
 package com.kym.entity.admin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 充电桩接口（枪）信息
@@ -62,7 +61,7 @@ public class ConnectorInfo extends BaseEntity implements Serializable {
     /**
      * 额定功率
      */
-    private BigDecimal power;
+    private Double power;
 
     /**
      * 停车场车位编号

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

@@ -20,7 +20,7 @@ public class EnConnectorInfo {
     /**
      * 充电设备接口名称
      */
-    @JSONField(name = "connectorName")
+    @JSONField(name = "ConnectorName")
     private String connectorName;
     /**
      * 充电设备接口类型

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

@@ -79,6 +79,12 @@ public class EnEquipmentInfo {
      */
     private JSONObject location;
 
+    /**
+     * 充电设备总功率
+     */
+    @JSONField(name = "Power")
+    private Double power;
+
     @JSONCreator
     public EnEquipmentInfo(@JSONField(name = "ConnectorInfos") JSONArray array,
                            @JSONField(name = "EquipmentLng") float equipmentLng,

entity/src/main/java/com/kym/entity/miniapp/UserRechargeRights.java

@@ -63,7 +63,7 @@ public class UserRechargeRights extends BaseEntity {
     /**
      * 冻结余额（分）
      */
-    private Integer frezonBalance;
+    private Integer frozenBalance;
 
     /**
      * 折扣：100代表无折扣，75代表75折

mapper/src/main/resources/mappers/miniapp/UserRechargeRightsMapper.xml

@@ -10,7 +10,7 @@
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="rights_balance" property="rightsBalance" />
-        <result column="frezon_balance" property="frezonBalance" />
+        <result column="frozen_balance" property="frozenBalance" />
         <result column="discount" property="discount" />
         <result column="allow_stacke" property="allowStacke" />
         <result column="discount_amount" property="discountAmount" />
@@ -21,7 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        rights_id, activity_id, user_id, start_time, end_time, rights_balance, frezon_balance, discount, allow_stacke, discount_amount, times, status, remark
+        rights_id, activity_id, user_id, start_time, end_time, rights_balance, frozen_balance, discount, allow_stacke, discount_amount, times, status, remark
     </sql>
 
 </mapper>

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

@@ -7,6 +7,7 @@ import com.kym.common.annotation.DynamicCache;
 import com.kym.common.enums.EnPlusApi;
 import com.kym.common.utils.AESUtil;
 import com.kym.common.utils.CommUtil;
+import com.kym.entity.admin.ConnectorInfo;
 import com.kym.entity.admin.EquipmentInfo;
 import com.kym.entity.admin.Station;
 import com.kym.entity.admin.vo.StationVo;
@@ -14,6 +15,7 @@ import com.kym.entity.enplus.EnEquipmentInfo;
 import com.kym.entity.enplus.EnStationStatsInfo;
 import com.kym.entity.enplus.EnStationStatusInfo;
 import com.kym.mapper.admin.StationMapper;
+import com.kym.service.admin.ConnectorInfoService;
 import com.kym.service.admin.EquipmentInfoService;
 import com.kym.service.admin.StationService;
 import com.kym.service.cache.KymCache;
@@ -40,14 +42,16 @@ import java.util.List;
 public class StationServiceImpl extends ServiceImpl<StationMapper, Station> implements StationService {
 
     private final KymCache kymCache;
-    private final EquipmentInfoService equipmentInfoService;
     private final EnPlusService enPlusService;
+    private final EquipmentInfoService equipmentInfoService;
+    private final ConnectorInfoService connectorInfoService;
 
 
-    public StationServiceImpl(@Lazy KymCache kymCache, EnPlusService enPlusService, EquipmentInfoService equipmentInfoService) {
+    public StationServiceImpl(@Lazy KymCache kymCache, EnPlusService enPlusService, EquipmentInfoService equipmentInfoService, ConnectorInfoService connectorInfoService) {
         this.kymCache = kymCache;
         this.enPlusService = enPlusService;
         this.equipmentInfoService = equipmentInfoService;
+        this.connectorInfoService = connectorInfoService;
     }
 
     @Override
@@ -124,15 +128,26 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
         var stationVoList = queryStationInfo(1, 1000);
         var stationList = new ArrayList<Station>();
         var equipmentList = new ArrayList<EquipmentInfo>();
+        var connectorList = new ArrayList<ConnectorInfo>();
         stationVoList.forEach(vo -> {
             if (!vo.getEquipmentInfos().isEmpty()) {
                 vo.getEquipmentInfos().forEach(item -> {
+                    // 桩体
                     var equipment = new EquipmentInfo()
                             .setStationId(vo.getStationId())
                             .setShortId(item.getShortId())
                             .setPower(item.getConnectorInfos().get(0).getPower());
                     BeanUtils.copyProperties(item, equipment);
                     equipmentList.add(equipment);
+                    // 枪
+                    var connectorInfos = item.getConnectorInfos();
+                    if (!CommUtil.isEmptyOrNull(connectorInfos)) {
+                        connectorInfos.forEach(connector -> {
+                            var connectorInfo = new ConnectorInfo();
+                            BeanUtils.copyProperties(connector, connectorInfo);
+                            connectorList.add(connectorInfo);
+                        });
+                    }
                 });
                 equipmentList.sort(Comparator.comparing(EquipmentInfo::getShortId));
             }
@@ -143,8 +158,10 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
         // 查询已存在的站点，只更新新增的站点和设备
         var stations = list().stream().map(Station::getStationId).toList();
         var equipments = equipmentInfoService.list().stream().map(EquipmentInfo::getEquipmentId).toList();
+        var connectors = connectorInfoService.list().stream().map(ConnectorInfo::getConnectorId).toList();
         saveBatch(stationList.stream().filter(station -> !stations.contains(station.getStationId())).toList());
         equipmentInfoService.saveBatch(equipmentList.stream().filter(equipmentInfo -> !equipments.contains(equipmentInfo.getEquipmentId())).toList());
+        connectorInfoService.saveBatch(connectorList.stream().filter(connector -> !connectors.contains(connector.getConnectorId())).toList());
     }
 
     @Override