Просмотр исходного кода

refactor(api): 注释移除接口限流并完善参数注解

- 注释移除AppletStationController中获取充电费用接口的限流注解
- 为获取充电费用接口的orderNo参数添加@RequestParam注解,确保必传
- 注释移除LinkDataController内多个接口的ApiRateLimit限流注解
- ChargingReceptionServiceImpl中根据订单类型有条件推送渠道方充电状态,避免无效推送
wzq 3 дней назад
Родитель
Сommit
effcb5f0ea

+ 2 - 2
src/main/java/com/zsElectric/boot/business/controller/applet/AppletStationController.java

@@ -74,8 +74,8 @@ public class AppletStationController {
      */
     @Operation(summary = "获取当前充电订单实时费用")
     @GetMapping("/charging-cost")
-    @ApiRateLimit(prefix = "applet:charging_cost", limitType = ApiRateLimit.LimitType.IP, count = 2000, time = 60, message = "获取充电费用请求过于频繁,请稍后再试")
-    public Result<AppChargingCostVO> getCurrentChargingCost(String orderNo) {
+//    @ApiRateLimit(prefix = "applet:charging_cost", limitType = ApiRateLimit.LimitType.IP, count = 2000, time = 60, message = "获取充电费用请求过于频繁,请稍后再试")
+    public Result<AppChargingCostVO> getCurrentChargingCost(@RequestParam(required = true) String orderNo) {
         return Result.success(appletHomeService.getCurrentChargingCost(orderNo));
     }
 

+ 6 - 6
src/main/java/com/zsElectric/boot/charging/controller/LinkDataController.java

@@ -51,7 +51,7 @@ public class LinkDataController {
     @Operation(summary = "获取token")
     @PostMapping("/query_token")
     @Log(value = "获取token", module = LogModuleEnum.PARKING, params = true, result = true)
-    @ApiRateLimit(prefix = "third_party:query_token", limitType = ApiRateLimit.LimitType.IP, count = 200, time = 60, message = "获取Token请求过于频繁,请稍后再试")
+//    @ApiRateLimit(prefix = "third_party:query_token", limitType = ApiRateLimit.LimitType.IP, count = 200, time = 60, message = "获取Token请求过于频繁,请稍后再试")
     public ResponseParmsEntity getToken(@RequestBody RequestParmsEntity request) throws Exception {
         ResponseParmsEntity responseParmsEntity = new ResponseParmsEntity();
         try {
@@ -132,7 +132,7 @@ public class LinkDataController {
     @Operation(summary = "推送启动充电结果")
     @PostMapping("/notification_start_charge_result")
     @Log(value = "推送启动充电结果", module = LogModuleEnum.PARKING, params = true, result = true)
-    @ApiRateLimit(prefix = "third_party:start_charge", limitType = ApiRateLimit.LimitType.IP, count = 300, time = 60, message = "启动充电请求过于频繁,请稍后再试")
+//    @ApiRateLimit(prefix = "third_party:start_charge", limitType = ApiRateLimit.LimitType.IP, count = 300, time = 60, message = "启动充电请求过于频繁,请稍后再试")
     public ResponseParmsEntity chargeResponse(@RequestBody RequestParmsEntity requestDTO){
         return chargingReceptionService.chargeResponse(requestDTO);
     }
@@ -143,7 +143,7 @@ public class LinkDataController {
     @Operation(summary = "推送充电状态")
     @PostMapping("/notification_equip_charge_status")
     @Log(value = "推送充电状态", module = LogModuleEnum.PARKING, params = true, result = true)
-    @ApiRateLimit(prefix = "third_party:charge_status", limitType = ApiRateLimit.LimitType.IP, count = 500, time = 60, message = "充电状态推送过于频繁,请稍后再试")
+//    @ApiRateLimit(prefix = "third_party:charge_status", limitType = ApiRateLimit.LimitType.IP, count = 500, time = 60, message = "充电状态推送过于频繁,请稍后再试")
     public ResponseParmsEntity chargeStatusResponse(@RequestBody RequestParmsEntity requestDTO){
         return chargingReceptionService.chargeStatusResponse(requestDTO);
     }
@@ -154,7 +154,7 @@ public class LinkDataController {
     @Operation(summary = "推送停止充电结果")
     @PostMapping("/notification_stop_charge_result")
     @Log(value = "推送停止充电结果", module = LogModuleEnum.PARKING, params = true, result = true)
-    @ApiRateLimit(prefix = "third_party:stop_charge", limitType = ApiRateLimit.LimitType.IP, count = 300, time = 60, message = "停止充电请求过于频繁,请稍后再试")
+//    @ApiRateLimit(prefix = "third_party:stop_charge", limitType = ApiRateLimit.LimitType.IP, count = 300, time = 60, message = "停止充电请求过于频繁,请稍后再试")
     public ResponseParmsEntity stopChargeResponse(@RequestBody RequestParmsEntity requestDTO){
         return chargingReceptionService.stopChargeResponse(requestDTO);
     }
@@ -165,7 +165,7 @@ public class LinkDataController {
     @Operation(summary = "推送充电订单信息")
     @PostMapping("/notification_charge_order_info")
     @Log(value = "推送充电订单信息", module = LogModuleEnum.PARKING, params = true, result = true)
-    @ApiRateLimit(prefix = "third_party:charge_order", limitType = ApiRateLimit.LimitType.IP, count = 200, time = 60, message = "订单信息推送过于频繁,请稍后再试")
+//    @ApiRateLimit(prefix = "third_party:charge_order", limitType = ApiRateLimit.LimitType.IP, count = 200, time = 60, message = "订单信息推送过于频繁,请稍后再试")
     public ResponseParmsEntity chargeOrderResponse(@RequestBody RequestParmsEntity requestDTO) throws Exception {
         return chargingReceptionService.chargeOrderResponse(requestDTO);
     }
@@ -178,7 +178,7 @@ public class LinkDataController {
     @Operation(summary = "设备状态变化推送")
     @PostMapping("/notification_stationStatus")
     @Log(value = "设备状态变化推送", module = LogModuleEnum.PARKING, params = true, result = true)
-    @ApiRateLimit(prefix = "third_party:station_status", limitType = ApiRateLimit.LimitType.IP, count = 500, time = 60, message = "设备状态推送过于频繁,请稍后再试")
+//    @ApiRateLimit(prefix = "third_party:station_status", limitType = ApiRateLimit.LimitType.IP, count = 500, time = 60, message = "设备状态推送过于频繁,请稍后再试")
     public ResponseParmsEntity stationStatus(@RequestBody RequestParmsEntity requestDTO){
         return chargingReceptionService.stationStatus(requestDTO);
     }

+ 3 - 1
src/main/java/com/zsElectric/boot/charging/service/impl/ChargingReceptionServiceImpl.java

@@ -836,7 +836,9 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
             }
 
             //异步推送渠道方充电状态
-            pushChargeStatusTask(startChargeSeq, chargeStatus);
+            if(SystemConstants.CHARGE_ORDER_TYPE_CHANNEL.equals(chargeOrderInfo.getOrderType())){
+                pushChargeStatusTask(startChargeSeq, chargeStatus);
+            }
 
             // 熔断保护 - 余额不足判断
 //            isNeedBreak(chargeStatus, chargeOrderInfo);