diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp index 665ef88..92503f2 100644 --- a/scheduler/schedule.cpp +++ b/scheduler/schedule.cpp @@ -212,19 +212,19 @@ long SensorScheduler::CalcNextTimestamp(int id) { } if (send_wave_ts > 0 && available_ts > 0) { long min_ts = std::min(send_wave_ts, available_ts); - zlog_debug(zct, "[%d] next feature send utc time1:%s", id, GetUTCTime(min_ts).c_str()); + zlog_warn(zct, "[%d] next feature send utc time1:%s", id, GetUTCTime(min_ts).c_str()); return min_ts; } if (send_wave_ts + available_ts > 0) { long max_ts = std::max(send_wave_ts, available_ts); - zlog_debug(zct, "[%d] next feature send utc time2:%s", id, GetUTCTime(max_ts).c_str()); + zlog_warn(zct, "[%d] next feature send utc time2:%s", id, GetUTCTime(max_ts).c_str()); return max_ts; } } // 如果是在当前波形时间窗中,不管是空闲时间窗,还是发送波形的时间窗,下一个时间窗是特征值 long available_ts = current_wave_start_ts_ + (nth_eigen_value_slice_ + 1)* eigen_value_send_interval_ + (id - 1) * eigen_value_send_duration_; - zlog_debug(zct, "[%d] next feature send utc time3:[%s]", id, GetUTCTime(available_ts).c_str()); + zlog_warn(zct, "[%d] next feature send utc time3:[%s]", id, GetUTCTime(available_ts).c_str()); return available_ts; } @@ -263,7 +263,7 @@ int SensorScheduler::StartSchedule(int short_addr, int &next_duration) { nth_eigen_value_slice_ = seconds_in_current_wave_slice_ / eigen_value_send_interval_; seconds_in_current_eigen_slice_ = seconds_in_current_wave_slice_ % eigen_value_send_interval_; ts_in_eigen_slice_ = true; - if (seconds_in_current_eigen_slice_ > eigen_value_slice_total_seconds_ - 3) { + if (seconds_in_current_eigen_slice_ > eigen_value_slice_total_seconds_ - 2) { ts_in_eigen_slice_ = false; } @@ -272,32 +272,32 @@ int SensorScheduler::StartSchedule(int short_addr, int &next_duration) { } else { nth_wave_slice_ = (seconds_in_current_eigen_slice_ - eigen_value_slice_total_seconds_ + 3) / seconds_per_wave_slice_; } - zlog_debug(zct, "[%d] current utc:%s, nth eigen_value slice:%d, seconds in eigen slice:%d, eigen slice:%d", + zlog_warn(zct, "[%d] current utc:%s, nth eigen_value slice:%d, seconds in eigen slice:%d, eigen slice:%d", id, GetUTCTime(current_ts_).c_str(), nth_eigen_value_slice_+1, seconds_in_current_eigen_slice_, ts_in_eigen_slice_); if (ts_in_eigen_slice_) { if (id == nth_eigen_slice_ + 1) { // 传感器需要执行上送特征值任务, 如果有配置需要下发的话,下发配置 if (update_.count(id)) { // execute config - zlog_debug(zct, "[%d] update config in eigen slice", id); + zlog_warn(zct, "[%d] update config in eigen slice", id); current_request_ = kScheduleConfigSensor; return kScheduleConfigSensor; } else { // 执行上送特征值任务 - zlog_debug(zct, "[%d] send eigen value in eigen slice", id); + zlog_warn(zct, "[%d] send eigen value in eigen slice", id); current_request_ = kScheduleEigenValue; return kScheduleEigenValue; } } else { - zlog_debug(zct, "[%d] Invalid request, revive in %d eigen slice", id, nth_eigen_slice_ + 1); + zlog_warn(zct, "[%d] Invalid request, revive in %d eigen slice", id, nth_eigen_slice_ + 1); if (id < nth_eigen_slice_ + 1) { // 不正确的请求 long available_ts = current_wave_start_ts_ + (nth_eigen_value_slice_ + 1) * eigen_value_send_interval_ + (id - 1) * eigen_value_send_duration_; - zlog_debug(zct, "[%d] wrong time in eigen slice, next feature in next interval send utc time:[%s]", id, GetUTCTime(available_ts).c_str()); + zlog_warn(zct, "[%d] wrong time in eigen slice, next feature in next interval send utc time:[%s]", id, GetUTCTime(available_ts).c_str()); next_duration = available_ts - current_ts_; } else { long available_ts = current_wave_start_ts_ + nth_eigen_value_slice_ * eigen_value_send_interval_ + (id - 1) * eigen_value_send_duration_; - zlog_debug(zct, "[%d] wrong time in eigen slice, next feature in current interval send utc time:[%s]", id, GetUTCTime(available_ts).c_str()); + zlog_warn(zct, "[%d] wrong time in eigen slice, next feature in current interval send utc time:[%s]", id, GetUTCTime(available_ts).c_str()); next_duration = available_ts - current_ts_; } return kScheduleWrongTime;