From 129e2fc17c5e46c395a42b486a9a64aa69f5ee83 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Tue, 9 Mar 2021 20:42:33 +0800 Subject: [PATCH] =?UTF-8?q?ft:=20rumTime=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/{utTime.erl => rumTime.erl} | 4 ++-- src/utils/{utTime.hrl => rumTime.hrl} | 0 src/utils/rumUtil.erl | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) rename src/utils/{utTime.erl => rumTime.erl} (99%) rename src/utils/{utTime.hrl => rumTime.hrl} (100%) diff --git a/src/utils/utTime.erl b/src/utils/rumTime.erl similarity index 99% rename from src/utils/utTime.erl rename to src/utils/rumTime.erl index fc71408..3134972 100644 --- a/src/utils/utTime.erl +++ b/src/utils/rumTime.erl @@ -1,5 +1,5 @@ --module(utTime). --include("utTime.hrl"). +-module(rumTime). +-include("rumTime.hrl"). -import(calendar, [day_of_the_week/1, day_of_the_week/3, iso_week_number/1, date_to_gregorian_days/1]). diff --git a/src/utils/utTime.hrl b/src/utils/rumTime.hrl similarity index 100% rename from src/utils/utTime.hrl rename to src/utils/rumTime.hrl diff --git a/src/utils/rumUtil.erl b/src/utils/rumUtil.erl index 52a0200..c29a414 100644 --- a/src/utils/rumUtil.erl +++ b/src/utils/rumUtil.erl @@ -280,8 +280,8 @@ calcNextRotate([OneSpec | Spec], NDate, NTime, NowDataTime) -> calcNextRotate(Spec, NDate, {NHour, SMinute, 0}, NowDataTime); _ -> %% rotation is next hour - NexSec = utTime:lDateTimeToSec(NowDataTime) + 3600, - {NNDate, NNTime} = utTime:secToLDateTime(NexSec), + NexSec = rumTime:lDateTimeToSec(NowDataTime) + 3600, + {NNDate, NNTime} = rumTime:secToLDateTime(NexSec), {NewHour, _, _} = NNTime, calcNextRotate(Spec, NNDate, {NewHour, SMinute, 0}, NowDataTime) end; @@ -292,12 +292,12 @@ calcNextRotate([OneSpec | Spec], NDate, NTime, NowDataTime) -> calcNextRotate(Spec, NDate, {SHour, 0, 0}, NowDataTime); _ -> %% rotation is not today - NexSec = utTime:lDateTimeToSec(NowDataTime) + 86400, - {NNDate, _NNTime} = utTime:secToLDateTime(NexSec), + NexSec = rumTime:lDateTimeToSec(NowDataTime) + 86400, + {NNDate, _NNTime} = rumTime:secToLDateTime(NexSec), calcNextRotate(Spec, NNDate, {SHour, 0, 0}, NowDataTime) end; {day, SDay} -> - CurDay = utTime:weekDay(NDate), + CurDay = rumTime:weekDay(NDate), AdjustedDay = case SDay of 0 -> 7;