diff --git a/mms/mms_process.c b/mms/mms_process.c index 266875b..7f1f167 100644 --- a/mms/mms_process.c +++ b/mms/mms_process.c @@ -1811,14 +1811,14 @@ apr_status_t call_cn_wavelist(LD_info_t *LD_info ) } double s_or_ms; long long utc_or_beijing; - if(cfg1.UnitOfTimeUnit == "1"){//持续时间上送的是秒1还是毫秒0 + if(strcmp(cfg1.UnitOfTimeUnit, "1") == 0){//持续时间上送的是秒1还是毫秒0 s_or_ms = 0.001; } else{ s_or_ms = 1.0; } - if(cfg1.ValueOfTimeUnit == "utc"){//持续时间上送的是秒1还是毫秒0 + if(strcmp(cfg1.ValueOfTimeUnit, "utc") == 0){//上送的是utc还是北京 utc_or_beijing = 28800000; } else{ diff --git a/mms/rdb_ext_utils.c b/mms/rdb_ext_utils.c index 459e9bd..e2f8e82 100644 --- a/mms/rdb_ext_utils.c +++ b/mms/rdb_ext_utils.c @@ -536,14 +536,14 @@ void processQVVR_end(LD_info_t* LD_info) } double s_or_ms; long long utc_or_beijing; - if(cfg.UnitOfTimeUnit == "1"){//持续时间上送的是秒1还是毫秒0 + if(strcmp(cfg.UnitOfTimeUnit, "1") == 0){//持续时间上送的是秒1还是毫秒0 s_or_ms = 0.001; } else{ s_or_ms = 1.0; } - if(cfg.ValueOfTimeUnit == "utc"){//上送的是utc还是北京 + if(strcmp(cfg.ValueOfTimeUnit, "utc") == 0){//上送的是utc还是北京 utc_or_beijing = 28800000; } else{ @@ -572,8 +572,7 @@ void processQVVR_end(LD_info_t* LD_info) //添加时间判断lnk20250311,当前的时间减去找到的时间应该等于持续时间 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){ - 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)); + 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)); continue; }