lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix realdata in different icd

Browse Source
This commit is contained in:
lnk
2025-06-24 17:15:18 +08:00
parent aabc9c4063
commit 7c190cb658
5 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
json/save2json.cpp
View File

@@ -138,7 +138,8 @@ bool showinshellflag =false;
///////////////////////////////////////////////////////////////////////////////
const int MAX_LIST_SIZE = 16;
static QMap<int, QList<long long> > real_data_report_map;
//static QMap<int, QList<long long> > real_data_report_map;
static QMap<int, QMap<int, QList<long long>>> real_data_report_map; //多个监测点的多个实时报告的时间列表lnk20250624
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，用于保存各条线路的闪变数据
@@ -156,9 +157,9 @@ bool is_blank(const std::string& str)
///////////////////////////////////////////////////////////////////////////////////
int urcbRealDataHasReceived(int dev_index, LD_info_t* LD_info, long long Time)
int urcbRealDataHasReceived(int dev_index, int rptNo, LD_info_t* LD_info, long long Time) //增加报告入参lnk20250624
{
QList<long long>& ts_list = real_data_report_map[LD_info->line_id];
QList<long long>& ts_list = real_data_report_map[LD_info->line_id][rptNo];
bool bFind = ts_list.contains(Time); //实时数据时间链表
if (bFind == false) {
ts_list.append(Time);
@@ -167,7 +168,8 @@ int urcbRealDataHasReceived(int dev_index, LD_info_t* LD_info, long long Time)
//lnk20241223每收到一次实时数据就检查一下数量
int real_report_count = 0;
real_report_count = get_real_report_count(LD_info);
//real_report_count = get_real_report_count(LD_info);
real_report_count = LD_info->rptinfo[rptNo]->count;//lnk20250624
//调试
std::cout << "real_report_count is" << real_report_count << std::endl;