diff --git a/api/simulation.go b/api/simulation.go
index 2369745..161d5d9 100644
--- a/api/simulation.go
+++ b/api/simulation.go
@@ -54,6 +54,7 @@ func InitSimulationRouter(api *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 	authed.PUT("/balise/telegram/send", baliseTelegramSend)
 	authed.PUT("/balise/reset", baliseReset)
 	authed.PUT("/ckm/operation", ckmOperation)
+	authed.PUT("/xcj/operation", xcjOperation)
 	//authed.POST("/bypass/operation", bypassBtnOrKeyOperation)
 
 	// 初始化地图信息
@@ -935,6 +936,34 @@ func ckmOperation(c *gin.Context) {
 	c.JSON(http.StatusOK, "ok")
 }
 
+// 洗车机操作
+//
+//	@Summary		洗车机操作
+//
+//	@Security		JwtAuth
+//
+//	@Description	洗车机操作
+//	@Tags			ATS测试仿真Api
+//	@Accept			json
+//	@Param 			Authorization 	header 	string 	true 	"JWT Token"
+//	@Param			XcjOperationReq	body request_proto.XcjOperationReq	true "洗车机操作"
+//
+// @Success		200	{object}	string
+// @Failure		500	{object}	dto.ErrorDto
+// @Router			/api/v1/simulation/xcj/operation [put]
+func xcjOperation(c *gin.Context) {
+	req := &request_proto.XcjOperationReq{}
+	if err := c.ShouldBind(&req); err != nil {
+		panic(dto.ErrorDto{Code: dto.ArgumentParseError, Message: err.Error()})
+	}
+	simulation := checkDeviceDataAndReturn(req.SimulationId)
+	var err *sys_error.BusinessError = memory.XcjOperation(simulation, req)
+	if err != nil {
+		panic(err)
+	}
+	c.JSON(http.StatusOK, "ok")
+}
+
 // 获取仿真设备数据并返回
 func checkDeviceDataAndReturn(simId string) *memory.VerifySimulation {
 	deviceMemory := ts.FindSimulation(simId)
diff --git a/dto/data_proto/stationLayoutGraphics.pb.go b/dto/data_proto/stationLayoutGraphics.pb.go
index 67de0f1..9da8f68 100644
--- a/dto/data_proto/stationLayoutGraphics.pb.go
+++ b/dto/data_proto/stationLayoutGraphics.pb.go
@@ -4480,6 +4480,7 @@ type CarWashing struct {
 	Code                string      `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"`
 	LinkSection         uint32      `protobuf:"varint,3,opt,name=linkSection,proto3" json:"linkSection,omitempty"`                        //关联区段
 	CentralizedStations []uint32    `protobuf:"varint,4,rep,packed,name=centralizedStations,proto3" json:"centralizedStations,omitempty"` // 集中站Id列表;
+	DuanNum             uint32      `protobuf:"varint,5,opt,name=duanNum,proto3" json:"duanNum,omitempty"`                                //段数
 }
 
 func (x *CarWashing) Reset() {
@@ -4542,6 +4543,13 @@ func (x *CarWashing) GetCentralizedStations() []uint32 {
 	return nil
 }
 
+func (x *CarWashing) GetDuanNum() uint32 {
+	if x != nil {
+		return x.DuanNum
+	}
+	return 0
+}
+
 // * 信标
 type Beacon struct {
 	state         protoimpl.MessageState
@@ -6148,7 +6156,7 @@ var file_stationLayoutGraphics_proto_rawDesc = []byte{
 	0x72, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
 	0x24, 0x0a, 0x0d, 0x72, 0x65, 0x66, 0x50, 0x73, 0x6c, 0x4d, 0x61, 0x70, 0x43, 0x6f, 0x64, 0x65,
 	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x66, 0x50, 0x73, 0x6c, 0x4d, 0x61,
-	0x70, 0x43, 0x6f, 0x64, 0x65, 0x22, 0xa5, 0x01, 0x0a, 0x0a, 0x43, 0x61, 0x72, 0x57, 0x61, 0x73,
+	0x70, 0x43, 0x6f, 0x64, 0x65, 0x22, 0xbf, 0x01, 0x0a, 0x0a, 0x43, 0x61, 0x72, 0x57, 0x61, 0x73,
 	0x68, 0x69, 0x6e, 0x67, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61,
 	0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63,
@@ -6158,134 +6166,135 @@ var file_stationLayoutGraphics_proto_rawDesc = []byte{
 	0x6c, 0x69, 0x6e, 0x6b, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x30, 0x0a, 0x13, 0x63,
 	0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x13, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x61,
-	0x6c, 0x69, 0x7a, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xbc, 0x01,
-	0x0a, 0x06, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68,
-	0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
-	0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x32, 0x0a,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x67, 0x72,
-	0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e,
-	0x2e, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70,
-	0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x04, 0x66, 0x6c, 0x69, 0x70, 0x22, 0x25, 0x0a, 0x0a, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x54,
-	0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x10, 0x00, 0x12,
-	0x0b, 0x0a, 0x07, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x10, 0x01, 0x22, 0xa8, 0x01, 0x0a,
-	0x05, 0x53, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63,
-	0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69,
-	0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x06, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6c, 0x6f, 0x70, 0x65, 0x4e, 0x75, 0x6d, 0x62,
-	0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0b, 0x73, 0x6c, 0x6f, 0x70, 0x65, 0x4e,
-	0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x66, 0x44, 0x65, 0x76, 0x69,
-	0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0b, 0x72, 0x65, 0x66, 0x44,
-	0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xb4, 0x01, 0x0a, 0x09, 0x43, 0x75, 0x72, 0x76,
-	0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44,
-	0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63,
-	0x44, 0x61, 0x74, 0x61, 0x2e, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x06, 0x70, 0x6f, 0x69, 0x6e,
-	0x74, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x4e,
-	0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0f, 0x63, 0x75, 0x72,
-	0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b,
-	0x72, 0x65, 0x66, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x0d, 0x52, 0x0b, 0x72, 0x65, 0x66, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x95,
-	0x01, 0x0a, 0x0e, 0x44, 0x65, 0x70, 0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65,
-	0x72, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e,
-	0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x75, 0x6e, 0x44, 0x69, 0x72,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x75,
-	0x6e, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65,
-	0x66, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x72, 0x65,
-	0x66, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x22, 0x9a, 0x01, 0x0a, 0x0d, 0x41, 0x75, 0x74, 0x6f, 0x52,
-	0x65, 0x74, 0x75, 0x72, 0x6e, 0x42, 0x6f, 0x78, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68,
-	0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
-	0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x66, 0x6c, 0x69, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x69,
-	0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x66, 0x53, 0x74,
-	0x61, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x72, 0x65, 0x66, 0x53, 0x74,
-	0x61, 0x6e, 0x64, 0x22, 0x79, 0x0a, 0x17, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x49, 0x64, 0x4f,
-	0x66, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69,
-	0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x14, 0x6d, 0x61,
-	0x69, 0x6e, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74,
-	0x65, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x6d, 0x61, 0x69, 0x6e, 0x43, 0x6f,
-	0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x90,
-	0x01, 0x0a, 0x10, 0x4b, 0x69, 0x6c, 0x6f, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x76,
-	0x65, 0x72, 0x74, 0x12, 0x2e, 0x0a, 0x03, 0x6b, 0x6d, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x4b,
-	0x69, 0x6c, 0x6f, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x03,
-	0x6b, 0x6d, 0x41, 0x12, 0x2e, 0x0a, 0x03, 0x6b, 0x6d, 0x42, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x4b,
-	0x69, 0x6c, 0x6f, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x03,
-	0x6b, 0x6d, 0x42, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x61, 0x6d, 0x65, 0x54, 0x72, 0x65, 0x6e, 0x64,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x61, 0x6d, 0x65, 0x54, 0x72, 0x65, 0x6e,
-	0x64, 0x22, 0xbd, 0x01, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x6c,
-	0x61, 0x74, 0x65, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x4e, 0x0a,
-	0x10, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69,
-	0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6d, 0x62,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x52, 0x10, 0x63, 0x6f, 0x6d,
-	0x62, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x12, 0x42, 0x0a,
-	0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x22, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e,
-	0x52, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x66, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63,
-	0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70,
-	0x65, 0x22, 0x4b, 0x0a, 0x15, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6d, 0x62, 0x69,
-	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f,
-	0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1e,
-	0x0a, 0x0a, 0x72, 0x65, 0x66, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0d, 0x52, 0x0a, 0x72, 0x65, 0x66, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x22, 0x62,
-	0x0a, 0x10, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x50, 0x6f, 0x69,
-	0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0a, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49,
-	0x64, 0x73, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x7a, 0x65,
-	0x64, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12,
+	0x6c, 0x69, 0x7a, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18, 0x0a,
+	0x07, 0x64, 0x75, 0x61, 0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07,
+	0x64, 0x75, 0x61, 0x6e, 0x4e, 0x75, 0x6d, 0x22, 0xbc, 0x01, 0x0a, 0x06, 0x42, 0x65, 0x61, 0x63,
+	0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61,
+	0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x32, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44,
+	0x61, 0x74, 0x61, 0x2e, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x2e, 0x42, 0x65, 0x61, 0x63, 0x6f,
+	0x6e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66,
+	0x6c, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x69, 0x70, 0x22,
+	0x25, 0x0a, 0x0a, 0x42, 0x65, 0x61, 0x63, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0a, 0x0a,
+	0x06, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x79, 0x6e,
+	0x61, 0x6d, 0x69, 0x63, 0x10, 0x01, 0x22, 0xa8, 0x01, 0x0a, 0x05, 0x53, 0x6c, 0x6f, 0x70, 0x65,
+	0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x12, 0x2a, 0x0a, 0x06, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x12, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e,
+	0x50, 0x6f, 0x69, 0x6e, 0x74, 0x52, 0x06, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x20, 0x0a,
+	0x0b, 0x73, 0x6c, 0x6f, 0x70, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x11, 0x52, 0x0b, 0x73, 0x6c, 0x6f, 0x70, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12,
+	0x20, 0x0a, 0x0b, 0x72, 0x65, 0x66, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05,
+	0x20, 0x03, 0x28, 0x0d, 0x52, 0x0b, 0x72, 0x65, 0x66, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49,
+	0x64, 0x22, 0xb4, 0x01, 0x0a, 0x09, 0x43, 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12,
+	0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x12, 0x2a, 0x0a, 0x06, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x12, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x50,
+	0x6f, 0x69, 0x6e, 0x74, 0x52, 0x06, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x28, 0x0a, 0x0f,
+	0x63, 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0f, 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, 0x65,
+	0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x66, 0x44, 0x65, 0x76,
+	0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0b, 0x72, 0x65, 0x66,
+	0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x95, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x70,
+	0x61, 0x72, 0x74, 0x75, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x72, 0x12, 0x2f, 0x0a, 0x06, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72,
+	0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04,
+	0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65,
+	0x12, 0x22, 0x0a, 0x0c, 0x72, 0x75, 0x6e, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x75, 0x6e, 0x44, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x66, 0x53, 0x74, 0x61, 0x6e, 0x64,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x72, 0x65, 0x66, 0x53, 0x74, 0x61, 0x6e, 0x64,
+	0x22, 0x9a, 0x01, 0x0a, 0x0d, 0x41, 0x75, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x42,
+	0x6f, 0x78, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61,
+	0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x69, 0x70, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x69, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69,
+	0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65,
+	0x78, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x66, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x0d, 0x52, 0x08, 0x72, 0x65, 0x66, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x22, 0x79, 0x0a,
+	0x17, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x49, 0x64, 0x4f, 0x66, 0x53, 0x74, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x4c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06,
+	0x6c, 0x69, 0x6e, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x69,
+	0x6e, 0x65, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x14, 0x6d, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6f, 0x72,
+	0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x14, 0x6d, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61,
+	0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x90, 0x01, 0x0a, 0x10, 0x4b, 0x69, 0x6c,
+	0x6f, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x12, 0x2e, 0x0a,
+	0x03, 0x6b, 0x6d, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x72, 0x61,
+	0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x69, 0x6c, 0x6f, 0x6d, 0x65, 0x74,
+	0x65, 0x72, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x03, 0x6b, 0x6d, 0x41, 0x12, 0x2e, 0x0a,
+	0x03, 0x6b, 0x6d, 0x42, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x72, 0x61,
+	0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x4b, 0x69, 0x6c, 0x6f, 0x6d, 0x65, 0x74,
+	0x65, 0x72, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x03, 0x6b, 0x6d, 0x42, 0x12, 0x1c, 0x0a,
+	0x09, 0x73, 0x61, 0x6d, 0x65, 0x54, 0x72, 0x65, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x09, 0x73, 0x61, 0x6d, 0x65, 0x54, 0x72, 0x65, 0x6e, 0x64, 0x22, 0xbd, 0x01, 0x0a, 0x13,
+	0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x44, 0x65, 0x76,
+	0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x4e, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x62, 0x69,
+	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x22, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e,
+	0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x74, 0x79, 0x70, 0x65, 0x52, 0x10, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x12, 0x42, 0x0a, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63,
+	0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x22, 0x2e, 0x67, 0x72,
+	0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x65,
+	0x64, 0x52, 0x65, 0x66, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x4b, 0x0a, 0x15, 0x44,
+	0x65, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x44,
+	0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x0a, 0x72, 0x65,
+	0x66, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x22, 0x62, 0x0a, 0x10, 0x53, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a,
+	0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d,
+	0x52, 0x0a, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x2e, 0x0a, 0x12,
 	0x63, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x22, 0xc8, 0x02, 0x0a, 0x05, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x12, 0x3d, 0x0a, 0x0a,
-	0x74, 0x72, 0x61, 0x69, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x1d, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x54,
-	0x72, 0x61, 0x69, 0x6e, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x52,
-	0x0a, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x63,
-	0x61, 0x72, 0x72, 0x69, 0x61, 0x67, 0x65, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x61, 0x72, 0x72, 0x69, 0x61, 0x67, 0x65, 0x4c, 0x65, 0x6e,
-	0x67, 0x74, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x4c, 0x65, 0x6e, 0x67,
-	0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x4c,
-	0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x53, 0x65,
-	0x74, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x53,
-	0x65, 0x74, 0x73, 0x12, 0x40, 0x0a, 0x0d, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2c, 0x0a, 0x11, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x11, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4d, 0x61,
-	0x70, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x0a, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x4d, 0x6f, 0x64, 0x65,
-	0x6c, 0x12, 0x05, 0x0a, 0x01, 0x41, 0x10, 0x00, 0x12, 0x05, 0x0a, 0x01, 0x42, 0x10, 0x01, 0x12,
-	0x05, 0x0a, 0x01, 0x43, 0x10, 0x02, 0x12, 0x05, 0x0a, 0x01, 0x44, 0x10, 0x03, 0x22, 0x31, 0x0a,
-	0x09, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10,
-	0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x03, 0x69, 0x64, 0x73,
-	0x2a, 0x1d, 0x0a, 0x09, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x06, 0x0a,
-	0x02, 0x55, 0x50, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x44, 0x4f, 0x57, 0x4e, 0x10, 0x01, 0x42,
-	0x69, 0x0a, 0x25, 0x63, 0x6c, 0x75, 0x62, 0x2e, 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e,
-	0x62, 0x6a, 0x72, 0x74, 0x73, 0x73, 0x2e, 0x61, 0x74, 0x73, 0x2e, 0x76, 0x65, 0x72, 0x69, 0x66,
-	0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x42, 0x13, 0x4c, 0x61, 0x79, 0x6f, 0x75, 0x74,
-	0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x2b, 0x6a,
-	0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x63, 0x6c, 0x75, 0x62, 0x2f, 0x62, 0x6a, 0x2d, 0x72,
-	0x74, 0x73, 0x74, 0x73, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x64, 0x74, 0x6f, 0x2f,
-	0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x61,
+	0x6c, 0x69, 0x7a, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xc8, 0x02, 0x0a,
+	0x05, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x12, 0x3d, 0x0a, 0x0a, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x4d,
+	0x6f, 0x64, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1d, 0x2e, 0x67, 0x72, 0x61,
+	0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x2e, 0x54,
+	0x72, 0x61, 0x69, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x52, 0x0a, 0x74, 0x72, 0x61, 0x69, 0x6e,
+	0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x61, 0x72, 0x72, 0x69, 0x61, 0x67,
+	0x65, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63,
+	0x61, 0x72, 0x72, 0x69, 0x61, 0x67, 0x65, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x20, 0x0a,
+	0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12,
+	0x1c, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x53, 0x65, 0x74, 0x73, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x53, 0x65, 0x74, 0x73, 0x12, 0x40, 0x0a,
+	0x0d, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x72,
+	0x61, 0x69, 0x6e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x0d, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x2c, 0x0a, 0x11, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4d,
+	0x61, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x74, 0x72, 0x61, 0x69,
+	0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x49, 0x64, 0x22, 0x28, 0x0a,
+	0x0a, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x05, 0x0a, 0x01, 0x41,
+	0x10, 0x00, 0x12, 0x05, 0x0a, 0x01, 0x42, 0x10, 0x01, 0x12, 0x05, 0x0a, 0x01, 0x43, 0x10, 0x02,
+	0x12, 0x05, 0x0a, 0x01, 0x44, 0x10, 0x03, 0x22, 0x31, 0x0a, 0x09, 0x4f, 0x74, 0x68, 0x65, 0x72,
+	0x4c, 0x69, 0x6e, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18,
+	0x03, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x03, 0x69, 0x64, 0x73, 0x2a, 0x1d, 0x0a, 0x09, 0x44, 0x69,
+	0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x06, 0x0a, 0x02, 0x55, 0x50, 0x10, 0x00, 0x12,
+	0x08, 0x0a, 0x04, 0x44, 0x4f, 0x57, 0x4e, 0x10, 0x01, 0x42, 0x69, 0x0a, 0x25, 0x63, 0x6c, 0x75,
+	0x62, 0x2e, 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x62, 0x6a, 0x72, 0x74, 0x73, 0x73,
+	0x2e, 0x61, 0x74, 0x73, 0x2e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x73, 0x42, 0x13, 0x4c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69,
+	0x63, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x2b, 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b,
+	0x2e, 0x63, 0x6c, 0x75, 0x62, 0x2f, 0x62, 0x6a, 0x2d, 0x72, 0x74, 0x73, 0x74, 0x73, 0x2d, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x64, 0x74, 0x6f, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/dto/request_proto/request.pb.go b/dto/request_proto/request.pb.go
index 3c750d9..17cf593 100644
--- a/dto/request_proto/request.pb.go
+++ b/dto/request_proto/request.pb.go
@@ -774,6 +774,98 @@ func (Ckm_Fault) EnumDescriptor() ([]byte, []int) {
 	return file_request_proto_rawDescGZIP(), []int{16, 2}
 }
 
+type Xcj_Operation int32
+
+const (
+	Xcj_Undefined Xcj_Operation = 0
+	Xcj_SetParams Xcj_Operation = 1
+)
+
+// Enum value maps for Xcj_Operation.
+var (
+	Xcj_Operation_name = map[int32]string{
+		0: "Undefined",
+		1: "SetParams",
+	}
+	Xcj_Operation_value = map[string]int32{
+		"Undefined": 0,
+		"SetParams": 1,
+	}
+)
+
+func (x Xcj_Operation) Enum() *Xcj_Operation {
+	p := new(Xcj_Operation)
+	*p = x
+	return p
+}
+
+func (x Xcj_Operation) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (Xcj_Operation) Descriptor() protoreflect.EnumDescriptor {
+	return file_request_proto_enumTypes[15].Descriptor()
+}
+
+func (Xcj_Operation) Type() protoreflect.EnumType {
+	return &file_request_proto_enumTypes[15]
+}
+
+func (x Xcj_Operation) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use Xcj_Operation.Descriptor instead.
+func (Xcj_Operation) EnumDescriptor() ([]byte, []int) {
+	return file_request_proto_rawDescGZIP(), []int{19, 0}
+}
+
+type Xcj_Fault int32
+
+const (
+	Xcj_FA_NONE  Xcj_Fault = 0 //无故障
+	Xcj_FA_Fault Xcj_Fault = 1 //故障
+)
+
+// Enum value maps for Xcj_Fault.
+var (
+	Xcj_Fault_name = map[int32]string{
+		0: "FA_NONE",
+		1: "FA_Fault",
+	}
+	Xcj_Fault_value = map[string]int32{
+		"FA_NONE":  0,
+		"FA_Fault": 1,
+	}
+)
+
+func (x Xcj_Fault) Enum() *Xcj_Fault {
+	p := new(Xcj_Fault)
+	*p = x
+	return p
+}
+
+func (x Xcj_Fault) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (Xcj_Fault) Descriptor() protoreflect.EnumDescriptor {
+	return file_request_proto_enumTypes[16].Descriptor()
+}
+
+func (Xcj_Fault) Type() protoreflect.EnumType {
+	return &file_request_proto_enumTypes[16]
+}
+
+func (x Xcj_Fault) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use Xcj_Fault.Descriptor instead.
+func (Xcj_Fault) EnumDescriptor() ([]byte, []int) {
+	return file_request_proto_rawDescGZIP(), []int{19, 1}
+}
+
 // 继电器
 type Relay struct {
 	state         protoimpl.MessageState
@@ -1857,21 +1949,20 @@ func (x *CkmParam) GetFault() Ckm_Fault {
 	return Ckm_FA_NONE
 }
 
-// 车库门控制盒操作请求
-type CkmBoxOperationReq struct {
+type XcjOperationReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	SimulationId string `protobuf:"bytes,1,opt,name=simulationId,proto3" json:"simulationId,omitempty"`
-	MapId        int32  `protobuf:"varint,2,opt,name=mapId,proto3" json:"mapId,omitempty"`
-	CkmBoxId     uint32 `protobuf:"varint,3,opt,name=ckmBoxId,proto3" json:"ckmBoxId,omitempty"`
-	ButtonCode   string `protobuf:"bytes,4,opt,name=buttonCode,proto3" json:"buttonCode,omitempty"`
-	Down         bool   `protobuf:"varint,5,opt,name=down,proto3" json:"down,omitempty"` //按下/抬起
+	SimulationId string        `protobuf:"bytes,1,opt,name=simulationId,proto3" json:"simulationId,omitempty"`
+	MapId        int32         `protobuf:"varint,2,opt,name=mapId,proto3" json:"mapId,omitempty"`
+	DeviceId     uint32        `protobuf:"varint,3,opt,name=deviceId,proto3" json:"deviceId,omitempty"` //设备id（洗车机id）
+	Operation    Xcj_Operation `protobuf:"varint,4,opt,name=operation,proto3,enum=request.Xcj_Operation" json:"operation,omitempty"`
+	Param        *XcjParam     `protobuf:"bytes,5,opt,name=param,proto3" json:"param,omitempty"` //洗车机参数，在operation为SetParams时有效
 }
 
-func (x *CkmBoxOperationReq) Reset() {
-	*x = CkmBoxOperationReq{}
+func (x *XcjOperationReq) Reset() {
+	*x = XcjOperationReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_request_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1879,13 +1970,13 @@ func (x *CkmBoxOperationReq) Reset() {
 	}
 }
 
-func (x *CkmBoxOperationReq) String() string {
+func (x *XcjOperationReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CkmBoxOperationReq) ProtoMessage() {}
+func (*XcjOperationReq) ProtoMessage() {}
 
-func (x *CkmBoxOperationReq) ProtoReflect() protoreflect.Message {
+func (x *XcjOperationReq) ProtoReflect() protoreflect.Message {
 	mi := &file_request_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -1897,44 +1988,129 @@ func (x *CkmBoxOperationReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CkmBoxOperationReq.ProtoReflect.Descriptor instead.
-func (*CkmBoxOperationReq) Descriptor() ([]byte, []int) {
+// Deprecated: Use XcjOperationReq.ProtoReflect.Descriptor instead.
+func (*XcjOperationReq) Descriptor() ([]byte, []int) {
 	return file_request_proto_rawDescGZIP(), []int{18}
 }
 
-func (x *CkmBoxOperationReq) GetSimulationId() string {
+func (x *XcjOperationReq) GetSimulationId() string {
 	if x != nil {
 		return x.SimulationId
 	}
 	return ""
 }
 
-func (x *CkmBoxOperationReq) GetMapId() int32 {
+func (x *XcjOperationReq) GetMapId() int32 {
 	if x != nil {
 		return x.MapId
 	}
 	return 0
 }
 
-func (x *CkmBoxOperationReq) GetCkmBoxId() uint32 {
+func (x *XcjOperationReq) GetDeviceId() uint32 {
 	if x != nil {
-		return x.CkmBoxId
+		return x.DeviceId
 	}
 	return 0
 }
 
-func (x *CkmBoxOperationReq) GetButtonCode() string {
+func (x *XcjOperationReq) GetOperation() Xcj_Operation {
 	if x != nil {
-		return x.ButtonCode
+		return x.Operation
 	}
-	return ""
+	return Xcj_Undefined
 }
 
-func (x *CkmBoxOperationReq) GetDown() bool {
+func (x *XcjOperationReq) GetParam() *XcjParam {
 	if x != nil {
-		return x.Down
+		return x.Param
 	}
-	return false
+	return nil
+}
+
+type Xcj struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *Xcj) Reset() {
+	*x = Xcj{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_request_proto_msgTypes[19]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Xcj) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Xcj) ProtoMessage() {}
+
+func (x *Xcj) ProtoReflect() protoreflect.Message {
+	mi := &file_request_proto_msgTypes[19]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Xcj.ProtoReflect.Descriptor instead.
+func (*Xcj) Descriptor() ([]byte, []int) {
+	return file_request_proto_rawDescGZIP(), []int{19}
+}
+
+type XcjParam struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Fault Xcj_Fault `protobuf:"varint,1,opt,name=fault,proto3,enum=request.Xcj_Fault" json:"fault,omitempty"`
+}
+
+func (x *XcjParam) Reset() {
+	*x = XcjParam{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_request_proto_msgTypes[20]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *XcjParam) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*XcjParam) ProtoMessage() {}
+
+func (x *XcjParam) ProtoReflect() protoreflect.Message {
+	mi := &file_request_proto_msgTypes[20]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use XcjParam.ProtoReflect.Descriptor instead.
+func (*XcjParam) Descriptor() ([]byte, []int) {
+	return file_request_proto_rawDescGZIP(), []int{20}
+}
+
+func (x *XcjParam) GetFault() Xcj_Fault {
+	if x != nil {
+		return x.Fault
+	}
+	return Xcj_FA_NONE
 }
 
 // 紧急制动
@@ -1949,7 +2125,7 @@ type TrainControl_EmergentButton struct {
 func (x *TrainControl_EmergentButton) Reset() {
 	*x = TrainControl_EmergentButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_request_proto_msgTypes[19]
+		mi := &file_request_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1962,7 +2138,7 @@ func (x *TrainControl_EmergentButton) String() string {
 func (*TrainControl_EmergentButton) ProtoMessage() {}
 
 func (x *TrainControl_EmergentButton) ProtoReflect() protoreflect.Message {
-	mi := &file_request_proto_msgTypes[19]
+	mi := &file_request_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1998,7 +2174,7 @@ type TrainControl_DriverKeySwitch struct {
 func (x *TrainControl_DriverKeySwitch) Reset() {
 	*x = TrainControl_DriverKeySwitch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_request_proto_msgTypes[20]
+		mi := &file_request_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2011,7 +2187,7 @@ func (x *TrainControl_DriverKeySwitch) String() string {
 func (*TrainControl_DriverKeySwitch) ProtoMessage() {}
 
 func (x *TrainControl_DriverKeySwitch) ProtoReflect() protoreflect.Message {
-	mi := &file_request_proto_msgTypes[20]
+	mi := &file_request_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2052,7 +2228,7 @@ type TrainControl_DirectionKeySwitch struct {
 func (x *TrainControl_DirectionKeySwitch) Reset() {
 	*x = TrainControl_DirectionKeySwitch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_request_proto_msgTypes[21]
+		mi := &file_request_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2065,7 +2241,7 @@ func (x *TrainControl_DirectionKeySwitch) String() string {
 func (*TrainControl_DirectionKeySwitch) ProtoMessage() {}
 
 func (x *TrainControl_DirectionKeySwitch) ProtoReflect() protoreflect.Message {
-	mi := &file_request_proto_msgTypes[21]
+	mi := &file_request_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2100,7 +2276,7 @@ type TrainControl_PushHandler struct {
 func (x *TrainControl_PushHandler) Reset() {
 	*x = TrainControl_PushHandler{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_request_proto_msgTypes[22]
+		mi := &file_request_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2113,7 +2289,7 @@ func (x *TrainControl_PushHandler) String() string {
 func (*TrainControl_PushHandler) ProtoMessage() {}
 
 func (x *TrainControl_PushHandler) ProtoReflect() protoreflect.Message {
-	mi := &file_request_proto_msgTypes[22]
+	mi := &file_request_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2336,23 +2512,35 @@ var file_request_proto_rawDesc = []byte{
 	0x43, 0x6b, 0x6d, 0x2e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x63, 0x65,
 	0x12, 0x28, 0x0a, 0x05, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
 	0x12, 0x2e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x43, 0x6b, 0x6d, 0x2e, 0x46, 0x61,
-	0x75, 0x6c, 0x74, 0x52, 0x05, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x9e, 0x01, 0x0a, 0x12, 0x43,
-	0x6b, 0x6d, 0x42, 0x6f, 0x78, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x71, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x70, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63,
-	0x6b, 0x6d, 0x42, 0x6f, 0x78, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63,
-	0x6b, 0x6d, 0x42, 0x6f, 0x78, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x74, 0x74, 0x6f,
-	0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x75, 0x74,
-	0x74, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x6f, 0x77, 0x6e, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x64, 0x6f, 0x77, 0x6e, 0x2a, 0x26, 0x0a, 0x0a, 0x44,
-	0x72, 0x69, 0x76, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x4e, 0x45,
-	0x5f, 0x45, 0x4e, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x57, 0x4f, 0x5f, 0x45, 0x4e,
-	0x44, 0x10, 0x01, 0x42, 0x30, 0x5a, 0x2e, 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x63,
-	0x6c, 0x75, 0x62, 0x2f, 0x62, 0x6a, 0x2d, 0x72, 0x74, 0x73, 0x74, 0x73, 0x2d, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x2f, 0x64, 0x74, 0x6f, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x75, 0x6c, 0x74, 0x52, 0x05, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0xc6, 0x01, 0x0a, 0x0f, 0x58,
+	0x63, 0x6a, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x22,
+	0x0a, 0x0c, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x05, 0x6d, 0x61, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x76, 0x69,
+	0x63, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x64, 0x65, 0x76, 0x69,
+	0x63, 0x65, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x2e, 0x58, 0x63, 0x6a, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x05, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x2e, 0x58, 0x63, 0x6a, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x52, 0x05, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x22, 0x54, 0x0a, 0x03, 0x58, 0x63, 0x6a, 0x22, 0x29, 0x0a, 0x09, 0x4f, 0x70,
+	0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x6e, 0x64, 0x65, 0x66,
+	0x69, 0x6e, 0x65, 0x64, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x65, 0x74, 0x50, 0x61, 0x72,
+	0x61, 0x6d, 0x73, 0x10, 0x01, 0x22, 0x22, 0x0a, 0x05, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x0b,
+	0x0a, 0x07, 0x46, 0x41, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x46,
+	0x41, 0x5f, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x10, 0x01, 0x22, 0x34, 0x0a, 0x08, 0x58, 0x63, 0x6a,
+	0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x28, 0x0a, 0x05, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x58,
+	0x63, 0x6a, 0x2e, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x05, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2a,
+	0x26, 0x0a, 0x0a, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a,
+	0x07, 0x4f, 0x4e, 0x45, 0x5f, 0x45, 0x4e, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x57,
+	0x4f, 0x5f, 0x45, 0x4e, 0x44, 0x10, 0x01, 0x42, 0x30, 0x5a, 0x2e, 0x6a, 0x6f, 0x79, 0x6c, 0x69,
+	0x6e, 0x6b, 0x2e, 0x63, 0x6c, 0x75, 0x62, 0x2f, 0x62, 0x6a, 0x2d, 0x72, 0x74, 0x73, 0x74, 0x73,
+	0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x64, 0x74, 0x6f, 0x2f, 0x72, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -2367,8 +2555,8 @@ func file_request_proto_rawDescGZIP() []byte {
 	return file_request_proto_rawDescData
 }
 
-var file_request_proto_enumTypes = make([]protoimpl.EnumInfo, 15)
-var file_request_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
+var file_request_proto_enumTypes = make([]protoimpl.EnumInfo, 17)
+var file_request_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
 var file_request_proto_goTypes = []interface{}{
 	(DriverType)(0),                         // 0: request.DriverType
 	(Relay_Operation)(0),                    // 1: request.Relay.Operation
@@ -2385,60 +2573,67 @@ var file_request_proto_goTypes = []interface{}{
 	(Ckm_Operation)(0),                      // 12: request.Ckm.Operation
 	(Ckm_Force)(0),                          // 13: request.Ckm.Force
 	(Ckm_Fault)(0),                          // 14: request.Ckm.Fault
-	(*Relay)(nil),                           // 15: request.Relay
-	(*RelayOperationReq)(nil),               // 16: request.RelayOperationReq
-	(*Points)(nil),                          // 17: request.Points
-	(*PointsOperationReq)(nil),              // 18: request.PointsOperationReq
-	(*PointsParam)(nil),                     // 19: request.PointsParam
-	(*Signal)(nil),                          // 20: request.Signal
-	(*SignalOperationReq)(nil),              // 21: request.SignalOperationReq
-	(*SignalParam)(nil),                     // 22: request.SignalParam
-	(*Section)(nil),                         // 23: request.Section
-	(*SectionOperationReq)(nil),             // 24: request.SectionOperationReq
-	(*SectionParam)(nil),                    // 25: request.SectionParam
-	(*Psd)(nil),                             // 26: request.Psd
-	(*PsdOperationReq)(nil),                 // 27: request.PsdOperationReq
-	(*PsdParam)(nil),                        // 28: request.PsdParam
-	(*TrainControl)(nil),                    // 29: request.TrainControl
-	(*CkmOperationReq)(nil),                 // 30: request.CkmOperationReq
-	(*Ckm)(nil),                             // 31: request.Ckm
-	(*CkmParam)(nil),                        // 32: request.CkmParam
-	(*CkmBoxOperationReq)(nil),              // 33: request.CkmBoxOperationReq
-	(*TrainControl_EmergentButton)(nil),     // 34: request.TrainControl.EmergentButton
-	(*TrainControl_DriverKeySwitch)(nil),    // 35: request.TrainControl.DriverKeySwitch
-	(*TrainControl_DirectionKeySwitch)(nil), // 36: request.TrainControl.DirectionKeySwitch
-	(*TrainControl_PushHandler)(nil),        // 37: request.TrainControl.PushHandler
+	(Xcj_Operation)(0),                      // 15: request.Xcj.Operation
+	(Xcj_Fault)(0),                          // 16: request.Xcj.Fault
+	(*Relay)(nil),                           // 17: request.Relay
+	(*RelayOperationReq)(nil),               // 18: request.RelayOperationReq
+	(*Points)(nil),                          // 19: request.Points
+	(*PointsOperationReq)(nil),              // 20: request.PointsOperationReq
+	(*PointsParam)(nil),                     // 21: request.PointsParam
+	(*Signal)(nil),                          // 22: request.Signal
+	(*SignalOperationReq)(nil),              // 23: request.SignalOperationReq
+	(*SignalParam)(nil),                     // 24: request.SignalParam
+	(*Section)(nil),                         // 25: request.Section
+	(*SectionOperationReq)(nil),             // 26: request.SectionOperationReq
+	(*SectionParam)(nil),                    // 27: request.SectionParam
+	(*Psd)(nil),                             // 28: request.Psd
+	(*PsdOperationReq)(nil),                 // 29: request.PsdOperationReq
+	(*PsdParam)(nil),                        // 30: request.PsdParam
+	(*TrainControl)(nil),                    // 31: request.TrainControl
+	(*CkmOperationReq)(nil),                 // 32: request.CkmOperationReq
+	(*Ckm)(nil),                             // 33: request.Ckm
+	(*CkmParam)(nil),                        // 34: request.CkmParam
+	(*XcjOperationReq)(nil),                 // 35: request.XcjOperationReq
+	(*Xcj)(nil),                             // 36: request.Xcj
+	(*XcjParam)(nil),                        // 37: request.XcjParam
+	(*TrainControl_EmergentButton)(nil),     // 38: request.TrainControl.EmergentButton
+	(*TrainControl_DriverKeySwitch)(nil),    // 39: request.TrainControl.DriverKeySwitch
+	(*TrainControl_DirectionKeySwitch)(nil), // 40: request.TrainControl.DirectionKeySwitch
+	(*TrainControl_PushHandler)(nil),        // 41: request.TrainControl.PushHandler
 }
 var file_request_proto_depIdxs = []int32{
 	1,  // 0: request.RelayOperationReq.operation:type_name -> request.Relay.Operation
 	2,  // 1: request.PointsOperationReq.operation:type_name -> request.Points.Operation
-	19, // 2: request.PointsOperationReq.param:type_name -> request.PointsParam
+	21, // 2: request.PointsOperationReq.param:type_name -> request.PointsParam
 	3,  // 3: request.PointsParam.forcePosition:type_name -> request.Points.Force
 	4,  // 4: request.SignalOperationReq.operation:type_name -> request.Signal.Operation
-	22, // 5: request.SignalOperationReq.param:type_name -> request.SignalParam
+	24, // 5: request.SignalOperationReq.param:type_name -> request.SignalParam
 	6,  // 6: request.SignalParam.force:type_name -> request.Signal.Force
 	5,  // 7: request.SignalParam.dsList:type_name -> request.Signal.DS
 	7,  // 8: request.SectionOperationReq.operation:type_name -> request.Section.Operation
-	25, // 9: request.SectionOperationReq.param:type_name -> request.SectionParam
+	27, // 9: request.SectionOperationReq.param:type_name -> request.SectionParam
 	8,  // 10: request.PsdOperationReq.operation:type_name -> request.Psd.Operation
-	28, // 11: request.PsdOperationReq.param:type_name -> request.PsdParam
+	30, // 11: request.PsdOperationReq.param:type_name -> request.PsdParam
 	9,  // 12: request.PsdParam.force:type_name -> request.Psd.Force
 	10, // 13: request.PsdParam.fault:type_name -> request.Psd.Fault
 	11, // 14: request.TrainControl.controlType:type_name -> request.TrainControl.TrainControlType
-	34, // 15: request.TrainControl.button:type_name -> request.TrainControl.EmergentButton
-	35, // 16: request.TrainControl.driverKey:type_name -> request.TrainControl.DriverKeySwitch
-	36, // 17: request.TrainControl.dirKey:type_name -> request.TrainControl.DirectionKeySwitch
-	37, // 18: request.TrainControl.handler:type_name -> request.TrainControl.PushHandler
+	38, // 15: request.TrainControl.button:type_name -> request.TrainControl.EmergentButton
+	39, // 16: request.TrainControl.driverKey:type_name -> request.TrainControl.DriverKeySwitch
+	40, // 17: request.TrainControl.dirKey:type_name -> request.TrainControl.DirectionKeySwitch
+	41, // 18: request.TrainControl.handler:type_name -> request.TrainControl.PushHandler
 	12, // 19: request.CkmOperationReq.operation:type_name -> request.Ckm.Operation
-	32, // 20: request.CkmOperationReq.param:type_name -> request.CkmParam
+	34, // 20: request.CkmOperationReq.param:type_name -> request.CkmParam
 	13, // 21: request.CkmParam.force:type_name -> request.Ckm.Force
 	14, // 22: request.CkmParam.fault:type_name -> request.Ckm.Fault
-	0,  // 23: request.TrainControl.DriverKeySwitch.dt:type_name -> request.DriverType
-	24, // [24:24] is the sub-list for method output_type
-	24, // [24:24] is the sub-list for method input_type
-	24, // [24:24] is the sub-list for extension type_name
-	24, // [24:24] is the sub-list for extension extendee
-	0,  // [0:24] is the sub-list for field type_name
+	15, // 23: request.XcjOperationReq.operation:type_name -> request.Xcj.Operation
+	37, // 24: request.XcjOperationReq.param:type_name -> request.XcjParam
+	16, // 25: request.XcjParam.fault:type_name -> request.Xcj.Fault
+	0,  // 26: request.TrainControl.DriverKeySwitch.dt:type_name -> request.DriverType
+	27, // [27:27] is the sub-list for method output_type
+	27, // [27:27] is the sub-list for method input_type
+	27, // [27:27] is the sub-list for extension type_name
+	27, // [27:27] is the sub-list for extension extendee
+	0,  // [0:27] is the sub-list for field type_name
 }
 
 func init() { file_request_proto_init() }
@@ -2664,7 +2859,7 @@ func file_request_proto_init() {
 			}
 		}
 		file_request_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CkmBoxOperationReq); i {
+			switch v := v.(*XcjOperationReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2676,7 +2871,7 @@ func file_request_proto_init() {
 			}
 		}
 		file_request_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrainControl_EmergentButton); i {
+			switch v := v.(*Xcj); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2688,7 +2883,7 @@ func file_request_proto_init() {
 			}
 		}
 		file_request_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrainControl_DriverKeySwitch); i {
+			switch v := v.(*XcjParam); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2700,7 +2895,7 @@ func file_request_proto_init() {
 			}
 		}
 		file_request_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TrainControl_DirectionKeySwitch); i {
+			switch v := v.(*TrainControl_EmergentButton); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2712,6 +2907,30 @@ func file_request_proto_init() {
 			}
 		}
 		file_request_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TrainControl_DriverKeySwitch); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_request_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TrainControl_DirectionKeySwitch); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_request_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TrainControl_PushHandler); i {
 			case 0:
 				return &v.state
@@ -2729,8 +2948,8 @@ func file_request_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_request_proto_rawDesc,
-			NumEnums:      15,
-			NumMessages:   23,
+			NumEnums:      17,
+			NumMessages:   25,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/dto/state_proto/device_state.pb.go b/dto/state_proto/device_state.pb.go
index f9494cc..fc3b811 100644
--- a/dto/state_proto/device_state.pb.go
+++ b/dto/state_proto/device_state.pb.go
@@ -249,7 +249,7 @@ func (x SimulationStatus_SimulationState) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use SimulationStatus_SimulationState.Descriptor instead.
 func (SimulationStatus_SimulationState) EnumDescriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{29, 0}
+	return file_device_state_proto_rawDescGZIP(), []int{30, 0}
 }
 
 type SimulationThirdPartyApiService_Type int32
@@ -301,7 +301,7 @@ func (x SimulationThirdPartyApiService_Type) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use SimulationThirdPartyApiService_Type.Descriptor instead.
 func (SimulationThirdPartyApiService_Type) EnumDescriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{30, 0}
+	return file_device_state_proto_rawDescGZIP(), []int{31, 0}
 }
 
 // 服务状态
@@ -350,7 +350,7 @@ func (x SimulationThirdPartyApiService_State) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use SimulationThirdPartyApiService_State.Descriptor instead.
 func (SimulationThirdPartyApiService_State) EnumDescriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{30, 1}
+	return file_device_state_proto_rawDescGZIP(), []int{31, 1}
 }
 
 // 相邻端点定义的link的状态
@@ -3556,6 +3556,126 @@ func (x *CkmState) GetParam() *request_proto.CkmParam {
 	return nil
 }
 
+// 洗车机
+type XcjState struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id      uint32                  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`                  //车库门的id
+	Param   *request_proto.XcjParam `protobuf:"bytes,2,opt,name=param,proto3" json:"param,omitempty"`             //屏蔽门设置的参数
+	Xqj     bool                    `protobuf:"varint,3,opt,name=xqj,proto3" json:"xqj,omitempty"`                //洗车请求
+	TwjList []bool                  `protobuf:"varint,4,rep,packed,name=twjList,proto3" json:"twjList,omitempty"` //停稳
+	Tgqj    bool                    `protobuf:"varint,5,opt,name=tgqj,proto3" json:"tgqj,omitempty"`              //通过请求
+	Xcjxj   bool                    `protobuf:"varint,6,opt,name=xcjxj,proto3" json:"xcjxj,omitempty"`            //洗车就绪
+	Xcyxj   bool                    `protobuf:"varint,7,opt,name=xcyxj,proto3" json:"xcyxj,omitempty"`            //洗车允许
+	CfjList []bool                  `protobuf:"varint,8,rep,packed,name=cfjList,proto3" json:"cfjList,omitempty"` //移动允许
+	Jtj     bool                    `protobuf:"varint,9,opt,name=jtj,proto3" json:"jtj,omitempty"`                //紧急停车
+	Tgyxj   bool                    `protobuf:"varint,10,opt,name=tgyxj,proto3" json:"tgyxj,omitempty"`           //通过允许
+}
+
+func (x *XcjState) Reset() {
+	*x = XcjState{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_device_state_proto_msgTypes[26]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *XcjState) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*XcjState) ProtoMessage() {}
+
+func (x *XcjState) ProtoReflect() protoreflect.Message {
+	mi := &file_device_state_proto_msgTypes[26]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use XcjState.ProtoReflect.Descriptor instead.
+func (*XcjState) Descriptor() ([]byte, []int) {
+	return file_device_state_proto_rawDescGZIP(), []int{26}
+}
+
+func (x *XcjState) GetId() uint32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *XcjState) GetParam() *request_proto.XcjParam {
+	if x != nil {
+		return x.Param
+	}
+	return nil
+}
+
+func (x *XcjState) GetXqj() bool {
+	if x != nil {
+		return x.Xqj
+	}
+	return false
+}
+
+func (x *XcjState) GetTwjList() []bool {
+	if x != nil {
+		return x.TwjList
+	}
+	return nil
+}
+
+func (x *XcjState) GetTgqj() bool {
+	if x != nil {
+		return x.Tgqj
+	}
+	return false
+}
+
+func (x *XcjState) GetXcjxj() bool {
+	if x != nil {
+		return x.Xcjxj
+	}
+	return false
+}
+
+func (x *XcjState) GetXcyxj() bool {
+	if x != nil {
+		return x.Xcyxj
+	}
+	return false
+}
+
+func (x *XcjState) GetCfjList() []bool {
+	if x != nil {
+		return x.CfjList
+	}
+	return nil
+}
+
+func (x *XcjState) GetJtj() bool {
+	if x != nil {
+		return x.Jtj
+	}
+	return false
+}
+
+func (x *XcjState) GetTgyxj() bool {
+	if x != nil {
+		return x.Tgyxj
+	}
+	return false
+}
+
 // 仿真运行时状态变化量，当前时刻与上一时刻比较得到
 type VariationStatus struct {
 	state         protoimpl.MessageState
@@ -3577,7 +3697,7 @@ type VariationStatus struct {
 func (x *VariationStatus) Reset() {
 	*x = VariationStatus{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[26]
+		mi := &file_device_state_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3590,7 +3710,7 @@ func (x *VariationStatus) String() string {
 func (*VariationStatus) ProtoMessage() {}
 
 func (x *VariationStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[26]
+	mi := &file_device_state_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3603,7 +3723,7 @@ func (x *VariationStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VariationStatus.ProtoReflect.Descriptor instead.
 func (*VariationStatus) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{26}
+	return file_device_state_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *VariationStatus) GetUpdatedTrain() []*TrainMapState {
@@ -3677,12 +3797,14 @@ type AllDevicesStatus struct {
 	CkmStates []*CkmState `protobuf:"bytes,14,rep,name=ckmStates,proto3" json:"ckmStates,omitempty"`
 	// 防淹门状态
 	FymStates []*CkmState `protobuf:"bytes,15,rep,name=fymStates,proto3" json:"fymStates,omitempty"`
+	// 洗车机状态
+	XcjStates []*XcjState `protobuf:"bytes,16,rep,name=xcjStates,proto3" json:"xcjStates,omitempty"`
 }
 
 func (x *AllDevicesStatus) Reset() {
 	*x = AllDevicesStatus{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[27]
+		mi := &file_device_state_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3695,7 +3817,7 @@ func (x *AllDevicesStatus) String() string {
 func (*AllDevicesStatus) ProtoMessage() {}
 
 func (x *AllDevicesStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[27]
+	mi := &file_device_state_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3708,7 +3830,7 @@ func (x *AllDevicesStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AllDevicesStatus.ProtoReflect.Descriptor instead.
 func (*AllDevicesStatus) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{27}
+	return file_device_state_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *AllDevicesStatus) GetTrainState() []*TrainMapState {
@@ -3816,6 +3938,13 @@ func (x *AllDevicesStatus) GetFymStates() []*CkmState {
 	return nil
 }
 
+func (x *AllDevicesStatus) GetXcjStates() []*XcjState {
+	if x != nil {
+		return x.XcjStates
+	}
+	return nil
+}
+
 // 服务器端向前端推送的设备状态信息
 type PushedDevicesStatus struct {
 	state         protoimpl.MessageState
@@ -3834,7 +3963,7 @@ type PushedDevicesStatus struct {
 func (x *PushedDevicesStatus) Reset() {
 	*x = PushedDevicesStatus{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[28]
+		mi := &file_device_state_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3847,7 +3976,7 @@ func (x *PushedDevicesStatus) String() string {
 func (*PushedDevicesStatus) ProtoMessage() {}
 
 func (x *PushedDevicesStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[28]
+	mi := &file_device_state_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3860,7 +3989,7 @@ func (x *PushedDevicesStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PushedDevicesStatus.ProtoReflect.Descriptor instead.
 func (*PushedDevicesStatus) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{28}
+	return file_device_state_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *PushedDevicesStatus) GetAll() bool {
@@ -3897,7 +4026,7 @@ type SimulationStatus struct {
 func (x *SimulationStatus) Reset() {
 	*x = SimulationStatus{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[29]
+		mi := &file_device_state_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3910,7 +4039,7 @@ func (x *SimulationStatus) String() string {
 func (*SimulationStatus) ProtoMessage() {}
 
 func (x *SimulationStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[29]
+	mi := &file_device_state_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3923,7 +4052,7 @@ func (x *SimulationStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SimulationStatus.ProtoReflect.Descriptor instead.
 func (*SimulationStatus) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{29}
+	return file_device_state_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *SimulationStatus) GetSimulationId() string {
@@ -3953,7 +4082,7 @@ type SimulationThirdPartyApiService struct {
 func (x *SimulationThirdPartyApiService) Reset() {
 	*x = SimulationThirdPartyApiService{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[30]
+		mi := &file_device_state_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3966,7 +4095,7 @@ func (x *SimulationThirdPartyApiService) String() string {
 func (*SimulationThirdPartyApiService) ProtoMessage() {}
 
 func (x *SimulationThirdPartyApiService) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[30]
+	mi := &file_device_state_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3979,7 +4108,7 @@ func (x *SimulationThirdPartyApiService) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SimulationThirdPartyApiService.ProtoReflect.Descriptor instead.
 func (*SimulationThirdPartyApiService) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{30}
+	return file_device_state_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *SimulationThirdPartyApiService) GetStates() []*SimulationThirdPartyApiServiceState {
@@ -4004,7 +4133,7 @@ type SimulationThirdPartyApiServiceState struct {
 func (x *SimulationThirdPartyApiServiceState) Reset() {
 	*x = SimulationThirdPartyApiServiceState{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[31]
+		mi := &file_device_state_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4017,7 +4146,7 @@ func (x *SimulationThirdPartyApiServiceState) String() string {
 func (*SimulationThirdPartyApiServiceState) ProtoMessage() {}
 
 func (x *SimulationThirdPartyApiServiceState) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[31]
+	mi := &file_device_state_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4030,7 +4159,7 @@ func (x *SimulationThirdPartyApiServiceState) ProtoReflect() protoreflect.Messag
 
 // Deprecated: Use SimulationThirdPartyApiServiceState.ProtoReflect.Descriptor instead.
 func (*SimulationThirdPartyApiServiceState) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{31}
+	return file_device_state_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *SimulationThirdPartyApiServiceState) GetType() SimulationThirdPartyApiService_Type {
@@ -4062,7 +4191,7 @@ type TrainControlState struct {
 func (x *TrainControlState) Reset() {
 	*x = TrainControlState{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[32]
+		mi := &file_device_state_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4075,7 +4204,7 @@ func (x *TrainControlState) String() string {
 func (*TrainControlState) ProtoMessage() {}
 
 func (x *TrainControlState) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[32]
+	mi := &file_device_state_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4088,7 +4217,7 @@ func (x *TrainControlState) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TrainControlState.ProtoReflect.Descriptor instead.
 func (*TrainControlState) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{32}
+	return file_device_state_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *TrainControlState) GetEbutton() *TrainControlState_EmergentButton {
@@ -4132,7 +4261,7 @@ type StationQc_State struct {
 func (x *StationQc_State) Reset() {
 	*x = StationQc_State{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[34]
+		mi := &file_device_state_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4145,7 +4274,7 @@ func (x *StationQc_State) String() string {
 func (*StationQc_State) ProtoMessage() {}
 
 func (x *StationQc_State) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[34]
+	mi := &file_device_state_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4194,7 +4323,7 @@ type TrainControlState_EmergentButton struct {
 func (x *TrainControlState_EmergentButton) Reset() {
 	*x = TrainControlState_EmergentButton{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[35]
+		mi := &file_device_state_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4207,7 +4336,7 @@ func (x *TrainControlState_EmergentButton) String() string {
 func (*TrainControlState_EmergentButton) ProtoMessage() {}
 
 func (x *TrainControlState_EmergentButton) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[35]
+	mi := &file_device_state_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4220,7 +4349,7 @@ func (x *TrainControlState_EmergentButton) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TrainControlState_EmergentButton.ProtoReflect.Descriptor instead.
 func (*TrainControlState_EmergentButton) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{32, 0}
+	return file_device_state_proto_rawDescGZIP(), []int{33, 0}
 }
 
 func (x *TrainControlState_EmergentButton) GetId() uint32 {
@@ -4250,7 +4379,7 @@ type TrainControlState_DriverKeySwitch struct {
 func (x *TrainControlState_DriverKeySwitch) Reset() {
 	*x = TrainControlState_DriverKeySwitch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[36]
+		mi := &file_device_state_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4263,7 +4392,7 @@ func (x *TrainControlState_DriverKeySwitch) String() string {
 func (*TrainControlState_DriverKeySwitch) ProtoMessage() {}
 
 func (x *TrainControlState_DriverKeySwitch) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[36]
+	mi := &file_device_state_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4276,7 +4405,7 @@ func (x *TrainControlState_DriverKeySwitch) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use TrainControlState_DriverKeySwitch.ProtoReflect.Descriptor instead.
 func (*TrainControlState_DriverKeySwitch) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{32, 1}
+	return file_device_state_proto_rawDescGZIP(), []int{33, 1}
 }
 
 func (x *TrainControlState_DriverKeySwitch) GetId() uint32 {
@@ -4312,7 +4441,7 @@ type TrainControlState_DirectionKeySwitch struct {
 func (x *TrainControlState_DirectionKeySwitch) Reset() {
 	*x = TrainControlState_DirectionKeySwitch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[37]
+		mi := &file_device_state_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4325,7 +4454,7 @@ func (x *TrainControlState_DirectionKeySwitch) String() string {
 func (*TrainControlState_DirectionKeySwitch) ProtoMessage() {}
 
 func (x *TrainControlState_DirectionKeySwitch) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[37]
+	mi := &file_device_state_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4338,7 +4467,7 @@ func (x *TrainControlState_DirectionKeySwitch) ProtoReflect() protoreflect.Messa
 
 // Deprecated: Use TrainControlState_DirectionKeySwitch.ProtoReflect.Descriptor instead.
 func (*TrainControlState_DirectionKeySwitch) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{32, 2}
+	return file_device_state_proto_rawDescGZIP(), []int{33, 2}
 }
 
 func (x *TrainControlState_DirectionKeySwitch) GetId() uint32 {
@@ -4368,7 +4497,7 @@ type TrainControlState_PushHandler struct {
 func (x *TrainControlState_PushHandler) Reset() {
 	*x = TrainControlState_PushHandler{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_device_state_proto_msgTypes[38]
+		mi := &file_device_state_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4381,7 +4510,7 @@ func (x *TrainControlState_PushHandler) String() string {
 func (*TrainControlState_PushHandler) ProtoMessage() {}
 
 func (x *TrainControlState_PushHandler) ProtoReflect() protoreflect.Message {
-	mi := &file_device_state_proto_msgTypes[38]
+	mi := &file_device_state_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4394,7 +4523,7 @@ func (x *TrainControlState_PushHandler) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TrainControlState_PushHandler.ProtoReflect.Descriptor instead.
 func (*TrainControlState_PushHandler) Descriptor() ([]byte, []int) {
-	return file_device_state_proto_rawDescGZIP(), []int{32, 3}
+	return file_device_state_proto_rawDescGZIP(), []int{33, 3}
 }
 
 func (x *TrainControlState_PushHandler) GetId() uint32 {
@@ -5000,165 +5129,183 @@ var file_device_state_proto_rawDesc = []byte{
 	0x0a, 0x03, 0x6d, 0x67, 0x6a, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x6d, 0x67, 0x6a,
 	0x12, 0x27, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x11, 0x2e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x43, 0x6b, 0x6d, 0x50, 0x61, 0x72,
-	0x61, 0x6d, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xa1, 0x02, 0x0a, 0x0f, 0x56, 0x61,
-	0x72, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x38, 0x0a,
-	0x0c, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69,
-	0x6e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x75, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x64, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x6d, 0x6f, 0x76,
-	0x65, 0x64, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12,
-	0x38, 0x0a, 0x0d, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53,
-	0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0d, 0x75, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x64, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x3b, 0x0a, 0x0e, 0x75, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x64, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x13, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x53,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, 0x0c, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
-	0x0c, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x96, 0x06,
-	0x0a, 0x10, 0x41, 0x6c, 0x6c, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x12, 0x34, 0x0a, 0x0a, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54,
-	0x72, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0a, 0x74, 0x72,
-	0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x0b, 0x73, 0x77, 0x69, 0x74,
-	0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x52, 0x0b, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x37,
-	0x0a, 0x0c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x73, 0x65, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x31, 0x0a, 0x0a, 0x72, 0x65, 0x70, 0x6c, 0x79,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0a,
-	0x72, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x0b, 0x73, 0x69,
-	0x67, 0x6e, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x12, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x52, 0x0b, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x12, 0x34, 0x0a, 0x0b, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18,
-	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x42, 0x75,
-	0x74, 0x74, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x62, 0x75, 0x74, 0x74, 0x6f,
-	0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x31, 0x0a, 0x0a, 0x41, 0x6c, 0x61, 0x72, 0x6d, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x41, 0x6c, 0x61, 0x72, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0a, 0x41,
-	0x6c, 0x61, 0x72, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x31, 0x0a, 0x0a, 0x4c, 0x69, 0x67,
-	0x68, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65,
-	0x52, 0x0a, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2b, 0x0a, 0x08,
-	0x70, 0x73, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f,
-	0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x73, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
-	0x08, 0x70, 0x73, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2b, 0x0a, 0x08, 0x4b, 0x65, 0x79,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x4b, 0x65, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x08, 0x4b, 0x65,
-	0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x3a, 0x0a, 0x0d, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f,
-	0x72, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x52, 0x0d, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x12, 0x34, 0x0a, 0x0b, 0x62, 0x61, 0x6c, 0x69, 0x73, 0x65, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e,
-	0x42, 0x61, 0x6c, 0x69, 0x73, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x62, 0x61, 0x6c,
-	0x69, 0x73, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2e, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x51, 0x63, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x51, 0x63, 0x52, 0x09, 0x73,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x51, 0x63, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6b, 0x6d, 0x53,
-	0x74, 0x61, 0x74, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x43, 0x6b, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09, 0x63, 0x6b,
-	0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x12, 0x2d, 0x0a, 0x09, 0x66, 0x79, 0x6d, 0x53, 0x74,
-	0x61, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x43, 0x6b, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09, 0x66, 0x79, 0x6d,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x94, 0x01, 0x0a, 0x13, 0x50, 0x75, 0x73, 0x68, 0x65,
-	0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x10,
-	0x0a, 0x03, 0x61, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x61, 0x6c, 0x6c,
-	0x12, 0x34, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56, 0x61, 0x72, 0x69,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x09, 0x76, 0x61, 0x72,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x35, 0x0a, 0x09, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x2e, 0x41, 0x6c, 0x6c, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x52, 0x09, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xc2, 0x01,
-	0x0a, 0x10, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x3d, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69,
-	0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x53,
-	0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x4b, 0x0a, 0x0f, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x6e, 0x69, 0x74,
-	0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12,
-	0x09, 0x0a, 0x05, 0x50, 0x61, 0x75, 0x73, 0x65, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x72,
-	0x72, 0x6f, 0x72, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79,
-	0x10, 0x04, 0x22, 0xc0, 0x01, 0x0a, 0x1e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x61, 0x72, 0x74, 0x79, 0x41, 0x70, 0x69, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x42, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69,
-	0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x61, 0x72,
-	0x74, 0x79, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x3a, 0x0a, 0x04, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x6e, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x10, 0x00,
-	0x12, 0x0c, 0x0a, 0x08, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x73, 0x10, 0x01, 0x12, 0x15,
-	0x0a, 0x11, 0x53, 0x65, 0x6d, 0x69, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x72,
-	0x61, 0x69, 0x6e, 0x10, 0x02, 0x22, 0x1e, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0a,
-	0x0a, 0x06, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x72,
-	0x72, 0x6f, 0x72, 0x10, 0x01, 0x22, 0xa8, 0x01, 0x0a, 0x23, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61,
+	0x61, 0x6d, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xf1, 0x01, 0x0a, 0x08, 0x58, 0x63,
+	0x6a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
+	0x58, 0x63, 0x6a, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12,
+	0x10, 0x0a, 0x03, 0x78, 0x71, 0x6a, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x78, 0x71,
+	0x6a, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x77, 0x6a, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x03,
+	0x28, 0x08, 0x52, 0x07, 0x74, 0x77, 0x6a, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x74,
+	0x67, 0x71, 0x6a, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x74, 0x67, 0x71, 0x6a, 0x12,
+	0x14, 0x0a, 0x05, 0x78, 0x63, 0x6a, 0x78, 0x6a, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
+	0x78, 0x63, 0x6a, 0x78, 0x6a, 0x12, 0x14, 0x0a, 0x05, 0x78, 0x63, 0x79, 0x78, 0x6a, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x78, 0x63, 0x79, 0x78, 0x6a, 0x12, 0x18, 0x0a, 0x07, 0x63,
+	0x66, 0x6a, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x08, 0x52, 0x07, 0x63, 0x66,
+	0x6a, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6a, 0x74, 0x6a, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x03, 0x6a, 0x74, 0x6a, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x67, 0x79, 0x78, 0x6a,
+	0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x74, 0x67, 0x79, 0x78, 0x6a, 0x22, 0xa1, 0x02,
+	0x0a, 0x0f, 0x56, 0x61, 0x72, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x12, 0x38, 0x0a, 0x0c, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x54, 0x72, 0x61, 0x69,
+	0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e,
+	0x54, 0x72, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x75,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x72,
+	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x0e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x54, 0x72, 0x61, 0x69,
+	0x6e, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x0d, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x53, 0x77,
+	0x69, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x74, 0x61,
+	0x74, 0x65, 0x2e, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0d,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x3b, 0x0a,
+	0x0e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x65,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0e, 0x75, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x64, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, 0x0c, 0x75, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x11, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x52, 0x0c, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x22, 0xc5, 0x06, 0x0a, 0x10, 0x41, 0x6c, 0x6c, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x34, 0x0a, 0x0a, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x74, 0x61,
+	0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x52, 0x0a, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x0b,
+	0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x12, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x74, 0x61,
+	0x74, 0x65, 0x12, 0x37, 0x0a, 0x0c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61,
+	0x74, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x2e, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x73,
+	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x31, 0x0a, 0x0a, 0x72,
+	0x65, 0x70, 0x6c, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x11, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x74, 0x61,
+	0x74, 0x65, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x34,
+	0x0a, 0x0b, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x67, 0x6e,
+	0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x0b, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x74, 0x61, 0x74,
+	0x65, 0x2e, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x62,
+	0x75, 0x74, 0x74, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x31, 0x0a, 0x0a, 0x41, 0x6c,
+	0x61, 0x72, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11,
+	0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x41, 0x6c, 0x61, 0x72, 0x6d, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x52, 0x0a, 0x41, 0x6c, 0x61, 0x72, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x31, 0x0a,
+	0x0a, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x11, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x52, 0x0a, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x12, 0x2b, 0x0a, 0x08, 0x70, 0x73, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x73, 0x64, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x52, 0x08, 0x70, 0x73, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2b, 0x0a,
+	0x08, 0x4b, 0x65, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0f, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4b, 0x65, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x52, 0x08, 0x4b, 0x65, 0x79, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x3a, 0x0a, 0x0d, 0x70, 0x6c,
+	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x14, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f,
+	0x72, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0d, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
+	0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x0b, 0x62, 0x61, 0x6c, 0x69, 0x73, 0x65,
+	0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x74,
+	0x61, 0x74, 0x65, 0x2e, 0x42, 0x61, 0x6c, 0x69, 0x73, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
+	0x0b, 0x62, 0x61, 0x6c, 0x69, 0x73, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2e, 0x0a, 0x09,
+	0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x51, 0x63, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x10, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x51,
+	0x63, 0x52, 0x09, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x51, 0x63, 0x12, 0x2d, 0x0a, 0x09,
+	0x63, 0x6b, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0f, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x6b, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x52, 0x09, 0x63, 0x6b, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x12, 0x2d, 0x0a, 0x09, 0x66,
+	0x79, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f,
+	0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x6b, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
+	0x09, 0x66, 0x79, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x12, 0x2d, 0x0a, 0x09, 0x78, 0x63,
+	0x6a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
+	0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x58, 0x63, 0x6a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09,
+	0x78, 0x63, 0x6a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x94, 0x01, 0x0a, 0x13, 0x50, 0x75,
+	0x73, 0x68, 0x65, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03,
+	0x61, 0x6c, 0x6c, 0x12, 0x34, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56,
+	0x61, 0x72, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x09,
+	0x76, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x35, 0x0a, 0x09, 0x61, 0x6c, 0x6c,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73,
+	0x74, 0x61, 0x74, 0x65, 0x2e, 0x41, 0x6c, 0x6c, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x09, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x22, 0xc2, 0x01, 0x0a, 0x10, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6d,
+	0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x3d, 0x0a, 0x05, 0x73, 0x74, 0x61,
+	0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x2e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x2e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x4b, 0x0a, 0x0f, 0x53, 0x69, 0x6d, 0x75,
+	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x49,
+	0x6e, 0x69, 0x74, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67,
+	0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x50, 0x61, 0x75, 0x73, 0x65, 0x10, 0x02, 0x12, 0x09, 0x0a,
+	0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x65, 0x73, 0x74,
+	0x72, 0x6f, 0x79, 0x10, 0x04, 0x22, 0xc0, 0x01, 0x0a, 0x1e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x61, 0x72, 0x74, 0x79, 0x41, 0x70,
-	0x69, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x3e, 0x0a,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x68,
-	0x69, 0x72, 0x64, 0x50, 0x61, 0x72, 0x74, 0x79, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x41, 0x0a,
-	0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54,
-	0x68, 0x69, 0x72, 0x64, 0x50, 0x61, 0x72, 0x74, 0x79, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x22, 0xa8, 0x04, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x41, 0x0a, 0x07, 0x65, 0x62, 0x75, 0x74, 0x74, 0x6f,
-	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e,
-	0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74,
-	0x65, 0x2e, 0x45, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e,
-	0x52, 0x07, 0x65, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x09, 0x64, 0x72, 0x69,
-	0x76, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4b, 0x65, 0x79,
-	0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x52, 0x09, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4b, 0x65,
-	0x79, 0x12, 0x43, 0x0a, 0x06, 0x64, 0x69, 0x72, 0x4b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2b, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x69, 0x72, 0x65,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x52, 0x06,
-	0x64, 0x69, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x46, 0x0a, 0x0b, 0x70, 0x75, 0x73, 0x68, 0x48, 0x61,
-	0x6e, 0x64, 0x6c, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65,
-	0x72, 0x52, 0x0b, 0x70, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x1a, 0x38,
-	0x0a, 0x0e, 0x45, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64,
-	0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x06, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x1a, 0x58, 0x0a, 0x0f, 0x44, 0x72, 0x69, 0x76,
-	0x65, 0x72, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x69, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x42, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x2e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x68, 0x69, 0x72, 0x64,
+	0x50, 0x61, 0x72, 0x74, 0x79, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x3a, 0x0a, 0x04,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x6e, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65,
+	0x64, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x73, 0x10,
+	0x01, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x65, 0x6d, 0x69, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61,
+	0x6c, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x10, 0x02, 0x22, 0x1e, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x10, 0x00, 0x12, 0x09, 0x0a,
+	0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x22, 0xa8, 0x01, 0x0a, 0x23, 0x53, 0x69, 0x6d,
+	0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x61, 0x72, 0x74,
+	0x79, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x12, 0x3e, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a,
+	0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x61, 0x72, 0x74, 0x79, 0x41, 0x70, 0x69, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
+	0x12, 0x41, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x2b, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x61, 0x72, 0x74, 0x79, 0x41, 0x70, 0x69, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74,
+	0x61, 0x74, 0x65, 0x22, 0xa8, 0x04, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x41, 0x0a, 0x07, 0x65, 0x62, 0x75,
+	0x74, 0x74, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x73, 0x74, 0x61,
+	0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x2e, 0x45, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x74,
+	0x74, 0x6f, 0x6e, 0x52, 0x07, 0x65, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x09,
+	0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x28, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e,
+	0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72,
+	0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x52, 0x09, 0x64, 0x72, 0x69, 0x76, 0x65,
+	0x72, 0x4b, 0x65, 0x79, 0x12, 0x43, 0x0a, 0x06, 0x64, 0x69, 0x72, 0x4b, 0x65, 0x79, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61,
+	0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44,
+	0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63,
+	0x68, 0x52, 0x06, 0x64, 0x69, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x46, 0x0a, 0x0b, 0x70, 0x75, 0x73,
+	0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24,
+	0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e,
+	0x64, 0x6c, 0x65, 0x72, 0x52, 0x0b, 0x70, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65,
+	0x72, 0x1a, 0x38, 0x0a, 0x0e, 0x45, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75, 0x74,
+	0x74, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
+	0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x1a, 0x58, 0x0a, 0x0f, 0x44,
+	0x72, 0x69, 0x76, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10,
+	0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76, 0x61, 0x6c,
+	0x12, 0x23, 0x0a, 0x02, 0x64, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x13, 0x2e, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x54, 0x79, 0x70,
+	0x65, 0x52, 0x02, 0x64, 0x74, 0x1a, 0x36, 0x0a, 0x12, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76,
-	0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x12, 0x23, 0x0a,
-	0x02, 0x64, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x13, 0x2e, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x52, 0x02,
-	0x64, 0x74, 0x1a, 0x36, 0x0a, 0x12, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4b,
-	0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x1a, 0x2f, 0x0a, 0x0b, 0x50, 0x75,
-	0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x2a, 0x37, 0x0a, 0x0b, 0x53,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x6e,
-	0x79, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x78, 0x6c, 0x65, 0x10, 0x01, 0x12, 0x09, 0x0a,
-	0x05, 0x4c, 0x6f, 0x67, 0x69, 0x63, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x68, 0x79, 0x73,
-	0x69, 0x63, 0x10, 0x03, 0x42, 0x67, 0x0a, 0x25, 0x63, 0x6c, 0x75, 0x62, 0x2e, 0x6a, 0x6f, 0x79,
-	0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x62, 0x6a, 0x72, 0x74, 0x73, 0x73, 0x2e, 0x61, 0x74, 0x73, 0x2e,
-	0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x42, 0x10, 0x44,
-	0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x5a,
-	0x2c, 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x63, 0x6c, 0x75, 0x62, 0x2f, 0x62, 0x6a,
-	0x2d, 0x72, 0x74, 0x73, 0x74, 0x73, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x64, 0x74,
-	0x6f, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x1a, 0x2f, 0x0a,
+	0x0b, 0x50, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x2a, 0x37,
+	0x0a, 0x0b, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a,
+	0x03, 0x41, 0x6e, 0x79, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x78, 0x6c, 0x65, 0x10, 0x01,
+	0x12, 0x09, 0x0a, 0x05, 0x4c, 0x6f, 0x67, 0x69, 0x63, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x50,
+	0x68, 0x79, 0x73, 0x69, 0x63, 0x10, 0x03, 0x42, 0x67, 0x0a, 0x25, 0x63, 0x6c, 0x75, 0x62, 0x2e,
+	0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x62, 0x6a, 0x72, 0x74, 0x73, 0x73, 0x2e, 0x61,
+	0x74, 0x73, 0x2e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
+	0x42, 0x10, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x5a, 0x2c, 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x63, 0x6c, 0x75, 0x62,
+	0x2f, 0x62, 0x6a, 0x2d, 0x72, 0x74, 0x73, 0x74, 0x73, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x2f, 0x64, 0x74, 0x6f, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -5174,7 +5321,7 @@ func file_device_state_proto_rawDescGZIP() []byte {
 }
 
 var file_device_state_proto_enumTypes = make([]protoimpl.EnumInfo, 6)
-var file_device_state_proto_msgTypes = make([]protoimpl.MessageInfo, 39)
+var file_device_state_proto_msgTypes = make([]protoimpl.MessageInfo, 40)
 var file_device_state_proto_goTypes = []interface{}{
 	(SectionType)(0),                             // 0: state.SectionType
 	(Signal_Aspect)(0),                           // 1: state.Signal.Aspect
@@ -5208,43 +5355,45 @@ var file_device_state_proto_goTypes = []interface{}{
 	(*BaliseState)(nil),                          // 29: state.BaliseState
 	(*StationQc)(nil),                            // 30: state.StationQc
 	(*CkmState)(nil),                             // 31: state.CkmState
-	(*VariationStatus)(nil),                      // 32: state.VariationStatus
-	(*AllDevicesStatus)(nil),                     // 33: state.AllDevicesStatus
-	(*PushedDevicesStatus)(nil),                  // 34: state.PushedDevicesStatus
-	(*SimulationStatus)(nil),                     // 35: state.SimulationStatus
-	(*SimulationThirdPartyApiService)(nil),       // 36: state.SimulationThirdPartyApiService
-	(*SimulationThirdPartyApiServiceState)(nil),  // 37: state.SimulationThirdPartyApiServiceState
-	(*TrainControlState)(nil),                    // 38: state.TrainControlState
-	nil,                                          // 39: state.SignalState.RelayStateMapEntry
-	(*StationQc_State)(nil),                      // 40: state.StationQc.State
-	(*TrainControlState_EmergentButton)(nil),     // 41: state.TrainControlState.EmergentButton
-	(*TrainControlState_DriverKeySwitch)(nil),    // 42: state.TrainControlState.DriverKeySwitch
-	(*TrainControlState_DirectionKeySwitch)(nil), // 43: state.TrainControlState.DirectionKeySwitch
-	(*TrainControlState_PushHandler)(nil),        // 44: state.TrainControlState.PushHandler
-	(*request_proto.PointsParam)(nil),            // 45: request.PointsParam
-	(*request_proto.SignalParam)(nil),            // 46: request.SignalParam
-	(*common_proto.TrainDynamicConfig)(nil),      // 47: common.TrainDynamicConfig
-	(*common_proto.TrainEndsState)(nil),          // 48: common.TrainEndsState
-	(*request_proto.PsdParam)(nil),               // 49: request.PsdParam
-	(*data_proto.KilometerSystem)(nil),           // 50: graphicData.KilometerSystem
-	(*request_proto.CkmParam)(nil),               // 51: request.CkmParam
-	(request_proto.DriverType)(0),                // 52: request.DriverType
+	(*XcjState)(nil),                             // 32: state.XcjState
+	(*VariationStatus)(nil),                      // 33: state.VariationStatus
+	(*AllDevicesStatus)(nil),                     // 34: state.AllDevicesStatus
+	(*PushedDevicesStatus)(nil),                  // 35: state.PushedDevicesStatus
+	(*SimulationStatus)(nil),                     // 36: state.SimulationStatus
+	(*SimulationThirdPartyApiService)(nil),       // 37: state.SimulationThirdPartyApiService
+	(*SimulationThirdPartyApiServiceState)(nil),  // 38: state.SimulationThirdPartyApiServiceState
+	(*TrainControlState)(nil),                    // 39: state.TrainControlState
+	nil,                                          // 40: state.SignalState.RelayStateMapEntry
+	(*StationQc_State)(nil),                      // 41: state.StationQc.State
+	(*TrainControlState_EmergentButton)(nil),     // 42: state.TrainControlState.EmergentButton
+	(*TrainControlState_DriverKeySwitch)(nil),    // 43: state.TrainControlState.DriverKeySwitch
+	(*TrainControlState_DirectionKeySwitch)(nil), // 44: state.TrainControlState.DirectionKeySwitch
+	(*TrainControlState_PushHandler)(nil),        // 45: state.TrainControlState.PushHandler
+	(*request_proto.PointsParam)(nil),            // 46: request.PointsParam
+	(*request_proto.SignalParam)(nil),            // 47: request.SignalParam
+	(*common_proto.TrainDynamicConfig)(nil),      // 48: common.TrainDynamicConfig
+	(*common_proto.TrainEndsState)(nil),          // 49: common.TrainEndsState
+	(*request_proto.PsdParam)(nil),               // 50: request.PsdParam
+	(*data_proto.KilometerSystem)(nil),           // 51: graphicData.KilometerSystem
+	(*request_proto.CkmParam)(nil),               // 52: request.CkmParam
+	(*request_proto.XcjParam)(nil),               // 53: request.XcjParam
+	(request_proto.DriverType)(0),                // 54: request.DriverType
 }
 var file_device_state_proto_depIdxs = []int32{
-	45, // 0: state.SwitchState.param:type_name -> request.PointsParam
+	46, // 0: state.SwitchState.param:type_name -> request.PointsParam
 	1,  // 1: state.SignalState.aspect:type_name -> state.Signal.Aspect
-	46, // 2: state.SignalState.param:type_name -> request.SignalParam
-	39, // 3: state.SignalState.relayStateMap:type_name -> state.SignalState.RelayStateMapEntry
+	47, // 2: state.SignalState.param:type_name -> request.SignalParam
+	40, // 3: state.SignalState.relayStateMap:type_name -> state.SignalState.RelayStateMapEntry
 	21, // 4: state.PlatformState.spksState:type_name -> state.ReplyState
 	28, // 5: state.PlatformState.mkxJState:type_name -> state.MkxJState
 	2,  // 6: state.TrainConnState.connType:type_name -> state.TrainConnState.TrainConnType
 	15, // 7: state.TrainState.dynamicState:type_name -> state.TrainDynamicState
 	16, // 8: state.TrainState.vobcState:type_name -> state.TrainVobcState
-	47, // 9: state.TrainState.trainDynamicConfig:type_name -> common.TrainDynamicConfig
-	48, // 10: state.TrainState.trainEndsA:type_name -> common.TrainEndsState
-	48, // 11: state.TrainState.trainEndsB:type_name -> common.TrainEndsState
+	48, // 9: state.TrainState.trainDynamicConfig:type_name -> common.TrainDynamicConfig
+	49, // 10: state.TrainState.trainEndsA:type_name -> common.TrainEndsState
+	49, // 11: state.TrainState.trainEndsB:type_name -> common.TrainEndsState
 	18, // 12: state.TrainState.btmState:type_name -> state.BTMState
-	38, // 13: state.TrainState.tcc:type_name -> state.TrainControlState
+	39, // 13: state.TrainState.tcc:type_name -> state.TrainControlState
 	13, // 14: state.TrainState.connState:type_name -> state.TrainConnState
 	19, // 15: state.TrainMapState.trainDynamicConfig:type_name -> state.TrainDynamicConfigMqtt
 	20, // 16: state.TrainMapState.trainEndsA:type_name -> state.TrainEndsStateMqtt
@@ -5252,47 +5401,49 @@ var file_device_state_proto_depIdxs = []int32{
 	18, // 18: state.TrainMapState.btmState:type_name -> state.BTMState
 	13, // 19: state.TrainMapState.connState:type_name -> state.TrainConnState
 	26, // 20: state.PsdState.asdStates:type_name -> state.AsdState
-	49, // 21: state.PsdState.param:type_name -> request.PsdParam
+	50, // 21: state.PsdState.param:type_name -> request.PsdParam
 	21, // 22: state.MkxJState.replyState:type_name -> state.ReplyState
-	50, // 23: state.BaliseState.km:type_name -> graphicData.KilometerSystem
-	40, // 24: state.StationQc.qdStates:type_name -> state.StationQc.State
-	40, // 25: state.StationQc.cjStates:type_name -> state.StationQc.State
-	51, // 26: state.CkmState.param:type_name -> request.CkmParam
-	17, // 27: state.VariationStatus.updatedTrain:type_name -> state.TrainMapState
-	8,  // 28: state.VariationStatus.updatedSwitch:type_name -> state.SwitchState
-	7,  // 29: state.VariationStatus.updatedSection:type_name -> state.SectionState
-	21, // 30: state.VariationStatus.updatedReply:type_name -> state.ReplyState
-	17, // 31: state.AllDevicesStatus.trainState:type_name -> state.TrainMapState
-	8,  // 32: state.AllDevicesStatus.switchState:type_name -> state.SwitchState
-	7,  // 33: state.AllDevicesStatus.sectionState:type_name -> state.SectionState
-	21, // 34: state.AllDevicesStatus.replyState:type_name -> state.ReplyState
-	9,  // 35: state.AllDevicesStatus.signalState:type_name -> state.SignalState
-	22, // 36: state.AllDevicesStatus.buttonState:type_name -> state.ButtonState
-	23, // 37: state.AllDevicesStatus.AlarmState:type_name -> state.AlarmState
-	24, // 38: state.AllDevicesStatus.LightState:type_name -> state.LightState
-	25, // 39: state.AllDevicesStatus.psdState:type_name -> state.PsdState
-	27, // 40: state.AllDevicesStatus.KeyState:type_name -> state.KeyState
-	11, // 41: state.AllDevicesStatus.platformState:type_name -> state.PlatformState
-	29, // 42: state.AllDevicesStatus.baliseState:type_name -> state.BaliseState
-	30, // 43: state.AllDevicesStatus.stationQc:type_name -> state.StationQc
-	31, // 44: state.AllDevicesStatus.ckmStates:type_name -> state.CkmState
-	31, // 45: state.AllDevicesStatus.fymStates:type_name -> state.CkmState
-	32, // 46: state.PushedDevicesStatus.varStatus:type_name -> state.VariationStatus
-	33, // 47: state.PushedDevicesStatus.allStatus:type_name -> state.AllDevicesStatus
-	3,  // 48: state.SimulationStatus.state:type_name -> state.SimulationStatus.SimulationState
-	37, // 49: state.SimulationThirdPartyApiService.states:type_name -> state.SimulationThirdPartyApiServiceState
-	4,  // 50: state.SimulationThirdPartyApiServiceState.type:type_name -> state.SimulationThirdPartyApiService.Type
-	5,  // 51: state.SimulationThirdPartyApiServiceState.state:type_name -> state.SimulationThirdPartyApiService.State
-	41, // 52: state.TrainControlState.ebutton:type_name -> state.TrainControlState.EmergentButton
-	42, // 53: state.TrainControlState.driverKey:type_name -> state.TrainControlState.DriverKeySwitch
-	43, // 54: state.TrainControlState.dirKey:type_name -> state.TrainControlState.DirectionKeySwitch
-	44, // 55: state.TrainControlState.pushHandler:type_name -> state.TrainControlState.PushHandler
-	52, // 56: state.TrainControlState.DriverKeySwitch.dt:type_name -> request.DriverType
-	57, // [57:57] is the sub-list for method output_type
-	57, // [57:57] is the sub-list for method input_type
-	57, // [57:57] is the sub-list for extension type_name
-	57, // [57:57] is the sub-list for extension extendee
-	0,  // [0:57] is the sub-list for field type_name
+	51, // 23: state.BaliseState.km:type_name -> graphicData.KilometerSystem
+	41, // 24: state.StationQc.qdStates:type_name -> state.StationQc.State
+	41, // 25: state.StationQc.cjStates:type_name -> state.StationQc.State
+	52, // 26: state.CkmState.param:type_name -> request.CkmParam
+	53, // 27: state.XcjState.param:type_name -> request.XcjParam
+	17, // 28: state.VariationStatus.updatedTrain:type_name -> state.TrainMapState
+	8,  // 29: state.VariationStatus.updatedSwitch:type_name -> state.SwitchState
+	7,  // 30: state.VariationStatus.updatedSection:type_name -> state.SectionState
+	21, // 31: state.VariationStatus.updatedReply:type_name -> state.ReplyState
+	17, // 32: state.AllDevicesStatus.trainState:type_name -> state.TrainMapState
+	8,  // 33: state.AllDevicesStatus.switchState:type_name -> state.SwitchState
+	7,  // 34: state.AllDevicesStatus.sectionState:type_name -> state.SectionState
+	21, // 35: state.AllDevicesStatus.replyState:type_name -> state.ReplyState
+	9,  // 36: state.AllDevicesStatus.signalState:type_name -> state.SignalState
+	22, // 37: state.AllDevicesStatus.buttonState:type_name -> state.ButtonState
+	23, // 38: state.AllDevicesStatus.AlarmState:type_name -> state.AlarmState
+	24, // 39: state.AllDevicesStatus.LightState:type_name -> state.LightState
+	25, // 40: state.AllDevicesStatus.psdState:type_name -> state.PsdState
+	27, // 41: state.AllDevicesStatus.KeyState:type_name -> state.KeyState
+	11, // 42: state.AllDevicesStatus.platformState:type_name -> state.PlatformState
+	29, // 43: state.AllDevicesStatus.baliseState:type_name -> state.BaliseState
+	30, // 44: state.AllDevicesStatus.stationQc:type_name -> state.StationQc
+	31, // 45: state.AllDevicesStatus.ckmStates:type_name -> state.CkmState
+	31, // 46: state.AllDevicesStatus.fymStates:type_name -> state.CkmState
+	32, // 47: state.AllDevicesStatus.xcjStates:type_name -> state.XcjState
+	33, // 48: state.PushedDevicesStatus.varStatus:type_name -> state.VariationStatus
+	34, // 49: state.PushedDevicesStatus.allStatus:type_name -> state.AllDevicesStatus
+	3,  // 50: state.SimulationStatus.state:type_name -> state.SimulationStatus.SimulationState
+	38, // 51: state.SimulationThirdPartyApiService.states:type_name -> state.SimulationThirdPartyApiServiceState
+	4,  // 52: state.SimulationThirdPartyApiServiceState.type:type_name -> state.SimulationThirdPartyApiService.Type
+	5,  // 53: state.SimulationThirdPartyApiServiceState.state:type_name -> state.SimulationThirdPartyApiService.State
+	42, // 54: state.TrainControlState.ebutton:type_name -> state.TrainControlState.EmergentButton
+	43, // 55: state.TrainControlState.driverKey:type_name -> state.TrainControlState.DriverKeySwitch
+	44, // 56: state.TrainControlState.dirKey:type_name -> state.TrainControlState.DirectionKeySwitch
+	45, // 57: state.TrainControlState.pushHandler:type_name -> state.TrainControlState.PushHandler
+	54, // 58: state.TrainControlState.DriverKeySwitch.dt:type_name -> request.DriverType
+	59, // [59:59] is the sub-list for method output_type
+	59, // [59:59] is the sub-list for method input_type
+	59, // [59:59] is the sub-list for extension type_name
+	59, // [59:59] is the sub-list for extension extendee
+	0,  // [0:59] is the sub-list for field type_name
 }
 
 func init() { file_device_state_proto_init() }
@@ -5614,7 +5765,7 @@ func file_device_state_proto_init() {
 			}
 		}
 		file_device_state_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VariationStatus); i {
+			switch v := v.(*XcjState); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -5626,7 +5777,7 @@ func file_device_state_proto_init() {
 			}
 		}
 		file_device_state_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AllDevicesStatus); i {
+			switch v := v.(*VariationStatus); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -5638,7 +5789,7 @@ func file_device_state_proto_init() {
 			}
 		}
 		file_device_state_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PushedDevicesStatus); i {
+			switch v := v.(*AllDevicesStatus); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -5650,7 +5801,7 @@ func file_device_state_proto_init() {
 			}
 		}
 		file_device_state_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SimulationStatus); i {
+			switch v := v.(*PushedDevicesStatus); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -5662,7 +5813,7 @@ func file_device_state_proto_init() {
 			}
 		}
 		file_device_state_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SimulationThirdPartyApiService); i {
+			switch v := v.(*SimulationStatus); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -5674,7 +5825,7 @@ func file_device_state_proto_init() {
 			}
 		}
 		file_device_state_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SimulationThirdPartyApiServiceState); i {
+			switch v := v.(*SimulationThirdPartyApiService); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -5686,6 +5837,18 @@ func file_device_state_proto_init() {
 			}
 		}
 		file_device_state_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SimulationThirdPartyApiServiceState); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_device_state_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TrainControlState); i {
 			case 0:
 				return &v.state
@@ -5697,7 +5860,7 @@ func file_device_state_proto_init() {
 				return nil
 			}
 		}
-		file_device_state_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+		file_device_state_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*StationQc_State); i {
 			case 0:
 				return &v.state
@@ -5709,7 +5872,7 @@ func file_device_state_proto_init() {
 				return nil
 			}
 		}
-		file_device_state_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+		file_device_state_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TrainControlState_EmergentButton); i {
 			case 0:
 				return &v.state
@@ -5721,7 +5884,7 @@ func file_device_state_proto_init() {
 				return nil
 			}
 		}
-		file_device_state_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+		file_device_state_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TrainControlState_DriverKeySwitch); i {
 			case 0:
 				return &v.state
@@ -5733,7 +5896,7 @@ func file_device_state_proto_init() {
 				return nil
 			}
 		}
-		file_device_state_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+		file_device_state_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TrainControlState_DirectionKeySwitch); i {
 			case 0:
 				return &v.state
@@ -5745,7 +5908,7 @@ func file_device_state_proto_init() {
 				return nil
 			}
 		}
-		file_device_state_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+		file_device_state_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TrainControlState_PushHandler); i {
 			case 0:
 				return &v.state
@@ -5764,7 +5927,7 @@ func file_device_state_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_device_state_proto_rawDesc,
 			NumEnums:      6,
-			NumMessages:   39,
+			NumMessages:   40,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/message_server/sfp_ms.go b/message_server/sfp_ms.go
index 0ae02c8..a80a371 100644
--- a/message_server/sfp_ms.go
+++ b/message_server/sfp_ms.go
@@ -67,6 +67,10 @@ func NewSfpMs(vs *memory.VerifySimulation, mapId int32) ms_api.MsgTask {
 		if err != nil {
 			return err
 		}
+		xcjStates, err := collectXcjStates(vs.World, mapId)
+		if err != nil {
+			return err
+		}
 		ststes := &state_proto.PushedDevicesStatus{
 			All: true,
 			AllStatus: &state_proto.AllDevicesStatus{
@@ -80,6 +84,7 @@ func NewSfpMs(vs *memory.VerifySimulation, mapId int32) ms_api.MsgTask {
 				BaliseState:   baliseStates,
 				CkmStates:     ckmStates,
 				FymStates:     fymStates,
+				XcjStates:     xcjStates,
 			},
 		}
 		err = mqtt.GetMsgClient().PubSfpState(vs.SimulationId, mapId, ststes)
@@ -90,6 +95,43 @@ func NewSfpMs(vs *memory.VerifySimulation, mapId int32) ms_api.MsgTask {
 	}, 1000*time.Millisecond)
 }
 
+func collectXcjStates(world ecs.World, mapId int32) ([]*state_proto.XcjState, error) {
+	uidStructure := memory.QueryUidStructure[*memory.StationUidStructure](mapId)
+	var xcjStates []*state_proto.XcjState
+	for _, xcj := range uidStructure.XcjIds {
+		entry, ok := entity.GetEntityByUid(world, xcj.Uid)
+		if ok {
+			state := &state_proto.XcjState{Id: xcj.CommonId}
+			xcjStates = append(xcjStates, state)
+			//设置参数
+			var xcjParam *request_proto.XcjParam
+			if entry.HasComponent(appcomponent.XcjParamType) {
+				xcjParam = appcomponent.XcjParamType.Get(entry)
+			} else {
+				xcjParam = &request_proto.XcjParam{}
+			}
+			state.Param = xcjParam
+			//继电器状态
+			if entry.HasComponent(component.XcjCircuitType) {
+				circuit := component.XcjCircuitType.Get(entry)
+				state.Xqj = component.BitStateType.Get(circuit.XQJ).Val
+				for _, twj := range circuit.TWJList {
+					state.TwjList = append(state.TwjList, component.BitStateType.Get(twj).Val)
+				}
+				state.Tgqj = component.BitStateType.Get(circuit.TGQJ).Val
+				state.Xcjxj = component.BitStateType.Get(circuit.XCJXJ).Val
+				state.Xcyxj = component.BitStateType.Get(circuit.XCYXJ).Val
+				for _, cfj := range circuit.CFJList {
+					state.CfjList = append(state.CfjList, component.BitStateType.Get(cfj).Val)
+				}
+				state.Jtj = component.BitStateType.Get(circuit.JTJ).Val
+				state.Tgyxj = component.BitStateType.Get(circuit.TGYXJ).Val
+			}
+		}
+	}
+	return xcjStates, nil
+}
+
 func collectFymStates(world ecs.World, mapId int32) ([]*state_proto.CkmState, error) {
 	mapData := memory.QueryGiData[*data_proto.RtssGraphicStorage](mapId)
 	return collectCkmOrFymStates(world, mapId, mapData.FloodGates)
diff --git a/rts-sim-module b/rts-sim-module
index cf942ab..4371dad 160000
--- a/rts-sim-module
+++ b/rts-sim-module
@@ -1 +1 @@
-Subproject commit cf942ab3182e5d31030850929e1fc130350edf85
+Subproject commit 4371dad391e895abcbe7a13fdcd60f74bd5c5677
diff --git a/rts-sim-testing-message b/rts-sim-testing-message
index 3c209fc..78f0ddf 160000
--- a/rts-sim-testing-message
+++ b/rts-sim-testing-message
@@ -1 +1 @@
-Subproject commit 3c209fc66ee14dfcca3f3ad18ce37d0096e4a73b
+Subproject commit 78f0ddfd2413bdac81d33ea2b199edaa4de9e6fb
diff --git a/ts/simulation/app_component/component.go b/ts/simulation/app_component/component.go
index f903828..3c74002 100644
--- a/ts/simulation/app_component/component.go
+++ b/ts/simulation/app_component/component.go
@@ -11,5 +11,6 @@ var (
 	SectionParamType  = ecs.NewComponentType[request_proto.SectionParam]()
 	PsdParamType      = ecs.NewComponentType[request_proto.PsdParam]()
 	CkmParamType      = ecs.NewComponentType[request_proto.CkmParam]()
+	XcjParamType      = ecs.NewComponentType[request_proto.XcjParam]()
 	RelayStateLossTag = ecs.NewTag() //继电器状态丢失
 )
diff --git a/ts/simulation/wayside/memory/wayside_memory_map_init.go b/ts/simulation/wayside/memory/wayside_memory_map_init.go
index 9797218..6b31dc9 100644
--- a/ts/simulation/wayside/memory/wayside_memory_map_init.go
+++ b/ts/simulation/wayside/memory/wayside_memory_map_init.go
@@ -45,6 +45,7 @@ type StationUidStructure struct {
 	SpksSwitchIds      map[uint32]*elementIdStructure
 	IbpIds             map[uint32]*elementIdStructure
 	CkmIds             map[uint32]*elementIdStructure
+	XcjIds             map[uint32]*elementIdStructure
 }
 
 type RelayUidStructure struct {
@@ -254,6 +255,7 @@ func initStationUid(data *data_proto.RtssGraphicStorage) *StationUidStructure {
 		//SpksSwitchIds:      make(map[uint32]*elementIdStructure, len(data.SpksSwitchs)),
 		IbpIds: make(map[uint32]*elementIdStructure, len(data.IbpBoxs)),
 		CkmIds: make(map[uint32]*elementIdStructure, len(data.GarageDoors)),
+		XcjIds: make(map[uint32]*elementIdStructure, len(data.CarWashings)),
 	}
 	city, lineId, _ := getUIdPrefix(data.UniqueIdPrefix)
 	// 处理车站信息
@@ -415,27 +417,15 @@ func initStationUid(data *data_proto.RtssGraphicStorage) *StationUidStructure {
 	for _, gate := range data.FloodGates {
 		fillCkmInfo(gate, gus, city, lineId)
 	}
-
-	//// SPKS人员防护
-	//for _, spk := range data.SpksSwitchs {
-	//	if spk.RefStand == 0 {
-	//		continue
-	//	}
-	//	platform := platformMap[spk.RefStand]
-	//	if platform == nil {
-	//		continue
-	//	}
-	//	station := gus.StationIds[platform.RefStationId]
-	//	if station == nil {
-	//		continue
-	//	}
-	//	eid := GetMapElementId(spk.Common)
-	//	gus.SpksSwitchIds[eid] = &elementIdStructure{
-	//		CommonId: eid,
-	//		Code:     spk.Code,
-	//		Uid:      station.Uid + "_key_SPKS_" + spk.Code,
-	//	}
-	//}
+	// 洗车机
+	for _, xcj := range data.CarWashings {
+		eid := GetMapElementId(xcj.Common)
+		gus.XcjIds[eid] = &elementIdStructure{
+			CommonId: eid,
+			Code:     xcj.Code,
+			Uid:      GenerateElementUid(city, lineId, nil, xcj.Code),
+		}
+	}
 	return gus
 }
 
@@ -673,6 +663,8 @@ func getUidMapByType(uidData any, m interface{}) map[uint32]*elementIdStructure
 		return (uidData.(*StationUidStructure)).IbpIds
 	case *data_proto.GarageDoor:
 		return (uidData.(*StationUidStructure)).CkmIds
+	case *data_proto.CarWashing:
+		return (uidData.(*StationUidStructure)).XcjIds
 	default:
 		panic(&dto.ErrorDto{Code: dto.ArgumentParseError, Message: "类型未映射字段"})
 	}
diff --git a/ts/simulation/wayside/memory/wayside_memory_xcj.go b/ts/simulation/wayside/memory/wayside_memory_xcj.go
new file mode 100644
index 0000000..4b34b01
--- /dev/null
+++ b/ts/simulation/wayside/memory/wayside_memory_xcj.go
@@ -0,0 +1,47 @@
+package memory
+
+import (
+	"fmt"
+	"joylink.club/bj-rtsts-server/dto/data_proto"
+	"joylink.club/bj-rtsts-server/dto/request_proto"
+	"joylink.club/bj-rtsts-server/sys_error"
+	appcomponent "joylink.club/bj-rtsts-server/ts/simulation/app_component"
+	"joylink.club/ecs"
+	"joylink.club/rtsssimulation/component"
+	"joylink.club/rtsssimulation/entity"
+	"unsafe"
+)
+
+func XcjOperation(simulation *VerifySimulation, req *request_proto.XcjOperationReq) *sys_error.BusinessError {
+	switch req.Operation {
+	case request_proto.Xcj_SetParams:
+		return setXcjParam(simulation, req)
+	default:
+		panic(fmt.Sprintf("未知的屏蔽门操作:%s", req.Operation))
+	}
+	return nil
+}
+
+func setXcjParam(simulation *VerifySimulation, req *request_proto.XcjOperationReq) *sys_error.BusinessError {
+	uid := QueryUidByMidAndComId(req.MapId, req.DeviceId, &data_proto.CarWashing{})
+	result := <-ecs.Request[ecs.EmptyType](simulation.World, func() ecs.Result[ecs.EmptyType] {
+		wd := entity.GetWorldData(simulation.World)
+		entry, ok := wd.EntityMap[uid]
+		if ok {
+			entry.AddComponent(appcomponent.XcjParamType, unsafe.Pointer(req.Param))
+			if req.Param.Fault == request_proto.Xcj_FA_Fault {
+				entry.AddComponent(component.XcjFaultTag)
+			} else {
+				entry.RemoveComponent(component.XcjFaultTag)
+			}
+		} else {
+			return ecs.NewErrResult(fmt.Errorf("未找到id=%s的实体", uid))
+		}
+		return ecs.NewOkEmptyResult()
+	})
+	if result.Err != nil {
+		return sys_error.New("洗车机设置参数失败", result.Err)
+	} else {
+		return nil
+	}
+}
diff --git a/ts/simulation/wayside/memory/wayside_simulation.go b/ts/simulation/wayside/memory/wayside_simulation.go
index c96d277..2489dd2 100644
--- a/ts/simulation/wayside/memory/wayside_simulation.go
+++ b/ts/simulation/wayside/memory/wayside_simulation.go
@@ -708,6 +708,10 @@ func buildAndRelateElectronicComponent(repo *proto.Repository, relayGi *data_pro
 	for _, ckm := range repo.Ckms {
 		ckmMap[ckm.Id] = ckm
 	}
+	xcjMap := make(map[string]*proto.Xcj)
+	for _, xcj := range repo.Xcjs {
+		xcjMap[xcj.Id] = xcj
+	}
 	ciecs := stationMap[stationUid] //联锁集中站
 	if ciecs == nil {
 		panic(fmt.Errorf("联锁集中站[%s]不存在", stationUid))
@@ -838,6 +842,27 @@ func buildAndRelateElectronicComponent(repo *proto.Repository, relayGi *data_pro
 						})
 				}
 			}
+		case data_proto.RelatedRef_CarWashing:
+			{
+				xcj, ok := xcjMap[GenerateElementUid(city, lineId, nil, relationship.Code)]
+				if !ok {
+					continue
+				}
+				for _, group := range relationship.Combinationtypes {
+					var componentIds []string
+					for _, relayId := range group.RefRelays {
+						if relayUidStructure.RelayIds[relayId] == nil {
+							continue
+						}
+						componentIds = append(componentIds, relayUidStructure.RelayIds[relayId].Uid)
+					}
+					xcj.ElectronicComponentGroups = append(xcj.ElectronicComponentGroups,
+						&proto.ElectronicComponentGroup{
+							Code:         group.Code,
+							ComponentIds: componentIds,
+						})
+				}
+			}
 		}
 	}
 	//门控箱
@@ -1330,6 +1355,14 @@ func fillProtoRepository(repo *proto.Repository, storage *data_proto.RtssGraphic
 	fillCkmOrFym(repo, storage.GarageDoors, uidsMap)
 	//防淹门和防淹门PSL
 	fillCkmOrFym(repo, storage.FloodGates, uidsMap)
+	//洗车机
+	for _, data := range storage.CarWashings {
+		xcj := &proto.Xcj{
+			Id:          uidsMap.XcjIds[data.Common.Id].Uid,
+			NumSegments: data.DuanNum,
+		}
+		repo.Xcjs = append(repo.Xcjs, xcj)
+	}
 }
 
 func fillCkmOrFym(repo *proto.Repository, doors []*data_proto.GarageDoor, uidsMap *StationUidStructure) {