add tag and key
This commit is contained in:
@@ -125,6 +125,10 @@ std::string TOPIC_RTDATA = "";
|
||||
std::string G_ROCKETMQ_TAG = "";//tag
|
||||
std::string G_ROCKETMQ_KEY = "";//key
|
||||
|
||||
//实时数据tagkey
|
||||
std::string G_RT_TAG = "";//tag
|
||||
std::string G_RT_KEY = "";//key
|
||||
|
||||
//生产者
|
||||
std::string G_ROCKETMQ_PRODUCER = ""; //rocketmq producer
|
||||
std::string G_MQPRODUCER_IPPORT = ""; //rocketmq ip+port
|
||||
@@ -272,6 +276,10 @@ void loadConfig(const std::string& filename) {
|
||||
strMap["Queue.QUEUE_TAG"] = &G_ROCKETMQ_TAG;
|
||||
strMap["Queue.QUEUE_KEY"] = &G_ROCKETMQ_KEY;
|
||||
|
||||
//添加rt的tagkey
|
||||
strMap["Queue.RT_TAG"] = &G_RT_TAG;
|
||||
strMap["Queue.RT_KEY"] = &G_RT_KEY;
|
||||
|
||||
// [RocketMq] —— 生产者
|
||||
strMap["RocketMq.producer"] = &G_ROCKETMQ_PRODUCER;
|
||||
strMap["RocketMq.Ipport"] = &G_MQPRODUCER_IPPORT;
|
||||
@@ -2922,6 +2930,8 @@ void upload_data_test(){
|
||||
data.strTopic = TOPIC_ALARM;
|
||||
data.strText = js;
|
||||
data.mp_id = "test";
|
||||
data.tag = G_ROCKETMQ_TAG_TEST;
|
||||
data.key = G_ROCKETMQ_KEY_TEST;
|
||||
std::lock_guard<std::mutex> lock(queue_data_list_mutex);
|
||||
queue_data_list.push_back(data);
|
||||
}
|
||||
@@ -3314,6 +3324,8 @@ bool send_file_list(const std::string &dev_id, const std::vector<tag_dir_info> &
|
||||
queue_data_t connect_info;
|
||||
connect_info.strTopic = Topic_Reply_Topic;
|
||||
connect_info.strText = j.dump(); // 序列化为字符串
|
||||
connect_info.tag = Topic_Reply_Tag;
|
||||
connect_info.key = Topic_Reply_Key;
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(queue_data_list_mutex);
|
||||
queue_data_list.push_back(std::move(connect_info));
|
||||
@@ -3707,6 +3719,8 @@ bool send_set_value_reply(const std::string &dev_id, unsigned char mp_index, con
|
||||
queue_data_t connect_info;
|
||||
connect_info.strTopic = Topic_Reply_Topic;
|
||||
connect_info.strText = j.dump(); // 序列化为字符串
|
||||
connect_info.tag = Topic_Reply_Tag;
|
||||
connect_info.key = Topic_Reply_Key;
|
||||
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(queue_data_list_mutex);
|
||||
@@ -3903,6 +3917,8 @@ bool send_internal_value_reply(const std::string &dev_id, const std::vector<DZ_k
|
||||
queue_data_t connect_info;
|
||||
connect_info.strTopic = Topic_Reply_Topic;
|
||||
connect_info.strText = j.dump(); // 序列化为字符串
|
||||
connect_info.tag = Topic_Reply_Tag;
|
||||
connect_info.key = Topic_Reply_Key;
|
||||
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(queue_data_list_mutex);
|
||||
@@ -3968,6 +3984,8 @@ void send_reply_to_kafka_recall(const std::string& guid, const std::string& step
|
||||
queue_data_t connect_info;
|
||||
connect_info.strTopic = Topic_Reply_Topic;
|
||||
connect_info.strText = jsonString;
|
||||
connect_info.tag = Topic_Reply_Tag;
|
||||
connect_info.key = Topic_Reply_Key;
|
||||
|
||||
// 加入发送队列(带互斥锁保护)
|
||||
queue_data_list_mutex.lock();
|
||||
|
||||
Reference in New Issue
Block a user