Prechádzať zdrojové kódy

20220110, dispatch status , time tool

huli 3 rokov pred
rodič
commit
5c195066f0

+ 2 - 2
dispatch/dispatch_manager.cpp

@@ -494,7 +494,7 @@ void Dispatch_manager::resource_allocation()
 					{
 						m_dispatch_plc.execute_for_dispatch_request_msg(*iter);
 						m_dispatch_request_pickup_list.erase(iter);
-						m_store_updata_time = std::chrono::system_clock::now();
+						m_pickup_updata_time = std::chrono::system_clock::now();
 					}
 					m_dispatch_motion_direction_next = Common_data::Dispatch_motion_direction::DISPATCH_MOTION_DIRECTION_STORE;
 				}
@@ -505,7 +505,7 @@ void Dispatch_manager::resource_allocation()
 					{
 						m_dispatch_plc.execute_for_dispatch_request_msg(*iter);
 						m_dispatch_request_store_list.erase(iter);
-						m_pickup_updata_time = std::chrono::system_clock::now();
+						m_store_updata_time = std::chrono::system_clock::now();
 					}
 					m_dispatch_motion_direction_next = Common_data::Dispatch_motion_direction::DISPATCH_MOTION_DIRECTION_PICKUP;
 				}

+ 8 - 9
message/dispatch_message.proto

@@ -25,21 +25,20 @@ enum Passageway_direction
 
 
 
-//
+//调度流程状态
 enum Dispatch_process_status
 {
     E_DISPATCH_POCESS_UNKNOW                = 0;     //未知
-    E_DISPATCH_POCESS_WAIT                  = 1;     //未知
-    E_DISPATCH_POCESS_WORKING               = 2;     //未知
-    E_DISPATCH_POCESS_OVER                  = 3;     //未知
+    E_DISPATCH_POCESS_WAIT                  = 1;     //等待
+    E_DISPATCH_POCESS_WORKING               = 2;     //工作
+    E_DISPATCH_POCESS_OVER                  = 3;     //完成
 
-    E_DISPATCH_POCESS_FAULT                 = 100;     //未知
+    E_DISPATCH_POCESS_FAULT                 = 100;     //故障
 }
 
-//
+//调度流程信息
 message Dispatch_process_information
 {
-
     optional string                     car_numberPlate=1;					    //车牌号
     optional string                     command_key=2;                          //指令唯一标识符id
     optional Dispatch_motion_direction  dispatch_motion_direction=3;            //调度方向, 停车取车
@@ -48,8 +47,8 @@ message Dispatch_process_information
     repeated Parkspace_info             parkspace_info_ex=6;                    //车位编号, 停车位(B方案, 分配3个停车位)
     optional Car_type                   car_type=7;                             //汽车大小
 
-    optional Dispatch_process_status    dispatch_process_status=8;              //
-    optional int32                      m_wait_number=9;                        //
+    optional Dispatch_process_status    dispatch_process_status=8;              //调度流程状态
+    optional int32                      m_wait_number=9;                        //只有等待才有等待编号
 }
 
 //调度模块终端出入口的状态