From f0bfa36757f8fc469cae6020f8e4ff24e30399a9 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue, 24 Oct 2023 17:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86=E7=BB=A7=E7=94=B5=E5=99=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=9D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/relayCabinetLayoutGraphics.proto | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/protos/relayCabinetLayoutGraphics.proto b/protos/relayCabinetLayoutGraphics.proto
index a4d4adb..1c78547 100644
--- a/protos/relayCabinetLayoutGraphics.proto
+++ b/protos/relayCabinetLayoutGraphics.proto
@@ -14,6 +14,7 @@ message RelayCabinetGraphicStorage {
  repeated PhaseFailureProtector phaseFailureProtectors = 7;
  repeated Combinationtype combinationtypeList = 8;
  repeated SignalFaultAlarm signalFaultAlarms = 9;
+ CiCj ciCjList = 10;//采集列表
 }
 
 message RelayCabinet {
@@ -70,3 +71,27 @@ message UniqueIdType {
   string lineId = 2;//线路号
   string belongsConcentrationStation = 3;//继电器柜图所属集中站
 }
+
+/* 采集 */
+message CiCj {
+  int32 dsCount = 1;//数据集位数——对应着excel表行数
+  repeated CjDataSet cjList = 2;//采集列表（二维数据，数组长度对应着excel表列数--数据集个数）
+}
+
+message CjDataSet {
+  string name = 1;//对应着excel中的列名，如'D1'
+  repeated CjData bitList = 2;//对应着excel中的一列的数据
+}
+
+message CjData {
+  repeated CjDataItem refRelays=1;//采集的继电器
+}
+
+message CjDataItem {
+  enum PostionType {
+      Q=0;
+      H=1;
+  }
+  string relayId = 1;//采集对应的继电器Id
+  PostionType position = 2;//继电器的位置，QH对应着吸合
+}