From 936ecfec019eda93e282bffd67f07f18f678ae05 Mon Sep 17 00:00:00 2001
From: tiger_zhou <Shmily123@WJ>
Date: Sun, 4 Feb 2024 14:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=91=81=E9=92=AE=E6=97=81=E8=B7=AF=E5=8F=8A?=
 =?UTF-8?q?=E6=97=81=E8=B7=AF=E5=A4=8D=E4=BD=8Dprotobuf=E5=A4=8D=E4=BD=8D?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/device_state.proto |  3 +++
 protos/request.proto      | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/protos/device_state.proto b/protos/device_state.proto
index fa3097c..9e1aa81 100644
--- a/protos/device_state.proto
+++ b/protos/device_state.proto
@@ -480,6 +480,7 @@ message ButtonState {
   uint32 id = 1;
   bool down = 2;
   bool active = 3; // 带灯的按钮
+  bool bypass = 4; //摁钮，钥匙 是否旁路
 }
 
 // 警铃状态
@@ -511,10 +512,12 @@ message AsdState {
   bool mgj = 4; //门关继电器
 }
 
+
 // 钥匙状态
 message KeyState {
   uint32 id = 1;
   int32 gear = 2;
+  bool bypass = 3; //摁钮，钥匙 是否旁路
 }
 
 // 战场图门控箱继电器状态
diff --git a/protos/request.proto b/protos/request.proto
index dfedee0..0f85a14 100644
--- a/protos/request.proto
+++ b/protos/request.proto
@@ -2,6 +2,26 @@ syntax = "proto3";
 
 package request;
 option go_package = "joylink.club/bj-rtsts-server/dto/request_proto";
+message BypassOperationReq{
+  enum Operation{
+    bypass = 0;  //旁路
+    bypass_reset = 1; // 旁路重置
+  }
+  enum BtnType{
+      esb_btn = 0;
+      ibp_btn = 1;
+      ibp_key = 2;
+      pls_btn = 3;
+  }
+  string simulationId = 1;         // 仿真id
+  int32 mapId = 2;                 // 图id
+  uint32 deviceId = 3;             // 设备id
+  string deviceCode = 5;//设备code
+  uint32 stationId = 6; //车站id
+  uint32 gateBoxId = 7;
+  BypassOperationReq.Operation operation = 8;
+    BypassOperationReq.BtnType btnType = 9;
+}
 
 // 继电器
 message Relay {