Ver código fonte

en+设备计费策略信息

skyline 2 anos atrás
pai
commit
512ab9a087

+ 12 - 4
entity/src/main/java/com/kym/entity/enplus/EnPolicyInfo.java

@@ -1,9 +1,12 @@
 package com.kym.entity.enplus;
 
+import com.alibaba.fastjson2.annotation.JSONCreator;
 import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  * @author skyline
@@ -15,8 +18,8 @@ public class EnPolicyInfo {
     /**
      * 时段开始时间点
      */
-    @JSONField(name = "StartTime")
-    private LocalDateTime startTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm:ss", timezone = "GMT+8")
+    private LocalTime startTime;
     /**
      * 时段电费 小数点后4位
      */
@@ -25,6 +28,11 @@ public class EnPolicyInfo {
     /**
      * 时段服务费 小数点后4位
      */
-    @JSONField(name = "ServicePrice")
+    @JSONField(name = "SevicePrice")
     private Double servicePrice;
+
+    @JSONCreator
+    EnPolicyInfo(@JSONField(name = "StartTime")String startTime) {
+        this.startTime = LocalTime.parse(startTime,DateTimeFormatter.ofPattern("HHmmss"));
+    }
 }

+ 2 - 2
entity/src/main/java/com/kym/entity/enplus/response/EnBusinessPolicy.java

@@ -30,8 +30,8 @@ public class EnBusinessPolicy {
      * 0:失败
      * 1:成功
      */
-    @JSONField(name = "Succstat")
-    private Integer succstat;
+    @JSONField(name = "SuccStat")
+    private Integer succStat;
     /**
      * 失败原因
      * 0:无

+ 2 - 4
entity/src/main/java/com/kym/entity/miniapp/Collect.java

@@ -1,14 +1,12 @@
 package com.kym.entity.miniapp;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 收藏表

+ 12 - 12
service/src/main/java/com/kym/service/enplus/impl/EnPlusServiceImpl.java

@@ -89,7 +89,7 @@ public class EnPlusServiceImpl implements EnPlusService {
         if (0 == response.getRet()) {
             return response;
         } else {
-            LOGGER.error("接口数据异常:url:{},params:{},返回信息:{}", url, params, response);
+            LOGGER.error("接口数据异常:url:{},/n params:{},token:{},返回信息:{}", url, params, token, response);
             throw new BusinessException(ResponseEnum.EN_PLUS_API_EXCEPTION);
         }
     }
@@ -202,8 +202,8 @@ public class EnPlusServiceImpl implements EnPlusService {
     public JSONObject queryEquipAuth(String connectorId, String equipAuthSeq) {
         var param = """
                 {
-                    "EquipAuthSeq":%s,
-                    "ConnectorID":%s
+                    "EquipAuthSeq":"%s",
+                    "ConnectorID":"%s"
                 }
                 """.formatted(equipAuthSeq, connectorId);
         var response = enPlusPost(EnPlusApi.EN_PLUS_QUERY_EQUIP_AUTH.getApi(), buildParams(param));
@@ -223,8 +223,8 @@ public class EnPlusServiceImpl implements EnPlusService {
     public JSONObject queryEquipBusinessPolicy(String equipBizSeq, String connectorId) {
         var param = """
                 {
-                    "EquipBizSeq":%s,
-                    "ConnectorID":%s
+                    "EquipBizSeq":"%s",
+                    "ConnectorID":"%s"
                 }
                 """.formatted(equipBizSeq, connectorId);
         var response = enPlusPost(EnPlusApi.EN_PLUS_QUERY_EQUIP_BUSINESS_POLICY.getApi(), buildParams(param));
@@ -244,10 +244,10 @@ public class EnPlusServiceImpl implements EnPlusService {
     public JSONObject queryStartCharge(String startChargeSeq, String connectorId, String qrCode, Integer amount) {
         var param = """
                 {
-                    "StartChargeSeq":%s,
-                    "ConnectorID":%s,
-                    "QRCode":%s,
-                    "amount",%d
+                    "StartChargeSeq":"%s",
+                    "ConnectorID":"%s",
+                    "QRCode":"%s",
+                    "amount"%d
                 }
                 """.formatted(startChargeSeq, connectorId, qrCode, amount);
         var response = enPlusPost(EnPlusApi.EN_PLUS_QUERY_START_CHARGE.getApi(), buildParams(param));
@@ -264,7 +264,7 @@ public class EnPlusServiceImpl implements EnPlusService {
     public JSONObject queryEquipChargeStatus(String startChargeSeq) {
         var param = """
                 {
-                    "StartChargeSeq":%s
+                    "StartChargeSeq":"%s"
                 }
                 """.formatted(startChargeSeq);
         var response = enPlusPost(EnPlusApi.EN_PLUS_QUERY_EQUIP_CHARGE_STATUS.getApi(), buildParams(param));
@@ -282,8 +282,8 @@ public class EnPlusServiceImpl implements EnPlusService {
     public JSONObject queryStopCharge(String startChargeSeq, String connectorID) {
         var param = """
                 {
-                    "StartChargeSeq":%s,
-                    "ConnectorID":%s
+                    "StartChargeSeq":"%s",
+                    "ConnectorID":"%s"
                 }
                 """.formatted(startChargeSeq, connectorID);
         var response = enPlusPost(EnPlusApi.EN_PLUS_QUERY_STOP_CHARGE.getApi(), buildParams(param));