涵盖机型风险提示

Functions/DButilsFunction/getRiskData.py

@@ -1,7 +1,9 @@
 from .flightDB import flightDB
-def getRiskData(fdb:flightDB,bay,time,acno):
+def getRiskData(fdb:flightDB,bay,time,acno,actype):
     res = fdb.queryTabel("RiskTable","提示内容","状态='生效' and 触发条件1 ='%s' and 触发条件2 ='%s' "%(bay,time))
     res1 = fdb.queryTabel("RiskTable","提示内容","状态='生效' and 触发条件3 ='%s'" % acno)
+    res1 = fdb.queryTabel("RiskTable","提示内容","状态='生效' and 触发条件4 ='%s'" % actype)#触发条件4是机型
     tips = "\n      [机位风险]:"+res[0][0] if res !=None and res !=[] and len(res) !=0 else ""
     tips = tips + "\n      [机号风险]:"+res1[0][0] if res1 !=None and res1 !=[] and len(res1) !=0 else tips
+    tips = tips + "\n      [机型风险]:"+res1[0][0] if res1 !=None and res1 !=[] and len(res1) !=0 else tips
     return tips

SeverStart.py

@@ -47,7 +47,7 @@ databaseWorkLoad = 'workLoad'
 databaseLoginDB = 'loginDB'
 flightDataTransfer,displayDataTransfer=DataTransferMode()
 ServerClas = Server_Class()
-severVersion = "17.0.1"
+severVersion = "17.0.2"
 displayVersion = "17.0.0"
 print(f"当前客户端版本：{severVersion}/白板版本：{displayVersion}")
 print(f"当前服务器为:【{ServerClas}】")
@@ -1287,11 +1287,11 @@ def saveRisktable():
     print(datetime.datetime.now(),"[%s]导出风险数据库"%remote_addr)
     return {"返回值":res}
 
-@app.route('/static/getRiskData/<bay>/<time>/<acno>')
-def getRiskData(bay,time,acno):
+@app.route('/static/getRiskData/<bay>/<time>/<acno>/<actype>')
+def getRiskData(bay,time,acno,actype):
     remote_addr = request.remote_addr
     fdb = flightDB(host=dbhost,port=dbport,user=dbuser,password=dbpassword,database=databaseDB4)
-    res=GetRiskData(fdb,bay,time,acno)
+    res=GetRiskData(fdb,bay,time,acno,actype)
     fdb.close()
     print(datetime.datetime.now(),"[%s]导出风险数据库"%remote_addr)
     return {"返回值":res}