Browse Source

module_call

daiyueteng 6 years ago
parent
commit
17aeec9346
2 changed files with 6 additions and 8 deletions
  1. 5 6
      module_service/module_call.cpp
  2. 1 2
      module_service/module_call.h

+ 5 - 6
module_service/module_call.cpp

@@ -9,8 +9,7 @@
 
 #include <area.h>
 #include <site_area.h>
-
-
+#include"mine.h"
 
 
 void module_call::run()
@@ -24,7 +23,7 @@ void module_call::run()
         return ;
     }
     //转发给web
-    tool_other::send_json(JSON_CMD_VALUE_PUSH, to_call_card_list_json(arr));
+    swsClientMgr.send(JSON_CMD_VALUE_PUSH, to_call_card_list_json(arr));
 
     //将呼叫命令发送给标识卡终端
     call_site_map site_map;
@@ -185,7 +184,7 @@ void module_call::response_accept_call(std::vector<call_card_ptr> cards)
     doc.AddMember(JSON_ROOT_KEY_VERSION, INTERFACE_VERSION, allocator);
     doc.AddMember(JSON_ROOT_KEY_DATA, node_cards, allocator);
 
-    tool_other::send_json(JSON_CMD_VALUE_PUSH, tool_json::doc_to_json(doc));
+    swsClientMgr.send(JSON_CMD_VALUE_PUSH, tool_json::doc_to_json(doc));
 }
 
 
@@ -345,7 +344,7 @@ void module_call::response_accept_cancel(const call_user_ptr user_ptr)
     doc.AddMember(JSON_ROOT_KEY_DATA, node_data, allocator);
 
     //转发给web
-    tool_other::send_json(JSON_CMD_VALUE_PUSH, tool_json::doc_to_json(doc));
+    swsClientMgr.send(JSON_CMD_VALUE_PUSH, tool_json::doc_to_json(doc));
 }
 
 /*
@@ -628,4 +627,4 @@ void module_call::system_cancel_call_apoint(int card_id,int card_type)
     }
 
     response_accept_cancel(result_user_ptr);
-}
+}

+ 1 - 2
module_service/module_call.h

@@ -16,9 +16,8 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <atomic>
 #include "rapidjson/prettywriter.h"
-#include"module_const.h"
+#include"module_singleton_base.h"
 #include"module_web.h"
-#include"ant.h"
 
 /**
  * @brief 呼叫类型 全员 定员