yumoqing/apppublic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2026-05-14 15:00:49 +08:00
parent cb8269d1e5
commit b4d53d75af
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
appPublic/timeUtils.py
View File

@ -168,18 +168,18 @@ def StepedTimestamp(baseTs,ts,step) :
def timestampAdd(ts1,ts2) : def timestampAdd(ts1,ts2) :
t1 = time.strptime(ts1,DTFORMAT) t1 = time.strptime(ts1,DTFORMAT)
tf = time.mktime(t1) tf = time.mktime(t1)
if type(ts2)=='' : if isinstance(ts2, str):
t2 = time.strptime(ts2,DTFORMAT) t2 = time.strptime(ts2,DTFORMAT)
ts2 = time.mktime(t2) ts2 = time.mktime(t2)
tf += ts2 tf += ts2
t = time.localtime(tf) return tf
return TimeStamp(t)
def timestampSub(ts1,ts2) : def timestampSub(ts1,ts2) :
t1 = time.strptime(ts1,DTFORMAT) t1 = time.strptime(ts1,DTFORMAT)
t2 = time.strptime(ts2,DTFORMAT) if isinstance(ts2, str):
t2 = time.strptime(ts2,DTFORMAT)
ret = time.mktime(t1) - time.mktime(t2) ret = time.mktime(t1) - time.mktime(t2)
return int(ret) return ret
def timestamp2dt(t): def timestamp2dt(t):
return datetime.fromtimestamp(t) return datetime.fromtimestamp(t)