全局前缀与en+推送地址冲突，单独添加

admin/src/main/java/com/kym/admin/controller/AdminUserController.java

@@ -22,11 +22,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/admin-user")
 public class AdminUserController {
 
-    @Autowired
-    private AdminUserService adminUserService;
+    private final AdminUserService adminUserService;
+
+    public AdminUserController(AdminUserService adminUserService) {
+        this.adminUserService = adminUserService;
+    }
 
     @SysLog("登录")
-    @PostMapping("login")
+    @PostMapping("/login")
     R adminLogin(@RequestBody JSONObject json) {
         return adminUserService.login(json.getString("mobilePhone"), json.getString("password"));
     }

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

@@ -21,9 +21,9 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .addPathPatterns("/**")
                 // login/refresh接口不鉴权
                 .excludePathPatterns(
-                        "/user/wxLogin",
-                        "/user/refresh",
-                        "/charge/pullEnStations",
+                        "/api/user/wxLogin",
+                        "/api/user/refresh",
+                        "/api/charge/pullEnStations",
                         "/charge/notification_stationStatus",
                         "/charge/notification_start_charge_result",
                         "/charge/notification_start_charge_status",

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-08-07
  */
 @RestController
-@RequestMapping("/account/")
+@RequestMapping("/api/account/")
 public class AccountController {
 
     @Autowired

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-08-20
  */
 @RestController
-@RequestMapping("/app-log")
+@RequestMapping("/api/app-log")
 public class AppLogController {
 
 }

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-08-12
  */
 @RestController
-@RequestMapping("/attachment")
+@RequestMapping("/api/attachment")
 public class AttachmentController {
 
 }

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-07-26
  */
 @RestController
-@RequestMapping("/cars")
+@RequestMapping("/api/cars")
 public class CarsController {
 
 }

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

@@ -24,7 +24,6 @@ import java.util.List;
  * @since 2023-06-27
  */
 @RestController
-@RequestMapping("/charge/")
 public class ChargerController {
 
     @Autowired
@@ -41,7 +40,7 @@ public class ChargerController {
 
     @SneakyThrows
     @ApiLog("充电站列表")
-    @GetMapping("/listStation")
+    @GetMapping("/api/charge/listStation")
     R listChargeStation(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         // 请求en+接口
         List<Station> response = stationService.queryStationInfo(pageNum, pageSize);
@@ -49,39 +48,39 @@ public class ChargerController {
     }
 
     @ApiLog("充电站状态")
-    @GetMapping("/stationStatus")
+    @GetMapping("/api/charge/stationStatus")
     R stationStatus(@RequestParam("stationIds") String ids) {
         // 请求en+接口
         var response = stationService.stationStatus(ids.split(","));
         return R.success(response);
     }
 
-    @GetMapping("/token")
+    @GetMapping("/api/charge/token")
     R<String> queryToken() {
         return R.success(enPlusService.queryToken());
     }
 
     @ApiLog("启动充电")
-    @GetMapping("/startCharge")
+    @GetMapping("/api/charge/startCharge")
     R startCharge(@RequestParam("connectorId") String connectorId, @RequestParam("stationId") String stationId) {
         return R.success(chargeService.queryStartCharge(connectorId, stationId));
     }
 
     @ApiLog("停止充电")
-    @GetMapping("/stopCharge/{connectorId}")
+    @GetMapping("/api/charge/stopCharge/{connectorId}")
     R stopCharge(@PathVariable("connectorId") String connectorId) {
         chargeService.queryStopCharge(connectorId);
         return R.success();
     }
 
     @ApiLog("查询充电状态")
-    @GetMapping("/chargeStatus/{startChargeSeq}")
+    @GetMapping("/api/charge/chargeStatus/{startChargeSeq}")
     R<ChargeOrder> chargeStatus(@PathVariable("startChargeSeq") String startChargeSeq) {
         return R.success(chargeService.queryEquipChargeStatus(startChargeSeq));
     }
 
     @ApiLog("查询设备充电策略")
-    @GetMapping("/businessPolicy/{connectorId}")
+    @GetMapping("/api/charge/businessPolicy/{connectorId}")
     R businessPolicy(@PathVariable("connectorId") String connectorId) {
         return R.success(chargeService.queryEquipBusinessPolicy(connectorId));
     }
@@ -99,7 +98,7 @@ public class ChargerController {
      * @return 0:接收 1：丢弃/忽略，不需要重试
      */
     @ApiLog("EN+设备状态变化推送")
-    @PostMapping("/notification_stationStatus")
+    @PostMapping("/charge/notification_stationStatus")
     JSONObject notificationStationStatus(@RequestBody JSONObject json) {
         // TODO: 2023-08-05 验签 业务逻辑
 
@@ -115,7 +114,7 @@ public class ChargerController {
      * @return StartChargeSeq SuccStat 0:成功 1：失败  FailReason 0:无 1：接收失败
      */
     @ApiLog("EN+推送启动充电结果")
-    @PostMapping("/notification_start_charge_result")
+    @PostMapping("/charge/notification_start_charge_result")
     @ResponseBody
     EnResponse notificationStartChargeResult(@RequestBody JSONObject json) {
         return new EnResponse(enNotifyService.handleNotificationStartChargeResult(json));
@@ -129,7 +128,7 @@ public class ChargerController {
      * @return
      */
     @ApiLog("EN+推送启动充电结果")
-    @PostMapping("/notification_start_charge_status")
+    @PostMapping("/charge/notification_start_charge_status")
     EnResponse notificationStartChargeStatus(@RequestBody JSONObject json) {
         return new EnResponse(enNotifyService.handleNotificationEquipChargeStatus(json));
     }
@@ -141,7 +140,7 @@ public class ChargerController {
      * @param json
      * @return
      */
-    @PostMapping("/notification_stop_charge_result")
+    @PostMapping("/charge/notification_stop_charge_result")
     EnResponse notificationStopChargeResult(@RequestBody JSONObject json) {
         return new EnResponse(enNotifyService.handleNotificationStopChargeResult(json));
     }
@@ -152,7 +151,7 @@ public class ChargerController {
      * @param json
      * @return
      */
-    @PostMapping("/notification_charge_order_info")
+    @PostMapping("/charge/notification_charge_order_info")
     EnResponse notificationChargeOrderInfo(@RequestBody JSONObject json) {
         return new EnResponse(enNotifyService.handleNotificationChargeOrderInfo(json));
     }
@@ -165,7 +164,7 @@ public class ChargerController {
      *
      * @return
      */
-    @GetMapping("/pullEnStations")
+    @GetMapping("/charge/pullEnStations")
     R pullEnStationInfos() {
         stationService.pullEnStationInfos();
         return R.success();

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @date 2023-07-26 23:51
  */
 @RestController
-@RequestMapping("/common/")
+@RequestMapping("/api/common/")
 public class CommonController {
 
     @Autowired

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

@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-08-13
  */
 @RestController
-@RequestMapping("/dataDict")
+@RequestMapping("/api/dataDict")
 public class DataDictController extends IController {
 
     @Resource

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

@@ -22,7 +22,7 @@ import java.io.IOException;
  * @date 2023-07-29 10:54
  */
 @RestController
-@RequestMapping("/file")
+@RequestMapping("/api/file")
 public class FileController extends IController {
 
     @Resource

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-08-12
  */
 @RestController
-@RequestMapping("/pay-log")
+@RequestMapping("/api/pay-log")
 public class PayLogController {
 
 }

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2023-07-22 20:36
  */
 @RestController
-@RequestMapping("/payment")
+@RequestMapping("/api/payment")
 public class PaymentController {
 
     @Autowired

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

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2023-06-27
  */
 @RestController
-@RequestMapping("/user")
+@RequestMapping("/api/user")
 public class UserController {
 
     @Autowired

miniapp/src/main/resources/application-dev.yml

@@ -13,4 +13,4 @@ en-plus:
   # 最小充电余额（分）
   chargeMinAmount: 200
   # 接口地址
-  apiDomain: https://dev.en-plus.cn/Charge/evcs/v1//MA5HJNDG1/
+  apiDomain: https://dev.en-plus.cn/Charge/evcs/v1/MA5HJNDG1/

miniapp/src/main/resources/application.yml

@@ -61,8 +61,6 @@ mybatis-plus:
 
 server:
   port: 8088
-  servlet:
-    context-path: /api
 # PageHelper
 pagehelper:
   propertyName: propertyValue

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

@@ -180,7 +180,11 @@ public class ChargeServiceImpl implements ChargeService {
         var userId = StpUtil.getLoginIdAsLong();
         connectorId = getConnectorId(connectorId);
         // 查询充电订单
-        var chargeOrder = chargeOrderService.lambdaQuery().eq(ChargeOrder::getUserId, userId).eq(ChargeOrder::getConnectorId, connectorId).one();
+        var chargeOrder = chargeOrderService.lambdaQuery()
+                .eq(ChargeOrder::getUserId, userId)
+                .eq(ChargeOrder::getConnectorId, connectorId)
+                .eq(ChargeOrder::getChargeStatus, 2)
+                .one();
         if (chargeOrder == null) {
             // 记录失败原因
             LOGGER.error("用户：{}请求停止充电异常，设备：{}无进行中的订单", userId, connectorId);