Browse Source

fix(grpc_bs):change proto file for fix server and client module embarrassed

孙嘉城 3 years ago
parent
commit
439afdfa4f

+ 13 - 5
src/driver/driver_cloud_grpc_client_BS/VehicleControl.proto

@@ -52,6 +52,7 @@ message ControlRequest {
 }
 }
 
 
 message Empty {
 message Empty {
+    string id = 1;
 }
 }
 
 
 message MapPoint{
 message MapPoint{
@@ -60,16 +61,23 @@ message MapPoint{
 }
 }
 
 
 //服务端发送站点信息到小车
 //服务端发送站点信息到小车
-message UploadMapRequest {
-    repeated MapPoint mapPoints = 1;
-}
+//message UploadMapRequest {
+//    repeated MapPoint mapPoints = 1;
+//}
 
 
 //小车发送路径所有的位置到服务端
 //小车发送路径所有的位置到服务端
+//message UploadMapReply {
+//    repeated MapPoint mapPoints = 1;
+//}
+
 message UploadMapReply {
 message UploadMapReply {
-    repeated MapPoint mapPoints = 1;
+    string id = 1;
+    bool isNeedMap = 2;
+    string patrolPathID = 3;
+    repeated MapPoint mapPoints = 4;
 }
 }
 
 
 message CtrlRequest {
 message CtrlRequest {
     string id = 1; // 车辆 SIM 码
     string id = 1; // 车辆 SIM 码
     CtrlMode modeCMD = 2; //mode change command
     CtrlMode modeCMD = 2; //mode change command
-}
+}

+ 3 - 3
src/driver/driver_cloud_grpc_client_BS/VehicleControl_service.proto

@@ -11,9 +11,9 @@ import "VehicleControl.proto";
 
 
 service VehicleControl {
 service VehicleControl {
   // 车辆远程控制
   // 车辆远程控制
-  rpc vehicleControl (ControlRequest) returns (Empty) {}
+  rpc vehicleControl (Empty) returns (ControlRequest) {}
   // 路径生成
   // 路径生成
-  rpc UploadMap(UploadMapRequest) returns(UploadMapReply) {}
+  rpc UploadMap(Empty) returns(UploadMapReply) {}
   // 控制模式改变
   // 控制模式改变
-  rpc changeCtrlMode(CtrlRequest) returns(Empty) {}
+  rpc changeCtrlMode(Empty) returns(CtrlRequest) {}
 }
 }

+ 12 - 2
src/driver/driver_cloud_grpc_client_BS/VehicleUpload.proto

@@ -84,11 +84,15 @@ enum CtrlMode{
     CMD_AUTO = 0;
     CMD_AUTO = 0;
     CMD_REMOTE = 1;
     CMD_REMOTE = 1;
     CMD_EMERGENCY_STOP = 2;
     CMD_EMERGENCY_STOP = 2;
-    CMD_CLOUD_PLATFORM = 3; // 云平台控制模式? merge into remote mode
+    CMD_CLOUD_PLATFORM = 3; // 云平台控制模式 merge into remote mode
+}
+
+message Empty {
+    string id = 1;
 }
 }
 
 
 message ResponseMessage{
 message ResponseMessage{
-  GPSPoint destinationPosition = 1; //in auto mode
+    GPSPoint destinationPosition = 1; //in auto mode
 }
 }
 
 
 message MapPoint{
 message MapPoint{
@@ -96,3 +100,9 @@ message MapPoint{
     GPSPoint mapPoint = 2;
     GPSPoint mapPoint = 2;
 }
 }
 
 
+message UploadPathRequest{
+    string id = 1; // 车辆 SIM 码
+    string patrolPathID = 2;
+    repeated MapPoint pathPoints = 3;
+}
+

+ 2 - 0
src/driver/driver_cloud_grpc_client_BS/VehicleUpload_service.proto

@@ -11,4 +11,6 @@ import "VehicleUpload.proto";
 
 
 service DataExchange {
 service DataExchange {
   rpc uploadVehicleOInfo (UplinkRequest) returns (ResponseMessage) {}
   rpc uploadVehicleOInfo (UplinkRequest) returns (ResponseMessage) {}
+  
+  rpc uploadPath (UploadPathRequest) returns (Empty) {}
 }
 }