pqdif进程跳过xml和报告初始化

添加单点补招pqdif文件的逻辑
添加pqdif处理函数
2026-07-20 16:29:23 +08:00 · 2026-07-17 16:25:44 +08:00 · 2026-07-17 15:58:19 +08:00 · 2026-07-17 13:57:45 +08:00 · 2026-07-17 11:15:16 +08:00 · 2026-07-14 14:20:23 +08:00
13 changed files with 1026 additions and 70 deletions
--- a/cfg_parse/cfg_parser.cpp
+++ b/cfg_parse/cfg_parser.cpp
@@ -156,6 +156,7 @@ public:
    char dev_type[64];
    char dev_key[255];
    char dev_series[255];
+    char com_type[32];
    char addr_str[64];
    char port[64];
    char timestamp[64];
@@ -859,7 +860,10 @@ void init_config() {
 	}
 	else if (g_node_id == SOE_COMTRADE_BASE_NODE_ID) {//暂态录波
 		TEST_PORT = TEST_PORT + SOE_COMTRADE_BASE_NODE_ID +  g_front_seg_index;
-	}	
+	}
+	else if (g_node_id == PQDIF_DATA_BASE_NODE_ID) {
+		TEST_PORT = TEST_PORT + PQDIF_DATA_BASE_NODE_ID +  g_front_seg_index;
+	}
 	
 }

@@ -1700,6 +1704,8 @@ void add_terminal_to_trigger_update(trigger_update_xml_t* trigger_update_xml, co
    }
 }

+static bool terminal_update_should_bind_to_current_process(const terminal* dev);
+
 // 解析 XML 数据并提取 terminal 信息
 void parse_terminal_from_data(trigger_update_xml_t* trigger_update_xml, const std::string& str_tag, const std::string& data,const std::string& guid_value) {
    terminal work_terminal = {};  // 创建新的 terminal 对象
@@ -1715,6 +1721,13 @@ void parse_terminal_from_data(trigger_update_xml_t* trigger_update_xml, const st
    strcpy(work_terminal.dev_type, extract_value(data, "devType").c_str());
    strcpy(work_terminal.dev_key, extract_value(data, "devKey").c_str());
    strcpy(work_terminal.dev_series, extract_value(data, "series").c_str());
+	std::string com_type = extract_value(data, "comType");
+	if (com_type.empty())
+		com_type = extract_value(data, "com_type");
+	if (com_type.empty())
+		com_type = "MMS";
+	strncpy(work_terminal.com_type, com_type.c_str(), sizeof(work_terminal.com_type) - 1);
+	work_terminal.com_type[sizeof(work_terminal.com_type) - 1] = '\0';
 	strcpy(work_terminal.processNo, extract_value(data, "processNo").c_str());
    strcpy(work_terminal.addr_str, extract_value(data, "ip").c_str());
    strcpy(work_terminal.port, extract_value(data, "port").c_str());
@@ -1801,6 +1814,13 @@ void parse_terminal_from_data(trigger_update_xml_t* trigger_update_xml, const st


    // 根据 str_tag 将 terminal 添加到相应的数组
+	if (!terminal_update_should_bind_to_current_process(&work_terminal)) {
+		std::cout << "skip ledger update xml by comType:" << work_terminal.com_type
+				  << " terminal:" << work_terminal.terminal_id
+				  << " process:" << subdir << g_front_seg_index << std::endl;
+		return;
+	}
+
    add_terminal_to_trigger_update(trigger_update_xml, str_tag, work_terminal);
 }

@@ -1821,11 +1841,25 @@ void parse_ledger_update(trigger_update_xml_t* trigger_update_xml, const std::st
        if (strTag == "delete") {
 			// 填充终端信息
 			strcpy(delete_terminal.terminal_id, extract_value(data, "id").c_str());
+			std::string com_type = extract_value(data, "comType");
+			if (com_type.empty())
+				com_type = extract_value(data, "com_type");
+			if (com_type.empty())
+				com_type = "MMS";
+			strncpy(delete_terminal.com_type, com_type.c_str(), sizeof(delete_terminal.com_type) - 1);
+			delete_terminal.com_type[sizeof(delete_terminal.com_type) - 1] = '\0';

 			//添加guid20250506
 			strncpy(delete_terminal.guid, guid_value.c_str(), sizeof(delete_terminal.guid) - 1);
 			delete_terminal.guid[sizeof(delete_terminal.guid) - 1] = '\0';

+			if (!terminal_update_should_bind_to_current_process(&delete_terminal)) {
+				std::cout << "skip delete ledger update xml by comType:" << delete_terminal.com_type
+						  << " terminal:" << delete_terminal.terminal_id
+						  << " process:" << subdir << g_front_seg_index << std::endl;
+				return;
+			}
+
            // 将删除信息写入 delete_updates
 			std::cout << "delete ledger!!!!!"<<std::endl;
            if (trigger_update_xml->delete_update_num < MAX_UPDATEA_NUM) {
@@ -3388,6 +3422,45 @@ void SendJsonAPI_web(const std::string& strUrl, const char* code, const std::str
 }

 // 打印 terminal_dev_map 中所有内容的函数
+static bool is_cfg_pqdif_process()
+{
+	return std::strstr(subdir, "cfg_pqdif_data") != NULL;
+}
+
+static bool is_pqdif_com_type(const char* com_type)
+{
+	QString type = com_type ? QString::fromLocal8Bit(com_type).trimmed() : QString();
+	return type.compare("PQDIF", Qt::CaseInsensitive) == 0;
+}
+
+static bool terminal_should_bind_to_current_process(const terminal_dev* dev)
+{
+	if (dev == NULL)
+		return false;
+
+	if (is_pqdif_com_type(dev->com_type))
+		return is_cfg_pqdif_process();
+
+	if (is_cfg_pqdif_process())
+		return false;
+
+	return (atoi(dev->processNo) == g_front_seg_index || g_front_seg_index == 0);
+}
+
+static bool terminal_update_should_bind_to_current_process(const terminal* dev)
+{
+	if (dev == NULL)
+		return false;
+
+	if (is_pqdif_com_type(dev->com_type))
+		return is_cfg_pqdif_process();
+
+	if (is_cfg_pqdif_process())
+		return false;
+
+	return true;
+}
+
 void printTerminalDevMap(const QMap<QString, terminal_dev*>& terminal_dev_map) {
 	QMap<QString, terminal_dev*>::const_iterator it;
    for (it = terminal_dev_map.constBegin(); it != terminal_dev_map.constEnd(); ++it) {
@@ -3406,6 +3479,7 @@ void printTerminalDevMap(const QMap<QString, terminal_dev*>& terminal_dev_map) {
                     << ", Device Type:" << QString(dev->dev_type)
                     << ", Device Key:" << QString(dev->dev_key)
                     << ", Device Series:" << QString(dev->dev_series)
+					 << ", Device comType:" << QString(dev->com_type)
 					 << ", Device processNo:" << QString(dev->processNo)
 					 << ", Device maxProcessNum:" << QString(dev->maxProcessNum)
                     << ", Address:" << QString(dev->addr_str)
@@ -3440,6 +3514,7 @@ void printLedger(const ied_usr_t& ied_usr) {
    std::cout << "|-- dev_type: " << ied_usr.dev_type << std::endl;
    std::cout << "|-- dev_key: " << ied_usr.dev_key << std::endl;
    std::cout << "|-- dev_series: " << ied_usr.dev_series << std::endl;
+    std::cout << "|-- com_type: " << ied_usr.com_type << std::endl;
    std::cout << "|-- dev_flag: " << ied_usr.dev_flag << std::endl;

    std::cout << "|-- last_call_wavelist_time: " << ied_usr.last_call_wavelist_time << std::endl;
@@ -3534,6 +3609,7 @@ void printLedgerinshell(const ied_usr_t& ied_usr, QIODevice* outputDevice) {
    outputDevice->write("\r\x1B[K");outputDevice->write("|-- dev_type: " + QByteArray(ied_usr.dev_type) + "\n");
    outputDevice->write("\r\x1B[K");outputDevice->write("|-- dev_key: " + QByteArray(ied_usr.dev_key) + "\n");
    outputDevice->write("\r\x1B[K");outputDevice->write("|-- dev_series: " + QByteArray(ied_usr.dev_series) + "\n");
+	outputDevice->write("\r\x1B[K");outputDevice->write("|-- com_type: " + QByteArray(ied_usr.com_type) + "\n");
 	outputDevice->write("\r\x1B[K");outputDevice->write("|-- dev_processNo: " + QByteArray(ied_usr.processNo) + "\n");
    outputDevice->write("\r\x1B[K");outputDevice->write("|-- dev_flag: " + QByteArray::number(ied_usr.dev_flag) + "\n");
    outputDevice->write("\r\x1B[K");outputDevice->write("|-- last_call_wavelist_time: " + QByteArray::number(ied_usr.last_call_wavelist_time) + "\n");
@@ -4085,6 +4161,13 @@ int terminal_ledger_web(QMap<QString, terminal_dev*>* terminal_dev_map,
        else strncpy(dev->dev_series, "N/A", sizeof(dev->dev_series) - 1);
 		dev->dev_series[sizeof(dev->dev_series) - 1] = '\0';

+		cJSON* comType = cJSON_GetObjectItem(item, "comType");
+		if (comType == NULL)
+			comType = cJSON_GetObjectItem(item, "com_type");
+		if (comType && comType->type == cJSON_String) strncpy(dev->com_type, comType->valuestring, sizeof(dev->com_type) - 1);
+		else strncpy(dev->com_type, "MMS", sizeof(dev->com_type) - 1);
+		dev->com_type[sizeof(dev->com_type) - 1] = '\0';
+
 		//lnk20250210台账进程号
 		cJSON* processNo = cJSON_GetObjectItem(item, "processNo"); // processNo转为字符串
        if (processNo && processNo->type == cJSON_Number) snprintf(dev->processNo, sizeof(dev->processNo), "%d", processNo->valueint);
@@ -4190,19 +4273,20 @@ int terminal_ledger_web(QMap<QString, terminal_dev*>* terminal_dev_map,

 		//lnk20260312防止内存泄漏
 		bool inserted = false;
+		bool should_bind = terminal_should_bind_to_current_process(dev);

    	// 检查是否存在重复键
    	if (terminal_dev_map->contains(key)) {
        	std::cerr << "Duplicate terminal_code found: " << key.toStdString() << std::endl;

        	// 删除旧的 terminal_dev 对象以避免内存泄漏
-        	delete terminal_dev_map->value(key);
+			if (should_bind) delete terminal_dev_map->value(key);

        	// 移除旧的键值对
-        	terminal_dev_map->remove(key);
+			if (should_bind) terminal_dev_map->remove(key);

        	// 插入新的 terminal_dev 对象
-			if(atoi(dev->processNo) == g_front_seg_index || g_front_seg_index == 0){//lnk20250210匹配进程号
+			if(should_bind){//lnk20250210匹配进程号
 				//调试用
 				std::cout<< "process num match" << std::endl;
        		terminal_dev_map->insert(key, dev);
@@ -4210,7 +4294,7 @@ int terminal_ledger_web(QMap<QString, terminal_dev*>* terminal_dev_map,
 			}//后续修改为只有进程号匹配上index才录入当前进程
    	} else {
        	// 插入新的 terminal_dev 对象
-			if(atoi(dev->processNo) == g_front_seg_index ||  g_front_seg_index == 0){//lnk20250210匹配进程号
+			if(should_bind){//lnk20250210匹配进程号
 				//调试用
 				std::cout<< "process num match" << std::endl;
        		terminal_dev_map->insert(key, dev);
@@ -4371,6 +4455,7 @@ int parse_device_cfg_web()
 		char dev_type[64];
 		char dev_key[255];
 		char dev_series[255];
+		char com_type[32];
 		char addr_str[64];
 		char port_char[64];

@@ -4400,6 +4485,8 @@ int parse_device_cfg_web()
        		strncpy(dev_type, value->dev_type, sizeof(dev_type) - 1);
        		strncpy(dev_key, value->dev_key, sizeof(dev_key) - 1);
        		strncpy(dev_series, value->dev_series, sizeof(dev_series) - 1);
+				strncpy(com_type, value->com_type, sizeof(com_type) - 1);
+				com_type[sizeof(com_type) - 1] = '\0';
        		strncpy(addr_str, value->addr_str, sizeof(addr_str) - 1);
        		strncpy(port_char, value->port, sizeof(port_char) - 1);
 				strncpy(processNo, value->processNo, sizeof(processNo) - 1);//进程号
@@ -4465,6 +4552,14 @@ int parse_device_cfg_web()
 				cout << "ied_usr->dev_type:" << ied_usr->dev_type << endl;
 			}
 			//lnk20250210台账进程号
+			if (com_type != NULL && com_type[0] != '\0') {
+				apr_snprintf(ied_usr->com_type, sizeof(ied_usr->com_type), "%s", com_type);//comType
+				cout << "ied_usr->com_type:" << ied_usr->com_type << endl;
+			}
+			else {
+				apr_snprintf(ied_usr->com_type, sizeof(ied_usr->com_type), "%s", "MMS");
+				cout << "ied_usr->com_type(default):" << ied_usr->com_type << endl;
+			}
 			if (processNo != NULL) {
 				apr_snprintf(ied_usr->processNo, sizeof(ied_usr->processNo), "%s", processNo);//processNo
 				cout << "ied_usr->processNo:" << ied_usr->processNo << endl;
@@ -5734,6 +5829,13 @@ int update_one_terminal_ledger(terminal* update, int i,ied_t* ied,int terminal_i
 	    apr_snprintf(ied_usr->dev_type, sizeof(ied_usr->dev_type), "%s", update[i].dev_type);
 	    printf("ied_usr->dev_type: %s\n", ied_usr->dev_type);
 	}
+	if (update[i].com_type != NULL && update[i].com_type[0] != '\0') {
+	    apr_snprintf(ied_usr->com_type, sizeof(ied_usr->com_type), "%s", update[i].com_type);
+	    printf("ied_usr->com_type: %s\n", ied_usr->com_type);
+	} else {
+	    apr_snprintf(ied_usr->com_type, sizeof(ied_usr->com_type), "%s", "MMS");
+	    printf("ied_usr->com_type (default): %s\n", ied_usr->com_type);
+	}
 	if (update[i].processNo != NULL) {
 	    apr_snprintf(ied_usr->processNo, sizeof(ied_usr->processNo), "%s", update[i].processNo);
 	    printf("ied_usr->processNo: %s\n", ied_usr->processNo);
@@ -6564,6 +6666,7 @@ void clearIedUsr(ied_usr_t *ied_usr) {
    memset(ied_usr->dev_type, 0, sizeof(ied_usr->dev_type));
    memset(ied_usr->dev_key, 0, sizeof(ied_usr->dev_key));
    memset(ied_usr->dev_series, 0, sizeof(ied_usr->dev_series));
+    memset(ied_usr->com_type, 0, sizeof(ied_usr->com_type));
    memset(ied_usr->terminal_id, 0, sizeof(ied_usr->terminal_id));
    memset(ied_usr->org_name, 0, sizeof(ied_usr->org_name));
    memset(ied_usr->maint_name, 0, sizeof(ied_usr->maint_name));
@@ -7290,6 +7393,8 @@ const char* get_front_msg_from_subdir() {
        return "实时数据进程";
    else if (std::strstr(subdir, "cfg_soe_comtrade") != NULL)
        return "暂态和告警进程";
+    else if (std::strstr(subdir, "cfg_pqdif_data") != NULL)
+        return "pqdif处理进程";
    else if (std::strstr(subdir, "cfg_recallhis_data") != NULL)
        return "稳态补招进程";
    else if (std::strstr(subdir, "cfg_stat_data") != NULL)
@@ -7511,4 +7616,4 @@ void read_latest_ledger_file(char** out) {
            fclose(fp);
        }
    }
-}
+}
--- a/cfg_parse/log4.cpp
+++ b/cfg_parse/log4.cpp
@@ -229,6 +229,8 @@ std::string get_front_type_from_subdir() {
        return "realTime";
    else if (std::strstr(subdir, "cfg_soe_comtrade") != NULL)
        return "comtrade";
+    else if (std::strstr(subdir, "cfg_pqdif_data") != NULL)
+        return "PQDIF";
    else if (std::strstr(subdir, "cfg_recallhis_data") != NULL)
        return "recall";
    else if (std::strstr(subdir, "cfg_stat_data") != NULL)
@@ -869,4 +871,4 @@ int main() {

    return 0;
 }
-*/
+*/
--- a/json/create_json.cpp
+++ b/json/create_json.cpp
@@ -32,10 +32,12 @@
 #include <QMutexLocker>
 #include <QMapIterator>
 #include <QStringList>
+#include <QByteArray>
+#include <QList>

-// ★MOD: 全局追踪表：mp_id -> remaining times
+//全局追踪表：mp_id -> rpt_no -> remaining times
 static QMutex g_trace_mutex;
-static QHash<QString, int> g_trace_map;
+static QHash<QString, QHash<int, int> > g_trace_map;

 ///////////////////////////////////////////////////lnk2024-10-21////////////////////////////////////////////////////////
 extern void SendJsonAPI_web(const std::string& strUrl, const char* code, const std::string& json, char** ptr);
@@ -258,36 +260,77 @@ static QString escape_json_string(const QString& s)
    return out;
 }

-// 打开追踪：次数 times（比如 5）
+// 打开追踪：每个报告各追踪一次
 void process_trace_command(const std::string& id, int times)
 {
-    if (times <= 0) return;
+    (void)times;
    QString qid = QString::fromStdString(id).trimmed();
    if (qid.isEmpty()) return;

+    QList<int> rpt_nos;
+
+    QByteArray qid_bytes = qid.toLocal8Bit();
+
+    pthread_mutex_lock(&mtx);
+    LD_info_t *ld_info = find_LD_info_only_from_mp_id(qid_bytes.data());
+    if (ld_info != NULL && ld_info->rptinfo != NULL && ld_info->rptcount > 0) {
+        for (int i = 0; i < ld_info->rptcount; ++i) {
+            if (ld_info->rptinfo[i] == NULL)
+                continue;
+
+            int rpt_no = ld_info->rptinfo[i]->rptNo;
+            if (!rpt_nos.contains(rpt_no))
+                rpt_nos.append(rpt_no);
+        }
+    }
+    pthread_mutex_unlock(&mtx);
+
+    if (rpt_nos.isEmpty()) {
+        cout << "[TRACE] mp_id=" << id << " has no report info" << endl;
+        return;
+    }
+
    QMutexLocker lk(&g_trace_mutex);
-    g_trace_map[qid] = times; // 重新打开就覆盖/重置次数
+    QHash<int, int>& rpt_map = g_trace_map[qid];
+    for (int i = 0; i < rpt_nos.size(); ++i) {
+        int rpt_no = rpt_nos.at(i);
+        rpt_map[rpt_no] = 1;
+        cout << "[TRACE] mp_id=" << id << " add rpt_no=" << rpt_no
+             << " left=" << rpt_map.value(rpt_no) << endl;
+    }
 }

 // 查询是否要追踪
-static bool trace_is_enabled(const QString& mp_id)
+static bool trace_is_enabled(const QString& mp_id, int rpt_no)
 {
    QMutexLocker lk(&g_trace_mutex);
-    auto it = g_trace_map.constFind(mp_id);
-    return (it != g_trace_map.constEnd() && it.value() > 0);
+    QHash<QString, QHash<int, int> >::const_iterator mp_it = g_trace_map.constFind(mp_id);
+    if (mp_it == g_trace_map.constEnd())
+        return false;
+
+    QHash<int, int>::const_iterator rpt_it = mp_it.value().constFind(rpt_no);
+    return (rpt_it != mp_it.value().constEnd() && rpt_it.value() > 0);
 }

 // 命中一次并扣减；扣到 0 自动删
-static void trace_hit_and_decrement(const QString& mp_id)
+static void trace_hit_and_decrement(const QString& mp_id, int rpt_no)
 {
    QMutexLocker lk(&g_trace_mutex);
-    auto it = g_trace_map.find(mp_id);
-    if (it == g_trace_map.end()) return;
+    QHash<QString, QHash<int, int> >::iterator mp_it = g_trace_map.find(mp_id);
+    if (mp_it == g_trace_map.end()) return;

-    int left = it.value();
+    QHash<int, int>::iterator rpt_it = mp_it.value().find(rpt_no);
+    if (rpt_it == mp_it.value().end()) return;
+
+    int left = rpt_it.value();
    left -= 1;
-    if (left <= 0) g_trace_map.erase(it);
-    else it.value() = left;
+    if (left <= 0)
+        mp_it.value().erase(rpt_it);
+    else
+        rpt_it.value() = left;
+
+    if (mp_it.value().isEmpty())
+        g_trace_map.erase(mp_it);
 }

 //追踪61850原始数据
@@ -316,15 +359,20 @@ static QString build_mms_json_object(const json_block_data* data)
    return json;
 }

-static QString build_trace_json(const json_block_data* data)
+static QString build_trace_json(const json_block_data* data, const char *v_wiring_type, const char *rpt_id, int rpt_no)
 {
    if (!data) return "{}";

    QString mms_json = build_mms_json_object(data);
+    QString wiring_type = v_wiring_type ? QString::fromLocal8Bit(v_wiring_type) : "";
+    QString rpt = rpt_id ? QString::fromLocal8Bit(rpt_id) : "";

    QString json;
    json += "{";
    json += QString("\"mp_id\":\"%1\",").arg(escape_json_string(data->mp_id));
+    json += QString("\"v_wiring_type\":\"%1\",").arg(escape_json_string(wiring_type));
+    json += QString("\"rpt_id\":\"%1\",").arg(escape_json_string(rpt));
+    json += QString("\"rpt_no\":%1,").arg(rpt_no);
    json += QString("\"func_type\":%1,").arg(data->func_type);
    json += QString("\"data_time\":%1,").arg(QString::number((qlonglong)data->time));
    json += QString("\"voltage_level\":\"%1\",").arg(QString::number(data->voltage_level, 'f', 6));
@@ -335,13 +383,13 @@ static QString build_trace_json(const json_block_data* data)
    return json;
 }

-static void send_trace_if_needed(json_block_data* pdata)
+static void send_trace_if_needed(json_block_data* pdata, const char *v_wiring_type, const char *rpt_id, int rpt_no)
 {
    const QString mp_id_q = pdata->mp_id;
-    if (trace_is_enabled(mp_id_q)) {
+    if (trace_is_enabled(mp_id_q, rpt_no)) {

        // 1) 组 json
-        QString jsonText = build_trace_json(pdata);
+        QString jsonText = build_trace_json(pdata, v_wiring_type, rpt_id, rpt_no);

        // 2) 组 KafkaData
        Ckafka_data_t KafkaData;
@@ -355,9 +403,25 @@ static void send_trace_if_needed(json_block_data* pdata)
        kafka_data_list_mutex.unlock();

        // 3) 次数 -1
-        trace_hit_and_decrement(mp_id_q);
+        trace_hit_and_decrement(mp_id_q, rpt_no);
    }
 }
+
+int trace_json_block_data(char v_wiring_type[], json_block_data *data, const char *rpt_id, int rpt_no)
+{
+    send_trace_if_needed(data, v_wiring_type, rpt_id, rpt_no);
+    return 1;
+}
+
+int trace_json_is_enabled(const char *mp_id, int rpt_no)
+{
+    QString mp_id_q = mp_id ? QString::fromLocal8Bit(mp_id).trimmed() : "";
+    if (mp_id_q.isEmpty())
+        return 0;
+
+    return trace_is_enabled(mp_id_q, rpt_no) ? 1 : 0;
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////lnk20250710添加频率值存储
 struct mp_freq_save {
    double G_FREQ;
@@ -1162,9 +1226,12 @@ void printCTopicList(const std::list<CTopic*>& ctopic_list) {
                                   val->fValue);
                        }
                    }
+					break; // 只打印第一个 Item 的 SequenceList 和 DataValueList，避免输出过多
                }
+				break; // 只打印第一个 Monitor 的 ItemList，避免输出过多
            }

+
            // 如果需要打印 SOEList，可加以下：
            /*
            int soeIndex = 0;
@@ -1217,9 +1284,6 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
        print_mms_str_map(data);
    }

-	//数据追踪上送
-	send_trace_if_needed(data);
-
 	list<CTopic*> ctopic_list;

 	////lnk2024-8-15 区分星型,角型接线
@@ -1562,7 +1626,9 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
 							kafka_data_list_mutex.unlock(); //解锁
 							longjumpflag = true;
 						}
-
+						else if (countflag < num && 0 != time_sec % 7200) {
+							longjumpflag = true;//不发送数据
+						}
 						//lnk20260127
 						if (typeofdata == false || data_have_static == false) {//不合并则处理完闪变就不处理其他数据,如果有统计数据或者数据类型区分了就继续处理其他数据
 							if (longjumpflag == true || shortjumpflag == true) {
@@ -2471,6 +2537,9 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
 							kafka_data_list_mutex.unlock(); //解锁
 							longjumpflag = true;
 						}
+						else if (countflag < num && 0 != time_sec % 7200) {
+							longjumpflag = true;//不发送数据
+						}
 						if (typeofdata == false || data_have_static == false) {//不合并则处理完闪变就不处理其他数据
 							if (longjumpflag == true || shortjumpflag == true) {
 								return 1;
@@ -3758,4 +3827,3 @@ void Set_xml_nodeinfo_one(char* dev_type)
 	}
 		
 }
-
--- a/json/mms_json_inter.h
+++ b/json/mms_json_inter.h
@@ -26,6 +26,7 @@
 #define THREE_SECS_DATA_BASE_NODE_ID	200  // 三秒数据、实时数据
 #define SOE_COMTRADE_BASE_NODE_ID		300  // soe 录波
 #define HIS_DATA_BASE_NODE_ID			400  //历史、补招
+#define PQDIF_DATA_BASE_NODE_ID			800  // pqdif数据

 class json_block_data //json拼接参数类
 {
@@ -74,6 +75,8 @@ public:
 };

 int  transfer_json_block_data(char v_wiring_type[], json_block_data* data);//lnk2024-8-16添加参数
+int  trace_json_is_enabled(const char *mp_id, int rpt_no);
+int  trace_json_block_data(char v_wiring_type[], json_block_data* data, const char *rpt_id, int rpt_no);

 #endif /* __cplusplus */

@@ -95,4 +98,4 @@ void connectlog_pgsql(char* id,char* datetime,int status);
 #endif


-#endif //MMS_JSON_INTER_92327hyhy0923r_H
+#endif //MMS_JSON_INTER_92327hyhy0923r_H
--- a/json/save2json.cpp
+++ b/json/save2json.cpp
@@ -198,6 +198,7 @@ static QMap<int, QMap<int, QList<long long>>> real_data_report_map;	//多个监
 static QMap<QString, json_block_data*> json_data_map;//CZY 2023-08-17 ww 2023年3月13日17:23:17扩展Map，用于保存各条线路的数据
 static QMap<QString, json_block_data*> json_flicker_data_map;//CZY 2023-09-11 展Map，用于保存各条线路的闪变数据
 static QMap<QString, json_block_data*> json_pst_data_map;//CZY 2023-09-11 展Map，用于保存各条线路的闪变数据
+static QMap<QString, json_block_data*> json_trace_data_map;

 //////////////////////////////////////////////////////////////////////////////lnk20260310文件控制
 pthread_mutex_t g_file_req_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -270,6 +271,8 @@ void add_comm_log(char* log_str)
 		com_log_fn += "comm_300_comtrade.txt";
 	else if (g_node_id == HIS_DATA_BASE_NODE_ID)
 		com_log_fn += "comm_400_his.txt";
+	else if (g_node_id == PQDIF_DATA_BASE_NODE_ID)
+		com_log_fn += "comm_800_pqdif.txt";
 	else if (g_node_id == NEW_HIS_DATA_BASE_NODE_ID) {
 		com_log_fn.append(QString("comm_400_his_%1.txt").arg(g_front_seg_index));
 	}
@@ -1193,6 +1196,48 @@ void add_indent(std::stringstream& stream, int level) {
    }
 }

+static bool is_cfg_pqdif_process()
+{
+	return std::strstr(subdir, "cfg_pqdif_data") != NULL;
+}
+
+static bool is_pqdif_com_type(const char* com_type)
+{
+	QString type = com_type ? QString::fromLocal8Bit(com_type).trimmed() : QString();
+	return type.compare("PQDIF", Qt::CaseInsensitive) == 0;
+}
+
+static void fill_terminal_com_type(terminal* tmnl, cJSON* item)
+{
+	if (tmnl == NULL)
+		return;
+
+	cJSON* comType = cJSON_GetObjectItem(item, "comType");
+	if (comType == NULL)
+		comType = cJSON_GetObjectItem(item, "com_type");
+
+	if (comType && comType->type == cJSON_String)
+		std::strncpy(tmnl->com_type, comType->valuestring, sizeof(tmnl->com_type) - 1);
+	else
+		std::strncpy(tmnl->com_type, "MMS", sizeof(tmnl->com_type) - 1);
+
+	tmnl->com_type[sizeof(tmnl->com_type) - 1] = '\0';
+}
+
+static bool terminal_update_should_write_file(const terminal* tmnl)
+{
+	if (tmnl == NULL)
+		return false;
+
+	if (is_pqdif_com_type(tmnl->com_type))
+		return is_cfg_pqdif_process();
+
+	if (is_cfg_pqdif_process())
+		return false;
+
+	return true;
+}
+
 std::string prepare_update(const std::string& code_str, const terminal& json_data,const std::string& guid) //添加guid
 {
    std::cout << "prepare update" << std::endl;
@@ -1264,6 +1309,9 @@ std::string prepare_update(const std::string& code_str, const terminal& json_dat
        add_indent(xmlStream, indentLevel);
        xmlStream << "<series>" << json_data.dev_series << "</series>" << std::endl;

+		add_indent(xmlStream, indentLevel);
+        xmlStream << "<comType>" << (json_data.com_type[0] ? json_data.com_type : "MMS") << "</comType>" << std::endl;
+
 		//lnk20250210
 		add_indent(xmlStream, indentLevel);
        xmlStream << "<processNo>" << json_data.processNo << "</processNo>" << std::endl;
@@ -1346,6 +1394,9 @@ std::string prepare_update(const std::string& code_str, const terminal& json_dat
        add_indent(xmlStream, indentLevel);
        xmlStream << "<id>" << json_data.terminal_id << "</id>" << std::endl;

+        add_indent(xmlStream, indentLevel);
+        xmlStream << "<comType>" << (json_data.com_type[0] ? json_data.com_type : "MMS") << "</comType>" << std::endl;
+
 		indentLevel--;
        add_indent(xmlStream, indentLevel);
        xmlStream << "</terminalData>" << std::endl;
@@ -1539,7 +1590,7 @@ int parse_log(const std::string& json_str) {
 		}
 		else if((level == "measurepoint") && (grade == "TRACE") && (!id.empty() && !is_blank(id))){	//数据追踪
 			//打开监测点数据追踪开关
-			process_trace_command(id,3);	//3表示追踪次数
+			process_trace_command(id,1);	//每个报告各追踪1次
 		}
 		else{
 			std::cout << "type doesnt match" <<std::endl;
@@ -1624,7 +1675,7 @@ int parse_control(const std::string& json_str, const std::string& output_dir) {
 	std::string guid = guidstr->valuestring;

 	//进程号为0的进程处理所有台账更新消息
-	if (process_No != g_front_seg_index && g_front_seg_index !=0) {
+	if (!is_cfg_pqdif_process() && process_No != g_front_seg_index && g_front_seg_index !=0) {
    	std::cout << "msg index:"<< process_No <<"doesnt match self index:" << g_front_seg_index << std::endl;
 		cJSON_Delete(messageBody);
        cJSON_Delete(root);
@@ -1653,6 +1704,7 @@ int parse_control(const std::string& json_str, const std::string& output_dir) {
                cJSON* item = cJSON_GetArrayItem(data, i);

                terminal json_data;
+				memset(&json_data, 0, sizeof(json_data));
                // 填充 terminal_dev 的数据
                cJSON* id = cJSON_GetObjectItem(item, "id"); // terminal_id
 				if (id && id->type == cJSON_String) 
@@ -1714,6 +1766,8 @@ int parse_control(const std::string& json_str, const std::string& output_dir) {
 				else 
 				    std::strncpy(json_data.dev_series, "N/A", sizeof(json_data.dev_series) - 1);

+				fill_terminal_com_type(&json_data, item);
+
 				//lnk20250210台账进程号
 				cJSON* processNo = cJSON_GetObjectItem(item, "processNo"); // processNo转为字符串
        		if (processNo && processNo->type == cJSON_Number) snprintf(json_data.processNo, sizeof(json_data.processNo), "%d", processNo->valueint);
@@ -1764,6 +1818,7 @@ int parse_control(const std::string& json_str, const std::string& output_dir) {
                    for (int j = 0; j < monitorData_size && j < 10; j++) {  // 最多 10 个监测点
                        cJSON* monitor_item = cJSON_GetArrayItem(monitorData, j);
                        monitor monitor_data;
+						memset(&monitor_data, 0, sizeof(monitor_data));

                        cJSON* monitor_id = cJSON_GetObjectItem(monitor_item, "id"); // monitor_id
        				if (monitor_id && monitor_id->type == cJSON_String) 
@@ -1834,6 +1889,13 @@ int parse_control(const std::string& json_str, const std::string& output_dir) {

 				print_terminal(&json_data);

+				if (!terminal_update_should_write_file(&json_data)) {
+					std::cout << "skip ledger update by comType:" << json_data.com_type
+							  << " terminal:" << json_data.terminal_id
+							  << " process:" << subdir << g_front_seg_index << std::endl;
+					continue;
+				}
+
                // 准备 XML 内容并写入文件
                std::string xmlContent = prepare_update(code_str, json_data,guid);//添加guid20250506
                if (xmlContent != "") {
@@ -1867,7 +1929,17 @@ int parse_control(const std::string& json_str, const std::string& output_dir) {
                cJSON* id = cJSON_GetObjectItem(item, "id");
                if (id != nullptr) {
                    terminal json_data;
+					memset(&json_data, 0, sizeof(json_data));
                    std::strncpy(json_data.terminal_id, cJSON_GetObjectItem(item, "id")->valuestring, sizeof(json_data.terminal_id) - 1);
+					fill_terminal_com_type(&json_data, item);
+
+					if (!terminal_update_should_write_file(&json_data)) {
+						std::cout << "skip delete ledger update by comType:" << json_data.com_type
+								  << " terminal:" << json_data.terminal_id
+								  << " process:" << subdir << g_front_seg_index << std::endl;
+						continue;
+					}
+
                    // 准备 XML 内容并写入文件
                    std::string xmlContent = prepare_update(code_str, json_data,guid);//添加guid20250506
 					if(xmlContent != ""){
@@ -3633,6 +3705,119 @@ int json_block_create_data(char monid_char[], char* mms_str, double v, int flick
 	return TRUE;
 }

+static QString json_trace_block_key(char monid_char[], int flicker_flag, int rpt_no)
+{
+	QString key;
+	key.append(monid_char ? monid_char : "");
+	key.append("|");
+	key.append(QString::number(flicker_flag));
+	key.append("|");
+	key.append(QString::number(rpt_no));
+	return key;
+}
+
+static json_block_data* get_json_trace_block_data(char monid_char[], int flicker_flag, int rpt_no)
+{
+	QString key = json_trace_block_key(monid_char, flicker_flag, rpt_no);
+	if (!json_trace_data_map.contains(key))
+		return NULL;
+	return json_trace_data_map.value(key);
+}
+
+static void init_json_trace_block_data(char monid_char[], char voltage_level[], int flicker_flag, int rpt_no)
+{
+	QString key = json_trace_block_key(monid_char, flicker_flag, rpt_no);
+	json_block_data* pdata = NULL;
+	if (!json_trace_data_map.contains(key)) {
+		pdata = new json_block_data();
+		json_trace_data_map.insert(key, pdata);
+	}
+
+	pdata = json_trace_data_map.value(key);
+	pdata->monitorId = -1;
+	pdata->func_type = g_node_id;
+	pdata->flag = 0;
+	pdata->time = 0;
+	pdata->voltage_level = get_voltage_level(voltage_level);
+	pdata->mp_id = monid_char ? QString::fromLocal8Bit(monid_char) : QString("not define");
+	pdata->dev_type.clear();
+	pdata->mms_str_map.clear();
+	pdata->data_have_statistic = 0;
+}
+
+int json_trace_block_create_start(char voltage_level[], char monid_char[], int flicker_flag, char temcode[], int line_id, char v_wiring_type[], char rpt_id[], int rpt_no)
+{
+	(void)v_wiring_type;
+	(void)rpt_id;
+	if (!trace_json_is_enabled(monid_char, rpt_no))
+		return 0;
+
+	try_start_kafka_thread();
+	init_json_trace_block_data(monid_char, voltage_level, flicker_flag, rpt_no);
+
+	json_block_data* pdata = get_json_trace_block_data(monid_char, flicker_flag, rpt_no);
+	if (pdata != NULL) {
+		pdata->dev_type.append(temcode ? temcode : "");
+		pdata->monitorId = line_id;
+	}
+
+	return TRUE;
+}
+
+int json_trace_block_create_time(char monid_char[], long long Time, int flicker_flag, char rpt_id[], int rpt_no)
+{
+	(void)rpt_id;
+	json_block_data* pdata = get_json_trace_block_data(monid_char, flicker_flag, rpt_no);
+	if (pdata == NULL)
+		return 0;
+
+	pdata->time = Time;
+	return TRUE;
+}
+
+int json_trace_block_create_flag(char monid_char[], int flag, int flicker_flag, char rpt_id[], int rpt_no)
+{
+	(void)rpt_id;
+	json_block_data* pdata = get_json_trace_block_data(monid_char, flicker_flag, rpt_no);
+	if (pdata == NULL)
+		return 0;
+
+	pdata->flag = flag;
+	return TRUE;
+}
+
+int json_trace_block_create_data(char monid_char[], char* mms_str, double v, int flicker_flag, char rpt_id[], int rpt_no)
+{
+	(void)rpt_id;
+	json_block_data* pdata = get_json_trace_block_data(monid_char, flicker_flag, rpt_no);
+	if (pdata == NULL)
+		return 0;
+
+	pdata->mms_str_map.insert(QString::fromAscii(mms_str), v);
+	return TRUE;
+}
+
+int json_trace_block_create_end(char v_wiring_type[], char monid_char[], int flicker_flag, char rpt_id[], int rpt_no)
+{
+	QString key = json_trace_block_key(monid_char, flicker_flag, rpt_no);
+	if (!json_trace_data_map.contains(key))
+		return 1;
+
+	json_block_data* pdata = json_trace_data_map.value(key);
+	if (pdata == NULL) {
+		json_trace_data_map.remove(key);
+		return 1;
+	}
+
+	int ret = 1;
+	if (pdata->mms_str_map.count() > 0)
+		ret = trace_json_block_data(v_wiring_type, pdata, rpt_id, rpt_no);
+
+	delete pdata;
+	json_trace_data_map.remove(key);
+	return ret;
+}
+

 //lnk2024-8-16添加接线参数
 int json_block_create_end(char v_wiring_type[], char monid_char[], int flicker_flag)//WW 2023年3月13日16:38:41 多ICD修改
@@ -3693,7 +3878,7 @@ int json_block_create_end(char v_wiring_type[], char monid_char[], int flicker_f
 			json_pst_data_map.remove(monid_char);

 		}
-		printf("---------- json_block_create_end: pdata->mms_str_map.count() == 0 ----------\n");
+		printf("---------- json_block_create_end: mp_id= %s pdata->mms_str_map.count() == 0 ----------\n", monid_char);
 		return 1;
 	}
 	//lnk2024-8-16添加接线参数
@@ -3878,4 +4063,4 @@ int sel_mvl_type_ctrl_flag(char doname[])
 		return -1;
 	}
 }
-//ZW 2024-01-31 end
+//ZW 2024-01-31 end
--- a/json/save2json.h
+++ b/json/save2json.h
@@ -688,6 +688,7 @@ struct terminal // 终端台账
    char dev_type[64];
    char dev_key[255];
    char dev_series[255];
+    char com_type[32];
    char processNo[64]; //lnk20250210进程号
    char addr_str[64];
    char port[64];
@@ -702,4 +703,4 @@ struct terminal // 终端台账
 #endif
 /////////////////////////////////////////////////////////////////////////////

-#endif //SAVE2DB_8ue3hy0923r_H
+#endif //SAVE2DB_8ue3hy0923r_H
--- a/mms/db_interface.h
+++ b/mms/db_interface.h
@@ -31,6 +31,7 @@
 #define NEW_HIS_DATA_BASE_NODE_ID		500
 #define RECALL_HIS_DATA_BASE_NODE_ID	600
 #define RECALL_ALL_DATA_BASE_NODE_ID	700
+#define PQDIF_DATA_BASE_NODE_ID			800

 #define REPORT_TYPE_STAT				1
 #define REPORT_TYPE_REAL				2
@@ -74,6 +75,12 @@ int json_block_create_data(char monid_char[], char* mms_str , double v, int flic
 //lnk2024-8-16添加参数
 int json_block_create_end(char v_wiring_type[], char monid_char[], int flicker_flag); //CZY 2023-08-17 测试

+int json_trace_block_create_start(char voltage_level[], char monid_char[], int flicker_flag, char temcode[], int line_id, char v_wiring_type[], char rpt_id[], int rpt_no);
+int json_trace_block_create_time(char monid_char[], long long Time, int flicker_flag, char rpt_id[], int rpt_no);
+int json_trace_block_create_flag(char monid_char[], int flag, int flicker_flag, char rpt_id[], int rpt_no);
+int json_trace_block_create_data(char monid_char[], char* mms_str, double v, int flicker_flag, char rpt_id[], int rpt_no);
+int json_trace_block_create_end(char v_wiring_type[], char monid_char[], int flicker_flag, char rpt_id[], int rpt_no);
+
 //zw 2024-01-31 补招模式优化
 void add_mvl_type_ctrl(char doname[], int ctrl);
 int sel_mvl_type_ctrl_flag(char doname[]);
@@ -194,4 +201,4 @@ typedef struct file_dir_req_t
 #endif


-#endif //DB_INTERFACE_7ew2327hyhy0923r_H
+#endif //DB_INTERFACE_7ew2327hyhy0923r_H
--- a/mms/main.c
+++ b/mms/main.c
@@ -81,6 +81,8 @@ void init_global_function_enable()
 		three_secs_enabled = 1;
 	}else if (strcmp(subdir,"cfg_soe_comtrade")==0) {	//告警和录波和暂态
 		g_node_id = SOE_COMTRADE_BASE_NODE_ID;
+	}else if (strcmp(subdir,"cfg_pqdif_data")==0) {
+		g_node_id = PQDIF_DATA_BASE_NODE_ID;
 	}else if (strcmp(subdir,"cfg_his_data")==0)  {		//不使用
 		g_node_id = RECALL_ALL_DATA_BASE_NODE_ID;
 		g_node_id = HIS_DATA_BASE_NODE_ID;	
--- a/mms/mms_process.c
+++ b/mms/mms_process.c
@@ -44,7 +44,13 @@ SD_CONST static ST_CHAR *SD_CONST thisFileName = __FILE__;

 #ifdef  _OS_UNIX_
 #include <sys/vfs.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #endif
+#include <ctype.h>
+#include <errno.h>
+#include <time.h>
 extern uint32_t	g_dead_lock_counter;
 extern uint32_t	g_thread_blocked_times;

@@ -95,6 +101,9 @@ static void format_time_ms(long long ms, char* buf, size_t buf_len){
             tm_time.tm_sec,
             milli);
 }
+
+static apr_status_t ChannelCheckPQDIFFiles(chnl_usr_t *chnl_usr);
+static apr_status_t ChannelRecallPQDIFFiles(chnl_usr_t *chnl_usr, LD_info_t *LD_info, long long start_sec, long long end_sec);
 //lnk20250122start
 apr_status_t init_rem_dib_table()
 {
@@ -387,7 +396,7 @@ void ChannelCheckIECReports(chnl_usr_t *chnl_usr)
 			rptinfo = LD_info->rptinfo[rpt_no] ;

 			//检查是否需要注册或取消注册报告，或不做任何处理
-			printf("[RPT][CHECK] ip=%s cpu=%d rpt_no=%d rptcount=%d LD_name=%s rptinfo=%p\n",
+			if(DEBUGOPEN)printf("[RPT][CHECK] ip=%s cpu=%d rpt_no=%d rptcount=%d LD_name=%s rptinfo=%p\n",
 			       chnl_usr->ip_str,
 			       cpuno,
 			       rpt_no,
@@ -572,21 +581,28 @@ void ChannelCheckIECLogs(chnl_usr_t *chnl_usr)
 	LD_info_t	*LD_info;
 	loginfo_t	*loginfo = NULL;
 	int			cpuno;
+	int			is_pqdif_process;

 	double now;
 	static double last_check_recall_config_time = 0.0;

 	ied = chnl_usr->chnl->ied;
 	ied_usr = GET_IEDEXT_ADDR(ied);
+	is_pqdif_process = (g_node_id == PQDIF_DATA_BASE_NODE_ID);

 	for(cpuno=0 ; cpuno<ied->cpucount; cpuno++) {
 		LD_info = &(ied_usr->LD_info[cpuno]);

 		//添加保护，防止台账中测点号不连续导致的崩溃
 		if (LD_info->cpuno == 0 ||
-		    LD_info->LD_name == NULL ||
-		    LD_info->logcount <= 0 ||
-		    LD_info->loginfo == NULL)
+		    LD_info->LD_name == NULL)
+		{
+		    continue;
+		}
+
+		if (!is_pqdif_process &&
+		    (LD_info->logcount <= 0 ||
+		     LD_info->loginfo == NULL))
 		{
 		    continue;
 		}
@@ -612,11 +628,13 @@ void ChannelCheckIECLogs(chnl_usr_t *chnl_usr)
 			continue;
 		}*/
 			
-		loginfo = LD_info->loginfo[0] ;	
+		if (!is_pqdif_process) {
+			loginfo = LD_info->loginfo[0] ;

 		//添加保护，防止台账中测点号不连续导致的崩溃
 		if (loginfo == NULL || loginfo->LD_info == NULL)
 			continue;
+		}

 		apr_sleep(apr_time_from_sec(1) / 10);		

@@ -628,14 +646,17 @@ void ChannelCheckIECLogs(chnl_usr_t *chnl_usr)
 			int failed_count = 0;

 			/////////////////////////////////////////////////////根据配置文件控制下发补招时间为北京时间还是utc时间
+			long long utc_or_beijing = 0;
+			if (!is_pqdif_process) {
 			printf("~~~~~~~this dev type is %s~~~~~~~",ied_usr->dev_type);
 			XmlConfigC cfg1;
+			memset(&cfg1,0,sizeof(cfg1));
 			if (get_xml_config_by_dev_type(ied_usr->dev_type, &cfg1)) {
 			    printf("ValueOfTimeUnit = %s\n", cfg1.ValueOfTimeUnit);
 			} else {
 			    printf("读取失败，未找到 dev_type\n");
 			}
-			long long utc_or_beijing;
+			utc_or_beijing = 0;
 		
 			if(strcmp(cfg1.ValueOfTimeUnit, "utc") == 0){//装置时间是utc还是北京
 				utc_or_beijing = 28800;//秒
@@ -646,6 +667,11 @@ void ChannelCheckIECLogs(chnl_usr_t *chnl_usr)
 				DIY_WARNLOG_CODE(LD_info->mp_id,2,LOG_CODE_RECALL,"【WARN】监测点:%s - id:%s开始补招数据,注意!下发补招时间为beijing时间,监测点对应装置型号:%s", LD_info->name,LD_info->mp_id,ied_usr->dev_type);
 			}
 			
+			}
+			else {
+				DIY_WARNLOG_CODE(LD_info->mp_id,2,LOG_CODE_RECALL,"[PQDIF][RECALL] monitor:%s - id:%s start recall PQDIF files, dev_type:%s", LD_info->name,LD_info->mp_id,ied_usr->dev_type);
+			}
+
 			//////////////////////////////////////////////////////////////
 			//记录本次补招的时间范围
 			long long min_start_sec = LLONG_MAX;
@@ -666,6 +692,9 @@ void ChannelCheckIECLogs(chnl_usr_t *chnl_usr)
 				LD_info->autorecallflag = 1;//正在补招

 				//当前不区分稳态和暂态lnk20241030，如果做区分修改：Check_Recall_Config从xml文件获取数据后，赋值给了LD_info
+				if (is_pqdif_process)
+					continue;
+
 				loginfo->need_steady = LD_info->autorecall[i]->need_steady; loginfo->need_voltage = LD_info->autorecall[i]->need_voltage;

 				loginfo->start_time = apr_time_from_sec(LD_info->autorecall[i]->start - 5);//保证时间开头
@@ -718,6 +747,24 @@ void ChannelCheckIECLogs(chnl_usr_t *chnl_usr)

 			//不管是否成功，这个补招文件必须删除，可能出现一直失败，循环读取文件和循环补招导致程序崩溃202050724lnk
 			//if (failed_count==0) {//成功
+				if (is_pqdif_process) {
+					if (min_start_sec == LLONG_MAX || max_end_sec <= min_start_sec) {
+						failed_count++;
+						printf("[PQDIF][RECALL] invalid recall range mp_id=%s min=%lld max=%lld\n",
+							LD_info->mp_id, min_start_sec, max_end_sec);
+					}
+					else {
+						ret = ChannelRecallPQDIFFiles(chnl_usr, LD_info, min_start_sec, max_end_sec);
+						if (ret != APR_SUCCESS)
+							failed_count++;
+					}
+
+					g_dead_lock_counter = 0;
+					g_thread_blocked_times = 0;
+					now = sGetMsTime();
+					last_check_recall_config_time = now;
+				}
+
 				Delete_recall_Xml(LD_info->mp_id);

 				// ===== [新增] 组装上送的补招开始/结束时间字符串（本地时区，直接“秒转字符串”）=====
@@ -1129,7 +1176,8 @@ void process_ledger_update(trigger_update_xml_t *ledger_update_xml)
 			//3-写入台账内容///////////////////////////////////

 			//4-配置映射文件//////////////////////////////
-			char model[64] = {0};
+			if (g_node_id != PQDIF_DATA_BASE_NODE_ID) {
+				char model[64] = {0};
    		// 获取模型ID，检查是否返回 NULL
    		parse_model_cfg_web_one(ied,&model);//存储在/FeProject/dat/

@@ -1163,6 +1211,11 @@ void process_ledger_update(trigger_update_xml_t *ledger_update_xml)
 			//5-报告块初始化///////////////////////////////////

 			//调试
+			}
+			else {
+				printf("[PQDIF] skip model xml and report init terminal=%s\n", ied_usr->terminal_id);
+			}
+
 			printf("ledger id: %s\n", ((ied_usr_t*)ied->channel[0].ied->usr_ext)->terminal_id);

 			//6-init_rem_dib_table//////////////////////////////
@@ -1232,7 +1285,8 @@ void process_ledger_update(trigger_update_xml_t *ledger_update_xml)
 				//3-写入台账内容////////////////////////////////////////////

 				//4-配置映射文件///////////////////////////////////////////
-				char model[64] = {0};
+				if (g_node_id != PQDIF_DATA_BASE_NODE_ID) {
+					char model[64] = {0};
    			// 获取模型ID，检查是否返回 NULL
    			parse_model_cfg_web_one(ied,&model);//存储在/FeProject/dat/

@@ -1266,6 +1320,11 @@ void process_ledger_update(trigger_update_xml_t *ledger_update_xml)
 				parse_rpt_log_ini_one(ied);
 				//5-报告块初始化///////////////////////////////////

+				}
+				else {
+					printf("[PQDIF] skip model xml and report init terminal=%s\n", ied_usr->terminal_id);
+				}
+
 				//6-init_rem_dib_table//////////////////////////////
 				init_rem_dib_table_one(ied);
 				//6-init_rem_dib_table///////////////////////////////////
@@ -1423,6 +1482,7 @@ void print_terminal(const terminal* tmnl) {
    printf("Device Type: %s\n", is_empty(tmnl->dev_type) ? "N/A" : tmnl->dev_type);
    printf("Device Key: %s\n", is_empty(tmnl->dev_key) ? "N/A" : tmnl->dev_key);
    printf("Device Series: %s\n", is_empty(tmnl->dev_series) ? "N/A" : tmnl->dev_series);
+    printf("Com Type: %s\n", is_empty(tmnl->com_type) ? "MMS" : tmnl->com_type);
    printf("Address: %s\n", is_empty(tmnl->addr_str) ? "N/A" : tmnl->addr_str);
    printf("Port: %s\n", is_empty(tmnl->port) ? "N/A" : tmnl->port);
    printf("Timestamp: %s\n", is_empty(tmnl->timestamp) ? "N/A" : tmnl->timestamp);
@@ -1634,12 +1694,19 @@ void CheckAllConnectedChannel()
 			if(DEBUGOPEN)printf("[FILEDIR] enter HandleFileDirReqForChannel");
 			HandleFileDirReqForChannel(chnl_usr);//文件目录请求
 		}
-
-		ChannelCheckIECReports(chnl_usr);//报告
+		if(g_node_id == PQDIF_DATA_BASE_NODE_ID){
+			ChannelCheckPQDIFFiles(chnl_usr);
+		}
+		else{
+			ChannelCheckIECReports(chnl_usr);//报告
+		}
+			
 		if ( (g_node_id == SOE_COMTRADE_BASE_NODE_ID) || (g_node_id == HIS_DATA_BASE_NODE_ID) || (g_node_id == NEW_HIS_DATA_BASE_NODE_ID) || (g_node_id == RECALL_HIS_DATA_BASE_NODE_ID) || (g_node_id == RECALL_ALL_DATA_BASE_NODE_ID))
 			ChannelCheckWaveFiles(chnl_usr);//录波文件
-		if(g_node_id == HIS_DATA_BASE_NODE_ID || g_node_id == NEW_HIS_DATA_BASE_NODE_ID || g_node_id == RECALL_HIS_DATA_BASE_NODE_ID || (g_node_id == RECALL_ALL_DATA_BASE_NODE_ID))
+		if(g_node_id == HIS_DATA_BASE_NODE_ID || g_node_id == NEW_HIS_DATA_BASE_NODE_ID || g_node_id == RECALL_HIS_DATA_BASE_NODE_ID || (g_node_id == RECALL_ALL_DATA_BASE_NODE_ID)
+			|| g_node_id == PQDIF_DATA_BASE_NODE_ID)
 			ChannelCheckIECLogs(chnl_usr);//补招文件
+
 		if ( (sGetMsTime() - chnl_usr->m_LastPosRespTime) > 15*1000 ) //wait 15 secs，隔15秒获取一次响应，两次没响应后关闭
 		{	
 			char** varnames ;
@@ -1981,6 +2048,361 @@ static ST_RET Write_Named_Var(LD_info_t	*LD_info,chnl_usr_t *chnl_usr,char* VarN
  

 #define  TICKS_PER_MIN 60LL*1000LL*1000LL
+
+/* PQDIF 文件召唤参数。
+ * C# 读取程序的默认周期是 2 小时，文件名形如：
+ *   PQMonitor_PQM1_20190401_1400_02.pqd
+ * 其中 “1_20190401_1400_” 用于匹配测点序号和时间片。
+ * 当前进程没有单独的手动时间窗输入，所以这里实现自动模式：
+ *   1. 每个终端按固定扫描间隔读取一次 /PQDIF/ 目录；
+ *   2. 只下载最近一个完整周期内、且测点序号匹配的 .pqd 文件；
+ *   3. 下载前检查 /FeProject/data/pqdif/ 下是否已有同名文件，避免重复下载。
+ */
+#define PQDIF_REMOTE_DIR             "/PQDIF/"
+#define PQDIF_LOCAL_DIR              "/FeProject/data/pqdif"
+#define PQDIF_AUTO_INTERVAL_HOURS    2
+#define PQDIF_SCAN_INTERVAL_MS       (60 * 1000)
+#define PQDIF_MAX_DEVICE_INDEX       4096
+#define PQDIF_MAX_FETCH_PER_SCAN     32
+
+static const char* pqdif_basename(const char* filename)
+{
+	const char* base = filename;
+	const char* p;
+
+	if (filename == NULL)
+		return "";
+
+	for (p = filename; *p != '\0'; ++p) {
+		if (*p == '/' || *p == '\\')
+			base = p + 1;
+	}
+	return base;
+}
+
+static int pqdif_has_pqd_suffix(const char* filename)
+{
+	size_t len;
+
+	if (filename == NULL)
+		return FALSE;
+
+	len = strlen(filename);
+	if (len < 4)
+		return FALSE;
+
+	return (filename[len - 4] == '.'
+		&& tolower((unsigned char)filename[len - 3]) == 'p'
+		&& tolower((unsigned char)filename[len - 2]) == 'q'
+		&& tolower((unsigned char)filename[len - 1]) == 'd');
+}
+
+static void pqdif_make_time_match(int cpu_no, time_t tm_value, char* out, size_t out_len)
+{
+	struct tm tm_local;
+
+	memset(&tm_local, 0, sizeof(tm_local));
+	localtime_r(&tm_value, &tm_local);
+
+	/* C# 目录匹配逻辑使用 “测点号_yyyyMMdd_HH00_” 作为关键片段。
+	 * 例如测点号 1、2026-07-17 10 点，对应 “1_20260717_1000_”。
+	 */
+	snprintf(out, out_len, "%d_%04d%02d%02d_%02d00_",
+		cpu_no % 10,
+		tm_local.tm_year + 1900,
+		tm_local.tm_mon + 1,
+		tm_local.tm_mday,
+		tm_local.tm_hour);
+}
+
+static int pqdif_use_interval_end_time(const char* dev_type)
+{
+	return (dev_type != NULL && strcmp(dev_type, "PS_NET_PQDIF") == 0);
+}
+
+static time_t pqdif_align_interval_start(long long sec)
+{
+	time_t hour_floor;
+	struct tm tm_local;
+	int hour_mod;
+
+	memset(&tm_local, 0, sizeof(tm_local));
+	hour_floor = (time_t)sec;
+	localtime_r(&hour_floor, &tm_local);
+	tm_local.tm_min = 0;
+	tm_local.tm_sec = 0;
+	hour_floor = mktime(&tm_local);
+
+	hour_mod = tm_local.tm_hour % PQDIF_AUTO_INTERVAL_HOURS;
+	return hour_floor - hour_mod * 3600;
+}
+
+static int pqdif_match_interval(const char* filename, int cpu_no, time_t interval_start, const char* dev_type)
+{
+	time_t name_time;
+	char time_match[64];
+
+	if (!pqdif_has_pqd_suffix(filename))
+		return FALSE;
+
+	if (cpu_no <= 0)
+		return FALSE;
+
+	/* C# 原逻辑按设备类型决定文件名时间：
+	 *   - 普通设备用周期开始时间；
+	 *   - PS_NET_PQDIF 用周期结束时间。
+	 * 这里保持同样规则，避免把普通设备下一周期的开始文件误认为本周期结束文件。
+	 */
+	name_time = interval_start;
+	if (pqdif_use_interval_end_time(dev_type))
+		name_time += PQDIF_AUTO_INTERVAL_HOURS * 3600;
+
+	pqdif_make_time_match(cpu_no, name_time, time_match, sizeof(time_match));
+	return strstr(filename, time_match) != NULL;
+}
+
+static int pqdif_match_recent_interval(const char* filename, int cpu_no, const char* dev_type)
+{
+	time_t now_time;
+	time_t interval_start;
+
+	now_time = time(NULL);
+	interval_start = pqdif_align_interval_start((long long)now_time) - PQDIF_AUTO_INTERVAL_HOURS * 3600;
+	return pqdif_match_interval(filename, cpu_no, interval_start, dev_type);
+}
+
+static int pqdif_ensure_local_dir()
+{
+#ifdef _OS_UNIX_
+	if (mkdir("/FeProject/data", 0777) != 0 && errno != EEXIST)
+		return SD_FAILURE;
+
+	if (mkdir(PQDIF_LOCAL_DIR, 0777) != 0 && errno != EEXIST)
+		return SD_FAILURE;
+#endif
+	return SD_SUCCESS;
+}
+
+static int pqdif_local_file_exists(const char* filename)
+{
+	char local_file[512];
+	const char* base = pqdif_basename(filename);
+
+	if (base[0] == '\0')
+		return FALSE;
+
+	snprintf(local_file, sizeof(local_file), "%s/%s", PQDIF_LOCAL_DIR, base);
+#ifdef _OS_UNIX_
+	return access(local_file, F_OK) == 0;
+#else
+	return FALSE;
+#endif
+}
+
+static void pqdif_build_remote_filename(const char* dir_filename, char* out, size_t out_len)
+{
+	if (dir_filename == NULL || dir_filename[0] == '\0') {
+		out[0] = '\0';
+		return;
+	}
+
+	/* mms_mvla_fdir 的返回值有两种可能：
+	 *   1. 带目录：/PQDIF/xxx.pqd
+	 *   2. 仅文件名：xxx.pqd
+	 * PQDIF 必须固定从 /PQDIF/ 取，所以仅返回文件名时要补齐远端目录。
+	 */
+	if (strchr(dir_filename, '/') != NULL || strchr(dir_filename, '\\') != NULL)
+		snprintf(out, out_len, "%s", dir_filename);
+	else
+		snprintf(out, out_len, "%s%s", PQDIF_REMOTE_DIR, dir_filename);
+}
+
+static int pqdif_get_file_from_device(chnl_usr_t *chnl_usr, const char *rem_filename, char *only_filename_ret, size_t only_filename_ret_len)
+{
+	int ret;
+	char loc_file_fullname[512];
+	char rem_file_fullname[512];
+	const char *only_filename;
+
+	if (chnl_usr == NULL || chnl_usr->net_info == NULL || rem_filename == NULL || rem_filename[0] == '\0')
+		return SD_FAILURE;
+
+	only_filename = pqdif_basename(rem_filename);
+	if (only_filename[0] == '\0')
+		return SD_FAILURE;
+
+	if (pqdif_ensure_local_dir() != SD_SUCCESS) {
+		echo_warn1("[PQDIF] create local dir failed: %s\n", PQDIF_LOCAL_DIR);
+		return SD_FAILURE;
+	}
+
+	memset(loc_file_fullname,0,sizeof(loc_file_fullname));
+	memset(rem_file_fullname,0,sizeof(rem_file_fullname));
+	apr_snprintf(loc_file_fullname,sizeof(loc_file_fullname),"%s/%s",PQDIF_LOCAL_DIR,only_filename);
+	apr_snprintf(rem_file_fullname,sizeof(rem_file_fullname),"%s",rem_filename);
+
+	if (only_filename_ret != NULL && only_filename_ret_len > 0)
+		apr_snprintf(only_filename_ret,only_filename_ret_len,"%s",only_filename);
+
+	printf("[PQDIF] mms_getFile local=%s remote=%s\n", loc_file_fullname, rem_file_fullname);
+
+	ret = mms_getFile(chnl_usr->net_info,loc_file_fullname,rem_file_fullname,g_pt61850app->mmsOpTimeout);
+	if (ret != SD_SUCCESS) {
+		echo_warn3("[PQDIF] mms_getFile failed IP=%s local=%s remote=%s\n",
+			chnl_usr->ip_str, loc_file_fullname, rem_file_fullname);
+		return ret;
+	}
+
+#ifdef _OS_UNIX_
+	{
+		struct stat st;
+
+		if (stat(loc_file_fullname, &st) != 0 || st.st_size <= 0) {
+			unlink(loc_file_fullname);
+			echo_warn2("[PQDIF] file is empty or invalid: %s from %s\n",
+				loc_file_fullname, rem_file_fullname);
+			return SD_FAILURE;
+		}
+	}
+#endif
+
+	return SD_SUCCESS;
+}
+
+static apr_status_t ChannelRecallPQDIFFiles(chnl_usr_t *chnl_usr, LD_info_t *LD_info, long long start_sec, long long end_sec)
+{
+	ied_t		*ied;
+	ied_usr_t	*ied_usr;
+	char		**filenames = NULL;
+	int			filenum = 0;
+	int			ret;
+	int			file_idx;
+	int			fetched = 0;
+	int			existed = 0;
+	int			missing = 0;
+	int			failed = 0;
+	time_t		interval_start;
+	time_t		interval_step;
+
+	if (chnl_usr == NULL || chnl_usr->chnl == NULL || chnl_usr->chnl->ied == NULL ||
+		chnl_usr->chnl->ied->usr_ext == NULL || chnl_usr->net_info == NULL ||
+		LD_info == NULL) {
+		printf("[PQDIF][RECALL] invalid context, skip\n");
+		return APR_EGENERAL;
+	}
+
+	if (LD_info->cpuno == 0 || LD_info->LD_name == NULL || LD_info->mp_id[0] == '\0') {
+		printf("[PQDIF][RECALL] invalid LD_info, skip\n");
+		return APR_EGENERAL;
+	}
+
+	if (end_sec <= start_sec) {
+		printf("[PQDIF][RECALL] invalid time range mp_id=%s start=%lld end=%lld\n",
+			LD_info->mp_id, start_sec, end_sec);
+		return APR_EGENERAL;
+	}
+
+	ied = chnl_usr->chnl->ied;
+	ied_usr = (ied_usr_t*)ied->usr_ext;
+
+	if (pqdif_ensure_local_dir() != SD_SUCCESS) {
+		echo_warn1("[PQDIF][RECALL] create local dir failed: %s\n", PQDIF_LOCAL_DIR);
+		return APR_EGENERAL;
+	}
+
+	/* 单点补招与 C# 手动/补招逻辑保持一致：
+	 * 1. 先读取装置 /PQDIF/ 目录；
+	 * 2. 按 PQDIF_AUTO_INTERVAL_HOURS 将补招时间范围切成多个文件周期；
+	 * 3. 普通设备用周期开始时间匹配文件名，PS_NET_PQDIF 用周期结束时间匹配文件名；
+	 * 4. 每个周期只取一份匹配文件，下载接口直接调用 mms_getFile。
+	 */
+	ret = mms_mvla_fdir(chnl_usr->net_info,(ST_CHAR*)PQDIF_REMOTE_DIR,
+		3*g_pt61850app->mmsOpTimeout,&filenames,&filenum,g_pt61850app->tmp_pool);
+	if (ret != SD_SUCCESS) {
+		echo_warn2("[PQDIF][RECALL] mms_mvla_fdir failed, IED=%d IP=%s\n", ied->id, chnl_usr->ip_str);
+		return APR_EGENERAL;
+	}
+
+	if (filenames == NULL || filenum <= 0) {
+		printf("[PQDIF][RECALL] no file in remote dir %s, mp_id=%s IP=%s\n",
+			PQDIF_REMOTE_DIR, LD_info->mp_id, chnl_usr->ip_str);
+		return APR_EGENERAL;
+	}
+
+	interval_step = PQDIF_AUTO_INTERVAL_HOURS * 3600;
+	interval_start = pqdif_align_interval_start(start_sec);
+
+	printf("[PQDIF][RECALL] begin mp_id=%s cpuno=%d range=%lld~%lld interval_start=%lld files=%d dev_type=%s\n",
+		LD_info->mp_id, LD_info->cpuno, start_sec, end_sec, (long long)interval_start,
+		filenum, ied_usr->dev_type);
+
+	while ((long long)interval_start < end_sec) {
+		int found_this_interval = FALSE;
+
+		for (file_idx = 0; file_idx < filenum; file_idx++) {
+			const char *base_name;
+			char remote_filename[256];
+			char only_filename_ret[256];
+			int ret_get;
+
+			if (filenames[file_idx] == NULL)
+				continue;
+
+			base_name = pqdif_basename(filenames[file_idx]);
+			if (base_name[0] == '\0')
+				continue;
+
+			if (!pqdif_match_interval(base_name, LD_info->cpuno, interval_start, ied_usr->dev_type))
+				continue;
+
+			found_this_interval = TRUE;
+			if (pqdif_local_file_exists(base_name)) {
+				existed++;
+				printf("[PQDIF][RECALL] local file exists, skip mp_id=%s interval=%lld file=%s\n",
+					LD_info->mp_id, (long long)interval_start, base_name);
+				break;
+			}
+
+			memset(remote_filename,0,sizeof(remote_filename));
+			memset(only_filename_ret,0,sizeof(only_filename_ret));
+			pqdif_build_remote_filename(filenames[file_idx], remote_filename, sizeof(remote_filename));
+			if (remote_filename[0] == '\0') {
+				failed++;
+				break;
+			}
+
+			ret_get = pqdif_get_file_from_device(chnl_usr, remote_filename, only_filename_ret, sizeof(only_filename_ret));
+			if (ret_get == SD_SUCCESS) {
+				fetched++;
+				chnl_usr->m_LastPosRespTime = sGetMsTime();
+				printf("[PQDIF][RECALL] fetch success mp_id=%s interval=%lld remote=%s local=%s/%s\n",
+					LD_info->mp_id, (long long)interval_start, remote_filename, PQDIF_LOCAL_DIR, only_filename_ret);
+			}
+			else {
+				failed++;
+				echo_warn3("[PQDIF][RECALL] fetch failed mp_id=%s remote=%s IP=%s\n",
+					LD_info->mp_id, remote_filename, chnl_usr->ip_str);
+			}
+			break;
+		}
+
+		if (!found_this_interval) {
+			missing++;
+			printf("[PQDIF][RECALL] no matched file mp_id=%s interval=%lld dev_type=%s\n",
+				LD_info->mp_id, (long long)interval_start, ied_usr->dev_type);
+		}
+
+		interval_start += interval_step;
+	}
+
+	printf("[PQDIF][RECALL] finish mp_id=%s fetched=%d existed=%d missing=%d failed=%d\n",
+		LD_info->mp_id, fetched, existed, missing, failed);
+
+	if (missing > 0 || failed > 0)
+		return APR_EGENERAL;
+
+	return APR_SUCCESS;
+}
 

 int pt61850_write_cn_file(chnl_usr_t	*chnl_usr, ied_t *ied, char	*rem_filename, char *only_filename_ret)
@@ -2026,6 +2448,140 @@ int pt61850_write_cn_file(chnl_usr_t	*chnl_usr, ied_t *ied, char	*rem_filename,
 	}
 	return ret;
 }
+
+static apr_status_t ChannelCheckPQDIFFiles(chnl_usr_t *chnl_usr)
+{
+	ied_t			*ied;
+	ied_usr_t		*ied_usr;
+	LD_info_t		*LD_info;
+	char			**filenames = NULL;
+	int				filenum = 0;
+	int				ret;
+	int				cpuno;
+	int				file_idx;
+	int				fetched = 0;
+	int				matched = 0;
+	int				scan_idx;
+	double			now_ms;
+	static double	s_last_scan_ms[PQDIF_MAX_DEVICE_INDEX] = {0};
+
+	if (chnl_usr == NULL || chnl_usr->chnl == NULL || chnl_usr->chnl->ied == NULL ||
+		chnl_usr->chnl->ied->usr_ext == NULL || chnl_usr->net_info == NULL) {
+		printf("[PQDIF] invalid channel context, skip scan\n");
+		return APR_EGENERAL;
+	}
+
+	ied = chnl_usr->chnl->ied;
+	ied_usr = (ied_usr_t*)ied->usr_ext;
+
+	/* CheckAllConnectedChannel 会轮询通道；这里按终端做节流，避免每次循环都读一次
+	 * /PQDIF/ 目录。目录读和文件下载都走 MMS，同一个终端一分钟扫描一次即可。
+	 */
+	scan_idx = ied_usr->dev_idx;
+	if (scan_idx < 0 || scan_idx >= PQDIF_MAX_DEVICE_INDEX)
+		scan_idx = (int)chnl_usr->chnl_id;
+	if (scan_idx < 0 || scan_idx >= PQDIF_MAX_DEVICE_INDEX)
+		scan_idx = 0;
+
+	now_ms = sGetMsTime();
+	if (s_last_scan_ms[scan_idx] > 0 &&
+		(now_ms - s_last_scan_ms[scan_idx]) < PQDIF_SCAN_INTERVAL_MS) {
+		return APR_SUCCESS;
+	}
+	s_last_scan_ms[scan_idx] = now_ms;
+
+	/* 本函数只做 PQDIF 文件获取：
+	 * 1. 从装置固定目录 /PQDIF/ 取文件列表；
+	 * 2. 用台账里的 LD_info->cpuno 匹配文件名里的 “测点号_yyyyMMdd_HH00_”；
+	 * 3. 只下载 .pqd 文件，且本地 /FeProject/data/pqdif/ 已存在同名文件时跳过；
+	 * 4. 真正下载直接调用 mms_getFile，不改动原录波文件下载函数。
+	 */
+	if (pqdif_ensure_local_dir() != SD_SUCCESS) {
+		echo_warn1("[PQDIF] create local dir failed: %s\n", PQDIF_LOCAL_DIR);
+		return APR_EGENERAL;
+	}
+
+	ret = mms_mvla_fdir(chnl_usr->net_info,(ST_CHAR*)PQDIF_REMOTE_DIR,
+		3*g_pt61850app->mmsOpTimeout,&filenames,&filenum,g_pt61850app->tmp_pool);
+	if (ret != SD_SUCCESS) {
+		echo_warn2("[PQDIF] mms_mvla_fdir failed, IED=%d IP=%s\n", ied->id, chnl_usr->ip_str);
+		return APR_EGENERAL;
+	}
+
+	if (filenames == NULL || filenum <= 0) {
+		printf("[PQDIF] no file in remote dir %s, IED=%d IP=%s\n", PQDIF_REMOTE_DIR, ied->id, chnl_usr->ip_str);
+		return APR_SUCCESS;
+	}
+
+	printf("[PQDIF] scan remote dir %s success, IED=%d IP=%s file_count=%d\n",
+		PQDIF_REMOTE_DIR, ied->id, chnl_usr->ip_str, filenum);
+
+	for (cpuno = 0; cpuno < ied->cpucount; cpuno++) {
+		LD_info = &(ied_usr->LD_info[cpuno]);
+
+		if (LD_info->cpuno == 0 ||
+			LD_info->LD_name == NULL ||
+			LD_info->mp_id[0] == '\0') {
+			continue;
+		}
+
+		for (file_idx = 0; file_idx < filenum; file_idx++) {
+			const char *base_name;
+			char remote_filename[256];
+			char only_filename_ret[256];
+			int ret_get;
+
+			if (filenames[file_idx] == NULL)
+				continue;
+
+			base_name = pqdif_basename(filenames[file_idx]);
+			if (base_name[0] == '\0')
+				continue;
+
+			/* C# 读取程序的兼容逻辑是读目录后按片段匹配：
+			 *   cpuNo%10_yyyyMMdd_HH00_
+			 * 这里保持同样的匹配方式，不依赖厂家前缀，也兼容普通设备用
+			 * 周期开始时间命名、振兴类设备用周期结束时间命名的差异。
+			 */
+			if (!pqdif_match_recent_interval(base_name, LD_info->cpuno, ied_usr->dev_type))
+				continue;
+
+			matched++;
+			if (pqdif_local_file_exists(base_name)) {
+				printf("[PQDIF] local file exists, skip mp_id=%s file=%s\n", LD_info->mp_id, base_name);
+				continue;
+			}
+
+			memset(remote_filename,0,sizeof(remote_filename));
+			memset(only_filename_ret,0,sizeof(only_filename_ret));
+			pqdif_build_remote_filename(filenames[file_idx], remote_filename, sizeof(remote_filename));
+			if (remote_filename[0] == '\0')
+				continue;
+
+			ret_get = pqdif_get_file_from_device(chnl_usr, remote_filename, only_filename_ret, sizeof(only_filename_ret));
+			if (ret_get == SD_SUCCESS) {
+				fetched++;
+				chnl_usr->m_LastPosRespTime = sGetMsTime();
+				printf("[PQDIF] fetch success mp_id=%s name=%s remote=%s local=%s/%s\n",
+					LD_info->mp_id, LD_info->name, remote_filename, PQDIF_LOCAL_DIR, only_filename_ret);
+			}
+			else {
+				echo_warn3("[PQDIF] fetch failed mp_id=%s remote=%s IP=%s\n",
+					LD_info->mp_id, remote_filename, chnl_usr->ip_str);
+			}
+
+			if (fetched >= PQDIF_MAX_FETCH_PER_SCAN) {
+				printf("[PQDIF] reach fetch limit per scan=%d, IED=%d IP=%s\n",
+					PQDIF_MAX_FETCH_PER_SCAN, ied->id, chnl_usr->ip_str);
+				return APR_SUCCESS;
+			}
+		}
+	}
+
+	printf("[PQDIF] scan finish IED=%d IP=%s matched=%d fetched=%d\n",
+		ied->id, chnl_usr->ip_str, matched, fetched);
+	return APR_SUCCESS;
+}
 
 apr_status_t prepare_call_cn_wavelist(LD_info_t	*LD_info, int FltNum)
 {
@@ -2467,4 +3023,3 @@ char* convertMsToDateTimeString(int64_t usTime) {

    return buffer;
 }
-  
--- a/mms/mmscli_rpt.c
+++ b/mms/mmscli_rpt.c
@@ -993,6 +993,7 @@ ST_VOID u_iec_rpt_ind_data_by_devtype(MVL_VAR_ASSOC** info_va,
 			ied = find_ied_from_dev_code(LD_info->terminal_code);

 			ied_usr_t* ied_usr = (ied_usr_t*)ied->usr_ext;
+			json_trace_block_create_start(LD_info->voltage_level, LD_info->mp_id, rptinfo->flickerflag, ied_usr->dev_type, LD_info->line_id, LD_info->v_wiring_type, rcb_info->RptID, rptinfo->rptNo);

 			if (rptinfo->flickerflag==1)//CZY 2023-08-17 WW 2022-11-14 只有闪变和第一次进入才会初始化 json_block_create_start(LD_info->line_id);
 				json_block_create_start( LD_info->voltage_level, LD_info->mp_id, rptinfo->flickerflag, ied_usr->dev_type, LD_info->line_id);
@@ -1057,6 +1058,7 @@ ST_VOID u_iec_rpt_ind_data_by_devtype(MVL_VAR_ASSOC** info_va,
 						}
 						else {
 							json_block_create_flag(LD_info->mp_id, flag, rptinfo->flickerflag);
+							json_trace_block_create_flag(LD_info->mp_id, flag, rptinfo->flickerflag, rcb_info->RptID, rptinfo->rptNo);
 							not_set_rpt_q_this = FALSE;
 						}
 					}
@@ -1076,6 +1078,7 @@ ST_VOID u_iec_rpt_ind_data_by_devtype(MVL_VAR_ASSOC** info_va,
 						}
 						else {
 							json_block_create_time(LD_info->mp_id, t / 1000, rptinfo->flickerflag);
+							json_trace_block_create_time(LD_info->mp_id, t / 1000, rptinfo->flickerflag, rcb_info->RptID, rptinfo->rptNo);
 							printf("rcb_info->RptID=%s ,LineId=%d , Timestamp= %lld \n", rcb_info->RptID, LD_info->line_id, t / 1000);
 							not_set_rpt_TimeID_this = FALSE;
 							/*if (strstr(rcb_info->RptID, "LLN0$RP$urcbRealData")) {//lnk 20250624
@@ -1108,8 +1111,10 @@ ST_VOID u_iec_rpt_ind_data_by_devtype(MVL_VAR_ASSOC** info_va,
 					else if (strstr(rcb_info->RptID, "RDRE")) {//CZY 2023-08-17 WW 2022-11-14 修改判断LLN0$BR$brcbRDRE
 						processRDRE_data(LD_info, FULL_FCDA_Name, v);
 					}
-					else
+					else {
 						json_block_create_data(LD_info->mp_id, FULL_FCDA_Name, v, rptinfo->flickerflag);
+						json_trace_block_create_data(LD_info->mp_id, FULL_FCDA_Name, v, rptinfo->flickerflag, rcb_info->RptID, rptinfo->rptNo);
+					}
 				}//else			   	
 			}
 		}
@@ -1126,6 +1131,7 @@ ST_VOID u_iec_rpt_ind_data_by_devtype(MVL_VAR_ASSOC** info_va,
 		}
 		else {
 			printf("%d : %d", LD_info->rptRecvFlag, LD_info->rptRecvCheckFlag);
+			json_trace_block_create_end(LD_info->v_wiring_type, LD_info->mp_id, rptinfo->flickerflag, rcb_info->RptID, rptinfo->rptNo);
 			//append_db_records(RPT_IDX);
 			if (rptinfo->flickerflag==1)//CZY 2023-08-17 WW 2022-11-14 增加闪变标志
 			{
@@ -1376,6 +1382,7 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va,
 			ied = find_ied_from_dev_code(LD_info->terminal_code);

 			ied_usr_t* ied_usr = (ied_usr_t*)ied->usr_ext;
+			json_trace_block_create_start(LD_info->voltage_level, LD_info->mp_id, rptinfo->flickerflag, ied_usr->dev_type, LD_info->line_id, LD_info->v_wiring_type, rcb_info->RptID, rptinfo->rptNo);
 			if (rptinfo->flickerflag == 1)//CZY 2023-08-17 WW 2022-11-14 只有闪变和第一次进入才会初始化 json_block_create_start(LD_info->line_id);
 				json_block_create_start(LD_info->voltage_level, LD_info->mp_id, rptinfo->flickerflag, ied_usr->dev_type, LD_info->line_id);
 			else if (rptinfo->flickerflag == 0) {
@@ -1461,6 +1468,7 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va,
 						}
 						else {
 							json_block_create_flag(LD_info->mp_id, flag, rptinfo->flickerflag);
+							json_trace_block_create_flag(LD_info->mp_id, flag, rptinfo->flickerflag, rcb_info->RptID, rptinfo->rptNo);
 							not_set_rpt_q_this = FALSE;
 						}
 					}
@@ -1484,6 +1492,7 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va,
 						}
 						else {
 							json_block_create_time(LD_info->mp_id, t / 1000, rptinfo->flickerflag);
+							json_trace_block_create_time(LD_info->mp_id, t / 1000, rptinfo->flickerflag, rcb_info->RptID, rptinfo->rptNo);
 							printf("rcb_info->RptID=%s ,LineId=%d , Timestamp= %lld \n", rcb_info->RptID, LD_info->line_id, t / 1000);
 							not_set_rpt_TimeID_this = FALSE;
 							//if (strstr(rcb_info->RptID, "LLN0$RP$urcbRealData")) {
@@ -1497,6 +1506,7 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va,
 									printf("rtdata RptID match");
 									if (urcbRealDataHasReceived(ied_usr->dev_idx,rpt_no,LD_info, t / 1000)){//判断时间重复
 										printf("this rt report Time repeats");
+										//json_trace_block_create_end(LD_info->v_wiring_type, LD_info->mp_id, rptinfo->flickerflag, rcb_info->RptID, rptinfo->rptNo);
 										return;
 									}
 								}								
@@ -1531,8 +1541,10 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va,
 						ied_usr_t* ied_usr = GET_IEDEXT_ADDR(ied);
 						processGGIO_start_data_end(LD_info->mp_id, FULL_FCDA_Name, v, time, ied_usr->dev_type, LD_info->line_id);//GGIO数据全套处理流程
 					}
-					else
+					else {
 						json_block_create_data(LD_info->mp_id, FULL_FCDA_Name, v, rptinfo->flickerflag);
+						json_trace_block_create_data(LD_info->mp_id, FULL_FCDA_Name, v, rptinfo->flickerflag, rcb_info->RptID, rptinfo->rptNo);
+					}
 				}//else			   	
 			}

@@ -1550,6 +1562,7 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va,
 		}
 		else {
 			printf("%d : %d", LD_info->rptRecvFlag, LD_info->rptRecvCheckFlag);
+			json_trace_block_create_end(LD_info->v_wiring_type, LD_info->mp_id, rptinfo->flickerflag, rcb_info->RptID, rptinfo->rptNo);
 			//append_db_records(RPT_IDX);
 			if (rptinfo->flickerflag == 1)//CZY 2023-08-17 WW 2022-11-14 增加闪变标志
 			{
--- a/mms/rdb_client.c
+++ b/mms/rdb_client.c
@@ -205,27 +205,32 @@ apr_status_t init_rdb()
 		//台账读取过后初始化各级的日志
 		init_loggers();

-		rv = parse_model_cfg_web();
-		if (rv != APR_SUCCESS) {//不可能
-			echo_errg("Parsed model with error,try to run! \n");
+		if (g_node_id != PQDIF_DATA_BASE_NODE_ID) {
+			rv = parse_model_cfg_web();
+			if (rv != APR_SUCCESS) {//不可能
+				echo_errg("Parsed model with error,try to run! \n");

-			//char buf[256];
-			//format_log_msg(buf,sizeof(buf),"前置的%s%d号进程调用web模型接口失败", get_front_msg_from_subdir(), g_front_seg_index);
-			//log_error("process", buf);
-			DIY_ERRORLOG_CODE("process",0,LOG_CODE_ICD_AND_DOWNLOAD,"【ERROR】前置的%s%d号进程调用web模型接口失败", get_front_msg_from_subdir(), g_front_seg_index);
+				//char buf[256];
+				//format_log_msg(buf,sizeof(buf),"前置的%s%d号进程调用web模型接口失败", get_front_msg_from_subdir(), g_front_seg_index);
+				//log_error("process", buf);
+				DIY_ERRORLOG_CODE("process",0,LOG_CODE_ICD_AND_DOWNLOAD,"【ERROR】前置的%s%d号进程调用web模型接口失败", get_front_msg_from_subdir(), g_front_seg_index);

-			return rv;
+				return rv;
+			}
+
+			Set_xml_nodeinfo();//解析xml模型
+
+			rv = parse_rpt_log_ini();//报告块初始化
+			if (rv != APR_SUCCESS) {
+				echo_errg("Failed to parse report log define ini file! \n");
+
+				DIY_ERRORLOG_CODE("process",0,LOG_CODE_RPTINIT,"【ERROR】前置的%s%d号进程报告初始化失败", get_front_msg_from_subdir(), g_front_seg_index);
+
+				return rv;
+			}
 		}
-
-		Set_xml_nodeinfo();//解析xml模型
-
-		rv = parse_rpt_log_ini();//报告块初始化
-		if (rv != APR_SUCCESS) {
-			echo_errg("Failed to parse report log define ini file! \n");
-
-			DIY_ERRORLOG_CODE("process",0,LOG_CODE_RPTINIT,"【ERROR】前置的%s%d号进程报告初始化失败", get_front_msg_from_subdir(), g_front_seg_index);
-
-			return rv;
+		else {
+			printf("[PQDIF] skip model xml and report init in init_rdb\n");
 		}
 	}

@@ -311,6 +316,9 @@ apr_status_t run_protocol()
 			else if (g_node_id == SOE_COMTRADE_BASE_NODE_ID) {//暂态录波
 				ServerPort = SOCKET_PORT + SOE_COMTRADE_BASE_NODE_ID +  g_front_seg_index;
 			}
+			else if (g_node_id == PQDIF_DATA_BASE_NODE_ID) {
+				ServerPort = SOCKET_PORT + PQDIF_DATA_BASE_NODE_ID +  g_front_seg_index;
+			}

 			struct sockaddr_in server_sockaddr;
 			memset(&server_sockaddr, 0, sizeof(server_sockaddr));
@@ -351,6 +359,9 @@ apr_status_t run_protocol()
 			else if (g_node_id == SOE_COMTRADE_BASE_NODE_ID) {//暂态录波
 				HTTP_PORT = HTTP_PORT + SOE_COMTRADE_BASE_NODE_ID +  g_front_seg_index;
 			}
+			else if (g_node_id == PQDIF_DATA_BASE_NODE_ID) {
+				HTTP_PORT = HTTP_PORT + PQDIF_DATA_BASE_NODE_ID +  g_front_seg_index;
+			}
 			printf("try_start_web_http_thread \n");
 			try_start_web_http_thread();
 			printf("try_start_http_thread \n");
--- a/mms/rdb_client.h
+++ b/mms/rdb_client.h
@@ -337,6 +337,7 @@ struct ied_usr_t{
 	char		dev_type[256];	/**< 设备类型                     */
 	char		dev_key[256];	/**< 设备秘钥                     */
 	char		dev_series[256]; /**< 设备识别码                     */
+	char		com_type[32];	/**< 通讯类型 mms/pqdif             */
 	int			dev_flag;		/**< 设备标志                     */
 	void		*cookie;
 	double		last_call_wavelist_time ; //上次召录波列表时间
--- a/set_process.sh
+++ b/set_process.sh
@@ -329,6 +329,7 @@ handle_reset() {
 			sed -i '/cfg_recallhis_data/d' /FeProject/etc/runtime.cf
 			sed -i '/cfg_3s_data/d' /FeProject/etc/runtime.cf
 			sed -i '/cfg_soe_comtrade/d' /FeProject/etc/runtime.cf
+			sed -i '/cfg_pqdif_data/d' /FeProject/etc/runtime.cf
 			sed -i '/fe_watchdog/d' /FeProject/etc/runtime.cf
 			
 			# 根据进程号添加对应进程配置
@@ -340,6 +341,7 @@ handle_reset() {
 				sed -i "2a\\$(printf '/FeProject/bin/ ^ pt61850netd_pqfe -d cfg_recallhis_data -s 1_1^ ^ ^ 1 ^                ^\n')" /FeProject/etc/runtime.cf
 				sed -i "2a\\$(printf '/FeProject/bin/ ^ pt61850netd_pqfe -d cfg_3s_data^ ^ ^ 1 ^                ^\n')" /FeProject/etc/runtime.cf
 				sed -i "2a\\$(printf '/FeProject/bin/ ^ pt61850netd_pqfe -d cfg_soe_comtrade^ ^ ^ 1 ^                ^\n')" /FeProject/etc/runtime.cf
+				sed -i "2a\\$(printf '/FeProject/bin/ ^ pt61850netd_pqfe -d cfg_pqdif_data^ ^ ^ 1 ^                ^\n')" /FeProject/etc/runtime.cf
 				
 			else
 				#看门狗固定放在第一个，防止stop时会把要杀死的进程重启
@@ -353,6 +355,7 @@ handle_reset() {
 				#以下部分没有多进程
 				sed -i "2a\\$(printf '/FeProject/bin/ ^ pt61850netd_pqfe -d cfg_3s_data^ ^ ^ 1 ^                ^\n')" /FeProject/etc/runtime.cf
 				sed -i "2a\\$(printf '/FeProject/bin/ ^ pt61850netd_pqfe -d cfg_soe_comtrade^ ^ ^ 1 ^                ^\n')" /FeProject/etc/runtime.cf
+				sed -i "2a\\$(printf '/FeProject/bin/ ^ pt61850netd_pqfe -d cfg_pqdif_data^ ^ ^ 1 ^                ^\n')" /FeProject/etc/runtime.cf
 				
 			fi
Author	SHA1	Message	Date
lnk	9f74ada894	pqdif进程跳过xml和报告初始化	2026-07-20 16:29:23 +08:00
lnk	86dc51d066	添加单点补招pqdif文件的逻辑	2026-07-17 16:25:44 +08:00
lnk	abc5f9e735	添加pqdif处理函数	2026-07-17 15:58:19 +08:00
lnk	0e2ade351c	台账更新添加comtype	2026-07-17 13:57:45 +08:00
lnk	fe16beb188	初始化添加pqdif判断，新增pqdif进程	2026-07-17 11:15:16 +08:00
lnk	45d139e628	最多只记录一次原始数据	2026-07-14 14:20:23 +08:00
lnk	111ffa36bd	数据追踪原始报告块	2026-07-07 16:32:48 +08:00
lnk	d78cef25a0	数据追踪增加接线方式和来源	2026-07-03 14:43:13 +08:00
lnk	c0860a48d6	长闪不发空数据	2026-06-25 10:04:26 +08:00
lnk	62a9742287	长闪不发送空数据	2026-06-24 16:39:35 +08:00