commit

miniapp/src/main/java/com/kym/miniapp/config/SaTokenConfigure.java

@@ -27,6 +27,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                         "/charge/notification_stationStatus",
                         "/charge/notification_start_charge_result",
                         "/charge/notification_start_charge_status",
+                        "/charge/notification_start_equip_charge_status",
                         "/charge/notification_stop_charge_result",
                         "/charge/notification_charge_order_info"
                 );

miniapp/src/main/java/com/kym/miniapp/controller/ChargerController.java

@@ -98,13 +98,10 @@ public class ChargerController {
      * @param json
      * @return 0:接收 1：丢弃/忽略，不需要重试
      */
-    @ApiLog("EN+设备状态变化推送")
+    @ApiLog("EN+场站设备状态变化推送")
     @PostMapping("/notification_stationStatus")
-    JSONObject notificationStationStatus(@RequestBody JSONObject json) {
-        // TODO: 2023-08-05 验签 业务逻辑
-
-
-        return null;
+    EnResponse notificationStationStatus(@RequestBody JSONObject json) {
+        return new EnResponse(enNotifyService.handleNotificationStationStatus(json));
     }
 
 

service/src/main/java/com/kym/service/enplus/EnNotifyService.java

@@ -18,4 +18,5 @@ public interface EnNotifyService {
 
     String handleNotificationChargeOrderInfo(JSONObject json);
 
+    String handleNotificationStationStatus(JSONObject json);
 }

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

@@ -41,15 +41,21 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     private WalletDetailService walletDetailService;
 
     /**
-     * EN+ 充电站状态变化推送
+     * EN+ 充电站设备状态变化推送
      *
      * @param json
      * @return
      */
-    String handleNotificationStationStatus(JSONObject json) {
+    @Override
+    public String handleNotificationStationStatus(JSONObject json) {
+        LOGGER.info("【EN+推送】收到充电桩设备状态变化推送：{}", json);
         var data = enPlusService.signValidation(json);
-        // TODO 业务逻辑处理
-        return null;
+        // TODO: 2023-08-21 更新数据库中设备的状态，如有设备离线，发送通知 
+        return """
+                {
+                    "Status":%d
+                }
+                """.formatted(0);
     }
 
 
@@ -62,12 +68,12 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String handleNotificationStartChargeResult(JSONObject json) {
-        LOGGER.info("【EN+推送】收到启动充电结果通知：{}", json);
+        LOGGER.info("【EN+推送】收到启动充电结果推送：{}", json);
         var data = enPlusService.signValidation(json);
         var obj = JSONObject.parseObject(data);
         var startChargeSeq = obj.getString("StartChargeSeq");
         var startChargeSeqStat = obj.getIntValue("StartChargeSeqStat");
-        var connectorId = obj.getString("connectorId");
+        var connectorId = obj.getString("connectorID");
         var startTime = obj.getString("StartTime");
 
         // 更新订单状态
@@ -95,7 +101,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String handleNotificationEquipChargeStatus(JSONObject json) {
-        LOGGER.info("【EN+推送】收到充电状态通知：{}", json);
+        LOGGER.info("【EN+推送】收到充电状态推送：{}", json);
         var dataStr = enPlusService.signValidation(json);
         var data = JSONObject.parseObject(dataStr);
         var startChargeSeq = data.getString("StartChargeSeq");
@@ -128,7 +134,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String handleNotificationStopChargeResult(JSONObject json) {
-        LOGGER.info("【EN+推送】收到停止充电结果通知：{}", json);
+        LOGGER.info("【EN+推送】收到停止充电结果推送：{}", json);
         var dataStr = enPlusService.signValidation(json);
         var data = JSONObject.parseObject(dataStr);
         var startChargeSeq = data.getString("StartChargeSeq");
@@ -156,7 +162,7 @@ public class EnNotifyServiceImpl implements EnNotifyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String handleNotificationChargeOrderInfo(JSONObject json) {
-        LOGGER.info("【EN+推送】收到充电订单信息通知：{}", json);
+        LOGGER.info("【EN+推送】收到充电订单信息推送：{}", json);
         var dataStr = enPlusService.signValidation(json);
         var data = JSONObject.parseObject(dataStr);
         var startChargeSeq = data.getString("StartChargeSeq");