소스 검색

中控流程正常

zx 4 년 전
부모
커밋
e03eac210c
4개의 변경된 파일6개의 추가작업 그리고 11개의 파일을 삭제
  1. 2 4
      system/PickupProcessTask.cpp
  2. 1 1
      system/StoreProcessTask.cpp
  3. 2 5
      test/store_terminal.cpp
  4. 1 1
      tool/TaskQueue/ThreadTaskQueue.cpp

+ 2 - 4
system/PickupProcessTask.cpp

@@ -11,6 +11,7 @@
 #include "uniq_key.h"
 
 PickupProcessTask::PickupProcessTask(unsigned int terminal_id)
+        :m_publish_statu_thread(nullptr)
 {
     m_terminor_id=terminal_id;
 
@@ -153,10 +154,6 @@ Error_manager PickupProcessTask::search_space()
 void PickupProcessTask::Main()
 {
     Error_manager code;
-    usleep(1000*1000);
-    LOG(WARNING)<<"取车完成-----------------------------"<<m_car_info.license();
-
-    return ;
     //进入取车流程
     switch (0)
     {
@@ -172,6 +169,7 @@ void PickupProcessTask::Main()
             }
             //开始工作
             code=pickup_step();
+            usleep(1000*1000*(rand()%3));
             std::lock_guard<std::mutex> lock(m_picking_statu_lock);
             if(code!=SUCCESS)
             {

+ 1 - 1
system/StoreProcessTask.cpp

@@ -403,7 +403,7 @@ void StoreProcessTask::Main()
             }
             //开始调度
             code=dispatch_step();
-            usleep(1000*1000);
+            usleep(1000*1000*(rand()%3));
 
             std::lock_guard<std::mutex> lock(m_storing_statu_lock);
             if(code!=SUCCESS)

+ 2 - 5
test/store_terminal.cpp

@@ -65,8 +65,8 @@ Error_manager store_terminal::storing(message::Car_info& car_info)
     //等待停车完成
 
     bool last_signal=false;
-    while(m_exit_cond.wait_for_millisecond(50)==false) {
-
+    while(m_exit_cond.wait_for_millisecond(50)==false)
+    {
         message::Storing_process_statu_msg msg;
         code = Terminal_communication::get_instance_pointer()->get_storing_statu(car_info.license(), msg);
         if (code != SUCCESS) {
@@ -82,9 +82,6 @@ Error_manager store_terminal::storing(message::Car_info& car_info)
             last_signal=true;
         }
 
-
-
-
     }
     return FAILED;
 }

+ 1 - 1
tool/TaskQueue/ThreadTaskQueue.cpp

@@ -256,7 +256,7 @@ namespace tq{
             }
             _recyclerMutex.unlock();
         }
-        //禁止析构
+        //析构任务
         delete task;
 
     }