From fc24f2bf7c610a9b0eff4d47bd85a894c0f8aa34 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 07 九月 2024 18:03:23 +0800
Subject: [PATCH] 停车场线下版本接口对接
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java | 4 ++--
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java | 12 ++++++++++--
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/OfflineParkingResponse.java | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
index 75ec902..e37685a 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
@@ -63,7 +63,11 @@
@PostMapping("/offlineParkingInOrder")
public BaseResponse offlineParkingInOrder(@RequestBody OfflineParkingOrder order){
parkingOrderService.offlineParkingInOrder(order);
- return BaseResponse.ok();
+ OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
+ offlineParkingResponse.setCode(0);
+ offlineParkingResponse.setTakeover(0);
+ offlineParkingResponse.setIsfree(false);
+ return offlineParkingResponse;
}
@@ -75,7 +79,11 @@
@PostMapping("/offlineParkingOutOrder")
public BaseResponse offlineParkingOutOrder(@RequestBody OfflineParkingOrder order){
parkingOrderService.offlineParkingOutOrder(order);
- return BaseResponse.ok();
+ OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
+ offlineParkingResponse.setCode(0);
+ offlineParkingResponse.setTakeover(0);
+ offlineParkingResponse.setIsfree(false);
+ return offlineParkingResponse;
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java
index 139b51a..8f63c73 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/BaseResponse.java
@@ -9,7 +9,7 @@
@Data
public class BaseResponse<T> {
- private String code;
+ private Integer code;
private String msg;
@@ -23,7 +23,7 @@
public static <T> BaseResponse<T> ok(T data){
BaseResponse baseResponse = new BaseResponse();
- baseResponse.setCode("0");
+ baseResponse.setCode(0);
baseResponse.setData(data);
baseResponse.setMsg("成功");
return baseResponse;
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/OfflineParkingResponse.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/OfflineParkingResponse.java
new file mode 100644
index 0000000..9b016e6
--- /dev/null
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/OfflineParkingResponse.java
@@ -0,0 +1,36 @@
+package com.ruoyi.integration.barrierGate.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/9/6 15:10
+ */
+@Data
+public class OfflineParkingResponse extends BaseResponse{
+ /**
+ * 0、正常流程（opendoor、led、sound 无效）,1、流程接
+ * 管（opendoor、led、sound 生效）软件不再进行后续流
+ * 程
+ */
+ private Integer takeover;
+ /**
+ * 1、开闸，0、不开闸
+ */
+ private Integer opendoor;
+ /**
+ * 对于显示到 LED 上的每一行信息
+ */
+ private List<String> led;
+ /**
+ * 语音播报内容
+ */
+ private String sound;
+ /**
+ * 是否免费（不接管的情况下）
+ */
+ private Boolean isfree;
+
+}
--
Gitblit v1.7.1