互联互通对接调试：ConnectorID转换

common/pom.xml

@@ -45,47 +45,47 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>6.0.0</version>
+            <version>${jakarta.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>${gson.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>4.4.0</version>
+            <version>${jwt.version}</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>
-            <version>0.11.5</version>
+            <version>${jjwt-api.version}</version>
         </dependency>
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot3-starter</artifactId>
-            <version>1.38.0</version>
+            <version>${sa-token.version}</version>
         </dependency>
         <!-- sa-token 集成redis-->
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-redis-jackson</artifactId>
-            <version>1.38.0</version>
+            <version>${sa-token.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.11.0</version>
+            <version>${okhttp.version}</version>
         </dependency>
 
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.21</version>
+            <version>${hutool.version}</version>
         </dependency>
 
         <dependency>
@@ -121,13 +121,13 @@
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-miniapp</artifactId>
-            <version>4.6.0</version>
+            <version>${weixin-java.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-mp</artifactId>
-            <version>4.6.0</version>
+            <version>${weixin-java.version}</version>
         </dependency>
 
     </dependencies>

common/src/main/java/com/kym/common/utils/PlatformAesUtil.java

@@ -168,6 +168,13 @@ public class PlatformAesUtil {
 
     }
 
+    /**
+     * 构建平台参数（向谁请求数据则用谁的秘钥。OperatorID请求者的）
+     *
+     * @param platformName
+     * @param params
+     * @return
+     */
     public static String buildPlatformParams(String platformName, String params) {
         var platform = PlatformCache.INSTANCE.getPlatformByName(platformName);
         // 使用DataSecret对data加密

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

@@ -55,7 +55,9 @@ public class ChargeOrder extends BaseEntity implements Serializable {
     public static int STOP_REASON_BMS停止 = 2;
     public static int STOP_REASON_充电机器设备故障 = 3;
     public static int STOP_REASON_连接器断开 = 4;
+
     public static int STOP_REASON_预约启动充电失败 = 5;
+    public static int STOP_REASON_启动充电异常 = 6;
 
     private Long userId;
 

pom.xml

@@ -39,6 +39,14 @@
         <druid-spring-boot-starter.version>1.2.20</druid-spring-boot-starter.version>
         <poi-ooxml.version>5.2.3</poi-ooxml.version>
         <javax.mail.version>1.6.2</javax.mail.version>
+        <weixin-java.version>4.7.0</weixin-java.version>
+        <hutool.version>5.8.21</hutool.version>
+        <okhttp.version>4.11.0</okhttp.version>
+        <sa-token.version>1.38.0</sa-token.version>
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+        <gson.version>2.10.1</gson.version>
+        <jwt.version>4.4.0</jwt.version>
+        <jjwt-api.version>0.11.5</jjwt-api.version>
     </properties>
 
     <dependencies>

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.kym.common.cache.PlatformCache;
 import com.kym.common.constant.ResponseEnum;
 import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.CommUtil;
@@ -13,17 +14,16 @@ import com.kym.entity.admin.Activity;
 import com.kym.entity.admin.ConnectorInfo;
 import com.kym.entity.admin.EquipmentInfo;
 import com.kym.entity.common.RedisKeys;
-import com.kym.entity.platform.response.PlatformBusinessPolicy;
 import com.kym.entity.miniapp.*;
 import com.kym.entity.miniapp.delay.DelayChargeOrder;
+import com.kym.entity.platform.response.PlatformBusinessPolicy;
 import com.kym.service.admin.ConnectorInfoService;
 import com.kym.service.admin.EquipmentInfoService;
 import com.kym.service.admin.EquipmentRelationService;
 import com.kym.service.cache.KymCache;
-import com.kym.common.cache.PlatformCache;
-import com.kym.service.platform.PlatformApiService;
 import com.kym.service.jobs.DelayService;
 import com.kym.service.miniapp.*;
+import com.kym.service.platform.PlatformApiService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -382,12 +382,12 @@ public class ChargeServiceImpl implements ChargeService {
                 startCharge = platformApiService.queryStartCharge(PlatformCache.INSTANCE.getPlatformNameByConnectorId(connectorId), order.getStartChargeSeq(), connectorId, qrCode, balance);
             } catch (Exception e) {
                 // 这里可能超时，忽略
-                LOGGER.error("启动充电超时，订单：{}", order.getStartChargeSeq());
+                LOGGER.error("启动充电异常，订单：{}", order.getStartChargeSeq());
                 // 启动充电超时，更新订单状态为取消
                 chargeOrderService.lambdaUpdate()
                         .set(ChargeOrder::getOrderStatus, ChargeOrder.CHARGE_STATUS_已取消)
                         .set(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_已取消)
-                        .set(ChargeOrder::getStopReason, "启动充电超时")
+                        .set(ChargeOrder::getStopReason, ChargeOrder.STOP_REASON_启动充电异常)
                         .eq(ChargeOrder::getStartChargeSeq, order.getStartChargeSeq()).update();
                 return Map.of("startChargeSeq", order.getStartChargeSeq());
             }

service/src/main/java/com/kym/service/platform/impl/PlatformApiServiceImpl.java

@@ -178,7 +178,7 @@ public class PlatformApiServiceImpl implements PlatformApiService {
                     "EquipAuthSeq":"%s",
                     "ConnectorID":"%s"
                 }
-                """.formatted(equipAuthSeq, PlatformConvertUtil.convert2LongshineConnectorId(connectorId));
+                """.formatted(equipAuthSeq, connectorId);
         var response = platformPost(platformName, PlatformApi.PLATFORM_QUERY_EQUIP_AUTH.getApi(platformName), buildPlatformParams(platformName, param));
 
         return parsePlatformResponseData(response, platformName);
@@ -226,7 +226,7 @@ public class PlatformApiServiceImpl implements PlatformApiService {
                     "ConnectorID":"%s",
                     "QRCode":"%s",
                 }
-                """.formatted(startChargeSeq, PlatformConvertUtil.convert2LongshineConnectorId(connectorId), qrCode);
+                """.formatted(startChargeSeq, connectorId, qrCode);
         var completeParams = PlatformConvertUtil.queryStartChargeParamsConvert(platformName, param, amount);
         var response = platformPost(platformName, PlatformApi.PLATFORM_QUERY_START_CHARGE.getApi(platformName), buildPlatformParams(platformName, completeParams));
         return parsePlatformResponseData(response, platformName);