Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging...

Pu Zhibing

2025-07-14 1b311deffa48ac94a71ead121e296777b3c6eb02

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java

@@ -28,7 +28,7 @@
   @ResponseBody
   @PostMapping("/cloudParkingInOrder")
   public BaseResponse cloudParkingInOrder(@RequestBody CloudParkingOrder order){
      log.warn("云停车入场请求参数：{}", JSON.toJSONString(order));
      log.info("云停车入场请求参数：{}", JSON.toJSONString(order));
      parkingOrderService.cloudParkingInOrder(order);
      return BaseResponse.ok();
   }
@@ -41,7 +41,7 @@
   @ResponseBody
   @PostMapping("/cloudParkingOutOrder")
   public BaseResponse cloudParkingOutOrder(@RequestBody CloudParkingOrder order){
      log.warn("云停车出场请求参数：{}", JSON.toJSONString(order));
      log.info("云停车出场请求参数：{}", JSON.toJSONString(order));
      parkingOrderService.cloudParkingOutOrder(order);
      return BaseResponse.ok();
   }
@@ -54,11 +54,10 @@
   @ResponseBody
   @PostMapping("/cloudParkingSpace")
   public BaseResponse cloudParkingSpace(@RequestBody CloudParkingSpace parkingSpace){
      log.warn("云停车实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
      log.info("云停车实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
      parkingOrderService.cloudParkingSpace(parkingSpace);
      return BaseResponse.ok();
   }
	
   
   
   /**
@@ -68,7 +67,7 @@
   @ResponseBody
   @PostMapping("/offlineParkingInOrder")
   public BaseResponse offlineParkingInOrder(@RequestBody OfflineParkingOrder order){
      log.warn("线下停车场入场请求参数：{}", JSON.toJSONString(order));
      log.info("线下停车场入场请求参数：{}", JSON.toJSONString(order));
      parkingOrderService.offlineParkingInOrder(order);
      OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
      offlineParkingResponse.setCode(0);
@@ -85,7 +84,7 @@
   @ResponseBody
   @PostMapping("/offlineParkingOutOrder")
   public BaseResponse offlineParkingOutOrder(@RequestBody OfflineParkingOrder order){
      log.warn("线下停车场出场请求参数：{}", JSON.toJSONString(order));
      log.info("线下停车场出场请求参数：{}", JSON.toJSONString(order));
      parkingOrderService.offlineParkingOutOrder(order);
      OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
      offlineParkingResponse.setCode(0);
@@ -102,7 +101,7 @@
   @ResponseBody
   @PostMapping("/offlineParkingSpace")
   public BaseResponse offlineParkingSpace(@RequestBody OfflineParkingSpace parkingSpace){
      log.warn("线下停车场实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
      log.info("线下停车场实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
      parkingOrderService.offlineParkingSpace(parkingSpace);
      return BaseResponse.ok();
   }