|
|
@@ -53,7 +53,12 @@ print(f"当前客户端版本：{severVersion}/白板版本：{displayVersion}")
|
|
|
print(f"当前服务器为:【{ServerClas}】")
|
|
|
print(f"当前服务器航班数据传输模式为:【{flightDataTransfer}】")
|
|
|
print(f"当前服务器显示计算请求模式为:【{displayDataTransfer}】")
|
|
|
-
|
|
|
+VinA1="328"
|
|
|
+VinA2="328"
|
|
|
+VinA3="328"
|
|
|
+VinB1="328"
|
|
|
+VinB2="328"
|
|
|
+VinB3="328"
|
|
|
# 获取本地IP地址
|
|
|
def get_local_ip():
|
|
|
try:
|
|
|
@@ -304,6 +309,68 @@ def maintainAuthCheck(name,flighttype):
|
|
|
print(datetime.datetime.now(), "[%s]维修权限验证"%remote_addr)
|
|
|
return res
|
|
|
|
|
|
+def updatetimer1():
|
|
|
+ global VinA1, VinA2,VinA3,VinB1, VinB2, VinB3
|
|
|
+ #print(VinA1, VinA2,VinA3,VinB1, VinB2, VinB3)
|
|
|
+ db = flaskDBUtils.flaskDB(host = dbhost , port = dbport , user = dbuser , password = dbpassword ,database = database)
|
|
|
+ try:
|
|
|
+ res = flaskDBUtils.getallVin(db)
|
|
|
+ db.close()
|
|
|
+ today = datetime.datetime.now().strftime("%Y%m%d")
|
|
|
+ tomorrow = (datetime.datetime.now() + datetime.timedelta(days=1)).strftime("%Y%m%d")
|
|
|
+ yesterday = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%Y%m%d")
|
|
|
+ dict={"A1":[VinA1,res[0],yesterday],"A2":[VinA2,res[1],today], "A3":[VinA3,res[2],tomorrow], "B1":[VinB1,res[3], yesterday], "B2":[VinB2,res[4], today], "B3":[VinB3,res[5], tomorrow]}
|
|
|
+ for key,value in dict.items():
|
|
|
+ if value[0] == value[1]:
|
|
|
+ tableWidgetDispaly(value[2],key[-1])
|
|
|
+ tableWidgetDispaly2(value[2],key[-1])
|
|
|
+ if key== "A1":
|
|
|
+ VinA1=updateVin(key[0],key[-1])["返回值"]
|
|
|
+ elif key== "A2":
|
|
|
+ VinA2=updateVin(key[0],key[-1])["返回值"]
|
|
|
+ elif key== "A3":
|
|
|
+ VinA3=updateVin(key[0],key[-1])["返回值"]
|
|
|
+ elif key== "B1":
|
|
|
+ VinB1=updateVin(key[0],key[-1])["返回值"]
|
|
|
+ elif key== "B2":
|
|
|
+ VinB2=updateVin(key[0],key[-1])["返回值"]
|
|
|
+ elif key== "B3":
|
|
|
+ VinB3=updateVin(key[0],key[-1])["返回值"]
|
|
|
+ else:
|
|
|
+ if key == "A1":
|
|
|
+ VinA1=value[1]
|
|
|
+ elif key== "A2":
|
|
|
+ VinA2=value[1]
|
|
|
+ elif key== "A3":
|
|
|
+ VinA3=value[1]
|
|
|
+ elif key== "B1":
|
|
|
+ VinB1=value[1]
|
|
|
+ elif key== "B2":
|
|
|
+ VinB2=value[1]
|
|
|
+ elif key== "B3":
|
|
|
+ VinB3=value[1]
|
|
|
+ #print(VinA1 , VinA2 , VinA3 , VinB1 , VinB2 , VinB3)
|
|
|
+ except Exception as e:
|
|
|
+ print(traceback.format_exc())
|
|
|
+ db.close()
|
|
|
+def updatetimer():
|
|
|
+
|
|
|
+ db = flaskDBUtils.flaskDB(host = dbhost , port = dbport , user = dbuser , password = dbpassword ,database = database)
|
|
|
+ try:
|
|
|
+ today = datetime.datetime.now().strftime("%Y%m%d")
|
|
|
+ tomorrow = (datetime.datetime.now() + datetime.timedelta(days=1)).strftime("%Y%m%d")
|
|
|
+ yesterday = (datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%Y%m%d")
|
|
|
+ dict={"1":yesterday,"2":today, "3":tomorrow}
|
|
|
+ for key,value in dict.items():
|
|
|
+ tableWidgetDispaly(value,key)
|
|
|
+ tableWidgetDispaly2(value,key)
|
|
|
+ flaskDBUtils.updateALlVin(db)
|
|
|
+ #print(VinA1 , VinA2 , VinA3 , VinB1 , VinB2 , VinB3)
|
|
|
+ except Exception as e:
|
|
|
+ print(traceback.format_exc())
|
|
|
+ db.close()
|
|
|
+
|
|
|
+
|
|
|
def task_function(taskname, paramaDict):
|
|
|
#ts = time.time()
|
|
|
#print('开始请求：{}'.format(taskname))
|
|
|
@@ -340,14 +407,14 @@ async def getFlightData2(type):
|
|
|
date_time = Judge_bc()["date"]
|
|
|
nowDay = datetime.datetime.now()
|
|
|
nowDayStr = nowDay.strftime("%Y%m%d")
|
|
|
- now_130 = (datetime.datetime.now() + datetime.timedelta(minutes=210)).strftime("%Y%m%d")
|
|
|
+ now_130 = (datetime.datetime.now() + datetime.timedelta(minutes=300)).strftime("%Y%m%d")
|
|
|
nowStr = nowDay.strftime("%Y%m%d %H:%M:%S")
|
|
|
print(datetime.datetime.now(), "[判断：%s,当前：%s,+130：%s]" % (date_time, nowDayStr, now_130))
|
|
|
- if date_time == nowDayStr and now_130 == nowDayStr: # 当班次判断为09：00-20:30时，只查当日 20：30取决于210min不取决于班次判断
|
|
|
+ if date_time == nowDayStr and now_130 == nowDayStr: # 当班次判断为09：00-1900时，只查当日 1900取决于300min不取决于班次判断
|
|
|
nowDay_1 =nowDayStr
|
|
|
nowday_11=nowDayStr
|
|
|
searchDay=f"{nowDayStr[:4]}-{nowDayStr[4:6]}-{nowDayStr[6:]}"
|
|
|
- elif date_time == nowDayStr and now_130 != nowDayStr: # 当班次判断为20：30-2400时，今日和明日
|
|
|
+ elif date_time == nowDayStr and now_130 != nowDayStr: # 当班次判断为1900-2400时，今日和明日
|
|
|
nowDay_1 = (datetime.date.today() + datetime.timedelta(days=1)).strftime("%Y%m%d")
|
|
|
nowday_11=nowDayStr
|
|
|
searchDay=f"{nowDayStr[:4]}-{nowDayStr[4:6]}-{nowDayStr[6:]}"
|
|
|
@@ -421,6 +488,7 @@ async def getFlightData2(type):
|
|
|
dingdinginfoget(fdb)
|
|
|
CalledChecked(fdb)
|
|
|
flaskDBUtils.insertinfolog(db,nowStr,str(taskflightdata['code']))
|
|
|
+ updatetimer()
|
|
|
print(datetime.datetime.now(), "A动态刷新")
|
|
|
#print('数据库耗时：{}'.format(time.time()-ts2))
|
|
|
code = str(taskflightdata['code'])+str(time.time()-ts)
|
|
|
@@ -1117,7 +1185,7 @@ def tableWidgetDispalyRead(date):
|
|
|
fdb.close()
|
|
|
#print(datetime.datetime.now(),res)
|
|
|
remote_addr = request.remote_addr
|
|
|
- print(datetime.datetime.now(),"[%s]A模式航班信息刷新请求"%remote_addr)
|
|
|
+ print(datetime.datetime.now(),"[%s]A模式只读航班信息刷新请求"%remote_addr)
|
|
|
return res
|
|
|
|
|
|
@app.route('/static/tableWidgetDispalyRead2/<date>')
|
|
|
@@ -1127,7 +1195,7 @@ def tableWidgetDispalyRead2(date):
|
|
|
fdb.close()
|
|
|
#print(datetime.datetime.now(),res)
|
|
|
remote_addr = request.remote_addr
|
|
|
- print(datetime.datetime.now(),"[%s]B模式航班信息刷新请求"%remote_addr)
|
|
|
+ print(datetime.datetime.now(),"[%s]B模式只读航班信息刷新请求"%remote_addr)
|
|
|
return res
|
|
|
|
|
|
@app.route('/static/tableWidgetDispaly/<selectedtime>/<date>')
|
