This commit is contained in:
lnk
2025-05-21 10:45:44 +08:00
parent 3ad2e7c590
commit 3e29e17829
2 changed files with 5 additions and 6 deletions

View File

@@ -1811,14 +1811,14 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info )
} }
double s_or_ms; double s_or_ms;
long long utc_or_beijing; long long utc_or_beijing;
if(cfg1.UnitOfTimeUnit == "1"){//持续时间上送的是秒1还是毫秒0 if(strcmp(cfg1.UnitOfTimeUnit, "1") == 0){//持续时间上送的是秒1还是毫秒0
s_or_ms = 0.001; s_or_ms = 0.001;
} }
else{ else{
s_or_ms = 1.0; s_or_ms = 1.0;
} }
if(cfg1.ValueOfTimeUnit == "utc"){//持续时间上送的是秒1还是毫秒0 if(strcmp(cfg1.ValueOfTimeUnit, "utc") == 0){//上送的是utc还是北京
utc_or_beijing = 28800000; utc_or_beijing = 28800000;
} }
else{ else{

View File

@@ -536,14 +536,14 @@ void processQVVR_end(LD_info_t* LD_info)
} }
double s_or_ms; double s_or_ms;
long long utc_or_beijing; long long utc_or_beijing;
if(cfg.UnitOfTimeUnit == "1"){//持续时间上送的是秒1还是毫秒0 if(strcmp(cfg.UnitOfTimeUnit, "1") == 0){//持续时间上送的是秒1还是毫秒0
s_or_ms = 0.001; s_or_ms = 0.001;
} }
else{ else{
s_or_ms = 1.0; s_or_ms = 1.0;
} }
if(cfg.ValueOfTimeUnit == "utc"){//上送的是utc还是北京 if(strcmp(cfg.ValueOfTimeUnit, "utc") == 0){//上送的是utc还是北京
utc_or_beijing = 28800000; utc_or_beijing = 28800000;
} }
else{ else{
@@ -572,8 +572,7 @@ void processQVVR_end(LD_info_t* LD_info)
//添加时间判断lnk20250311当前的时间减去找到的时间应该等于持续时间 //添加时间判断lnk20250311当前的时间减去找到的时间应该等于持续时间
if (fabs((LD_info->qvvr[LD_info->qvvr_idx].QVVR_time - LD_info->qvvr[i].QVVR_time)/1.0 //判断秒还是毫秒 if (fabs((LD_info->qvvr[LD_info->qvvr_idx].QVVR_time - LD_info->qvvr[i].QVVR_time)/1.0 //判断秒还是毫秒
- LD_info->qvvr[LD_info->qvvr_idx].QVVR_PerTime/s_or_ms) > 1.0){ - LD_info->qvvr[LD_info->qvvr_idx].QVVR_PerTime/s_or_ms) > 1.0){
printf("~~~~~~~fail in pair qvvr node %f~~~~~~~~~~ \n",fabs((LD_info->qvvr[LD_info->qvvr_idx].QVVR_time - LD_info->qvvr[i].QVVR_time)/1.0 printf("~~~~~~~fail in pair qvvr node %f~~~~~~~~~~ \n",fabs((LD_info->qvvr[LD_info->qvvr_idx].QVVR_time - LD_info->qvvr[i].QVVR_time)/1.0 - LD_info->qvvr[LD_info->qvvr_idx].QVVR_PerTime/s_or_ms));
- LD_info->qvvr[LD_info->qvvr_idx].QVVR_PerTime/s_or_ms));
continue; continue;
} }