commit

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

@@ -1,23 +1,30 @@
 package com.kym.entity.enplus;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 
 /**
  * @author skyline
- * @description
+ * @description 分时费率
  * @date 2023-08-15 16:11
  */
+@Data
 public class EnPolicyInfo {
     /**
      * 时段开始时间点
      */
+    @JSONField(name = "StartTime")
     private LocalDateTime startTime;
     /**
      * 时段电费 小数点后4位
      */
+    @JSONField(name = "ElecPrice")
     private Double elecPrice;
     /**
      * 时段服务费 小数点后4位
      */
+    @JSONField(name = "ServicePrice")
     private Double servicePrice;
 }

entity/src/main/java/com/kym/entity/enplus/response/EnBusinessPolicy.java

@@ -1,5 +1,6 @@
 package com.kym.entity.enplus.response;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.kym.entity.enplus.EnPolicyInfo;
 import lombok.Data;
 
@@ -7,7 +8,7 @@ import java.util.List;
 
 /**
  * @author skyline
- * @description
+ * @description 设备策略信息
  * @date 2023-08-15 15:58
  */
 @Data
@@ -15,26 +16,32 @@ public class EnBusinessPolicy {
     /**
      * 业务策略查询流水号
      */
+    @JSONField(name = "EquipBizSeq")
     private String equipBizSeq;
     /**
      * 充电设备接口编码
      */
+    @JSONField(name = "ConnectorID")
     private String connectorId;
     /**
      * 操作结果
      * 0：失败
      * 1：成功
      */
+    @JSONField(name = "Succstat")
     private Integer succstat;
     /**
      * 失败原因
      * 0：无
      * 1：此充电桩业务策略不存在
      */
+    @JSONField(name = "FailReason")
     private Integer failReason;
     /**
      * 时段数N 0~32
      */
+    @JSONField(name = "SumPeriod")
     private Integer sumPeriod;
+    @JSONField(name = "PolicyInfos")
     private List<EnPolicyInfo> policyInfos;
 }

service/src/main/java/com/kym/service/admin/StationService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.kym.entity.admin.Station;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.kym.entity.enplus.StationStatusInfo;
+import com.kym.entity.enplus.EnStationStatusInfo;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -21,7 +21,7 @@ public interface StationService extends IService<Station> {
 
     public List<Station> queryStationInfo(int pageNum, int pageSize) throws JsonProcessingException;
 
-    public List<StationStatusInfo> stationStatus(String[] ids);
+    public List<EnStationStatusInfo> stationStatus(String[] ids);
 
     public JSONObject stationStats(String stationId, String startTime, String endTime);
 

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.common.enums.EnPlusApi;
 import com.kym.common.utils.AESUtil;
 import com.kym.entity.admin.Station;
-import com.kym.entity.enplus.StationStatusInfo;
+import com.kym.entity.enplus.EnStationStatusInfo;
 import com.kym.mapper.admin.StationMapper;
 import com.kym.service.admin.StationService;
 import com.kym.service.enplus.EnPlusService;
@@ -52,7 +52,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
 
 
     @Override
-    public List<StationStatusInfo> stationStatus(String[] ids) {
+    public List<EnStationStatusInfo> stationStatus(String[] ids) {
         var param = """
                 {
                     "StationIDs":["%s"]
@@ -60,7 +60,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
                 """.formatted(String.join("\",\"", ids));
         var response = enPlusService.enPlusPost(EnPlusApi.EN_PLUS_QUERY_STATION_STATUS.getApi(), enPlusService.buildParams(param));
         var enStationStatus = JSONObject.parseObject(AESUtil.decrypt(response.getData()));
-        return enStationStatus.getJSONArray("StationStatusInfos").toJavaList(StationStatusInfo.class);
+        return enStationStatus.getJSONArray("StationStatusInfos").toJavaList(EnStationStatusInfo.class);
     }
 
     @Override

service/src/main/java/com/kym/service/enplus/impl/EnPlusServiceImpl.java

@@ -227,7 +227,7 @@ public class EnPlusServiceImpl implements EnPlusService {
                     "ConnectorID":%s
                 }
                 """.formatted(equipBizSeq, connectorId);
-        var response = enPlusPost(EnPlusApi.EN_PLUS_QUERY_STATION_STATS.getApi(), buildParams(param));
+        var response = enPlusPost(EnPlusApi.EN_PLUS_QUERY_BUSINESS_POLICY.getApi(), buildParams(param));
         return JSONObject.parseObject(AESUtil.decrypt(response.getData()));
     }
 

service/src/main/java/com/kym/service/miniapp/ChargeService.java

@@ -14,4 +14,6 @@ public interface ChargeService {
     ChargeOrder queryEquipChargeStatus(String startChargeSeq);
 
     void queryStopCharge(String startChargeSeq, String connectorId);
+
+    void queryEquipBusinessPolicy(String connectorId);
 }

service/src/main/java/com/kym/service/miniapp/CollectService.java

@@ -1,6 +1,6 @@
 package com.kym.service.miniapp;
 
-import com.kym.entity.enplus.StationStatusInfo;
+import com.kym.entity.enplus.EnStationStatusInfo;
 import com.kym.entity.miniapp.Collect;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,7 +18,7 @@ public interface CollectService extends IService<Collect> {
 
     void updateCollect(String stationId, Integer status);
 
-    List<StationStatusInfo> getCollectList();
+    List<EnStationStatusInfo> getCollectList();
 
     List<Collect> listCollect();
 }

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

@@ -4,8 +4,9 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.kym.common.constant.ResponseEnum;
 import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.IDGenerator;
+import com.kym.common.utils.OrderUtils;
+import com.kym.entity.enplus.response.EnBusinessPolicy;
 import com.kym.entity.miniapp.ChargeOrder;
-import com.kym.service.admin.EquipmentInfoService;
 import com.kym.service.admin.EquipmentRelationService;
 import com.kym.service.enplus.EnPlusService;
 import com.kym.service.miniapp.AccountService;
@@ -185,10 +186,13 @@ public class ChargeServiceImpl implements ChargeService {
     }
 
 
-    void queryEquipBusinessPolicy(){
-        var equipBizSeq = "";
-        var connectorId = "";
-        var data =enPlusService.queryEquipBusinessPolicy(equipBizSeq, connectorId);
+    @Override
+    public void queryEquipBusinessPolicy(String connectorId) {
+        var equipBizSeq = OrderUtils.getOrderNo();
+        connectorId = "SN100523051916161";
+        var data = enPlusService.queryEquipBusinessPolicy(equipBizSeq, connectorId);
+        var policy = data.toJavaObject(EnBusinessPolicy.class);
+        LOGGER.info("策略信息：{}",policy);
 
     }
 

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

@@ -2,7 +2,7 @@ package com.kym.service.miniapp.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kym.entity.enplus.StationStatusInfo;
+import com.kym.entity.enplus.EnStationStatusInfo;
 import com.kym.entity.miniapp.Collect;
 import com.kym.mapper.miniapp.CollectMapper;
 import com.kym.service.admin.StationService;
@@ -38,7 +38,7 @@ public class CollectServiceImpl extends ServiceImpl<CollectMapper, Collect> impl
      * @return
      */
     @Override
-    public List<StationStatusInfo> getCollectList() {
+    public List<EnStationStatusInfo> getCollectList() {
         var userid = StpUtil.getLoginIdAsLong();
         var collectList = lambdaQuery().eq(Collect::getUserId, userid).list().stream().map(c -> String.valueOf(c.getStationId())).toArray(String[]::new);
         if (collectList.length == 0) {