feat 添加关联通道参数配置

AlgorithmModule/src/QX_Merge_Analysis.cpp

@@ -1184,6 +1184,8 @@ int QX_Merge_Analysis::Analysis_AD_Bind(ALL_Qx_DataList *pALLTypeqxList, int qx_
 	vector<string> second_channel_2s = pAd_checkParma->analysis_bind.second_channel_2s;
 	vector<string> main_channel_3s = pAd_checkParma->analysis_bind.main_channel_3s;
 	vector<string> second_channel_3s = pAd_checkParma->analysis_bind.second_channel_3s;
+	/* 获取关联通道 */
+	vector<string> correlated_channels = pAd_checkParma->analysis_bind.correlated_channels;
 
 	m_pMergedetlog->AddCheckstr(PrintLevel_2, 3, "Analysis_AD_Bind", "bind main_2s %d second_2s %d main_3s %d second_3s %d",
 								(int)main_channel_2s.size(), (int)second_channel_2s.size(), (int)main_channel_3s.size(), (int)second_channel_3s.size());

ConfigModule/include/CheckConfigDefine.h

@@ -1586,6 +1586,7 @@ struct AD_Analysisy_Bind
 	std::vector<std::string> second_channel_2s;
 	std::vector<std::string> main_channel_3s;
 	std::vector<std::string> second_channel_3s;
+	std::vector<std::string> correlated_channels;
 
 	AD_Analysisy_Bind()
 	{
@@ -1598,6 +1599,7 @@ struct AD_Analysisy_Bind
 		second_channel_2s.clear();
 		main_channel_3s.clear();
 		second_channel_3s.clear();
+		correlated_channels.clear();
 	}
 	void copy (AD_Analysisy_Bind tem)
 	{
@@ -1606,6 +1608,7 @@ struct AD_Analysisy_Bind
 		this->second_channel_2s = tem.second_channel_2s;
 		this->main_channel_3s = tem.main_channel_3s;
 		this->second_channel_3s = tem.second_channel_3s;
+		this->correlated_channels = tem.correlated_channels;
 	}
 	std::string GetInfo(std::string str)
 	{

ConfigModule/src/JsonConfig.cpp

@@ -1472,6 +1472,16 @@ int BaseFuntonConfigJson::GetFunction(Json::Value value)
                 }
             }
 
+            value_qx = value_f["form"]["Bind_Channel"]["correlated_channels"];
+            if (value_qx.isArray())
+            {
+                for (int idx = 0; idx < value_qx.size(); idx++)
+                {
+                    std::string channel = value_qx[idx].asString();
+                    _config.ad_check.analysis_bind.correlated_channels.push_back(channel);
+                }
+            }
+
             // 同画面分析
             value_qx = value_f["form"]["Single_Channel"]["s_channel"];
             if (value_qx.isArray())