R17.0.1 修复用户数据创建

Functions/DButilsFunction/insertTaskDataToTable.py

@@ -29,10 +29,17 @@ def checkTASKTYPE(row,en2zh,database,flightdate,LOGsdeactive,headerLabelKey,head
         newDic = {}
         for col in row:
             if col in headerLabelKey:
-                if col != "FJ_TASKIDS":
+                if col != "FJ_TASKIDS" and col != "LAST_AF_ATA" and col != "LAST_TAF_ATA" and col != 'FNO':
                     newDic[en2zh[col]] = row[col]
-                else:
+                elif col == "FJ_TASKIDS" :
                     newDic[en2zh[col]] = ",".join(row[col])
+                elif col == 'FNO':
+                    newDic[en2zh[col]] = row[col].replace("|","-").replace("---","")
+                else:
+                    if row["CARRIER"] == '3U':
+                        newDic[en2zh[col]] = row[col][0]['ATA']
+                    else:
+                        newDic[en2zh[col]] = ''
         if row["TASKTYPE"] == "" and LOGsdeactive != 0:
             waringinsert(database,"[%s]机号%s航班号%s,航班类型显示为空白,请查看派工模块并及时调整任务类型!!" %(flightdate, row["ACNO"], row["FNO"]),row["TASKID"], en2zh["TASKTYPE"])
 
@@ -415,6 +422,13 @@ def insertTaskDataToTable(database: flightDB, datatime: str, jsonData,jsonData2)
                                     elif col not in ["TASKID","FJ_TASKIDS","SJ_DEP","SJ_ARR","STD","WX","FX","ECSJ","BAY_A","BAY_B"]:
                                         if col not in row:
                                             row[col] = ''
+                                        elif col in ["LAST_AF_ATA","LAST_TAF_ATA"] :
+                                            if row["CARRIER"] == '3U':
+                                                row[col] = row[col][0]["ATA"]
+                                            else:
+                                                row[col] = ''
+                                        elif col == "FNO":
+                                            row[col] = row[col].replace("|","-").replace("---","")
                                         if row[col] != b:
                                             if old_tasktype == "AP" and col in APbglist and LOGsdeactive == 0:
                                                 waringinsert(database, "[%s]机号:%s%s由%s变更为%s!" % (flightdate,row["ACNO"], zydy_simple[col],b, row[col]),row["TASKID"], en2zh[col])

Functions/DButilsFunction/postgresql_backup.py

@@ -20,6 +20,7 @@ def postgresql_bakup(bakcup:flightDB,main:flightDB,type):
                    "TaskFlightinfo%s"%today:get_dic('TaskflightinfoLabel'),"TaskFlightinfo%s"%yesterday:get_dic('TaskflightinfoLabel'),"TaskFlightinfo%s"%tomorrow:get_dic('TaskflightinfoLabel'),
                    "flightsearch%s"%today:get_dic('flightsearchLabel'),"flightsearch%s"%yesterday:get_dic('flightsearchLabel'),"flightsearch%s"%tomorrow:get_dic('flightsearchLabel'),
                    "sortFlight%s"%today:get_dic('sortLabel'),"sortFlight%s"%yesterday:get_dic('sortLabel'),"sortFlight%s"%tomorrow:get_dic('sortLabel'),"display":get_dic('displayLabel'),
+                   "sortFlight2%s"%today:get_dic('sortLabel'),"sortFlight2%s"%yesterday:get_dic('sortLabel'),"sortFlight2%s"%tomorrow:get_dic('sortLabel'),
                    }
     if type == 1:
         dbtables=["peopleschedule%s"%today,"peopleschedule%s"%yesterday,"peopleschedule%s"%tomorrow,'risktable',
@@ -27,7 +28,9 @@ def postgresql_bakup(bakcup:flightDB,main:flightDB,type):
                   'flightsts%s'%today,'flightsts%s'%yesterday,
                   "TaskFlightinfo%s"%today,"TaskFlightinfo%s"%yesterday,"TaskFlightinfo%s"%tomorrow,
                   "flightsearch%s"%today,"flightsearch%s"%yesterday,"flightsearch%s"%tomorrow,
-                  "sortFlight%s"%today,"sortFlight%s"%yesterday,"sortFlight%s"%tomorrow,"display"]#logs太大无法同步
+                  "sortFlight%s"%today,"sortFlight%s"%yesterday,"sortFlight%s"%tomorrow,
+                  "sortFlight2%s"%today,"sortFlight2%s"%yesterday,"sortFlight2%s"%tomorrow,
+                  "display"]#logs太大无法同步
     elif type == 2:
         dbtables=['logintable']
     elif type == 3:

SeverStart.py

@@ -498,7 +498,7 @@ async def getFlightData2(type):
                 main_db.close()
                 main_loginTabledb.close()
                 print(datetime.datetime.now(), '[系统警告]从主数据备份失败')
-                return '未登录'
+                return '200'
         else:
             return "200"
 

templates/index.html

@@ -201,7 +201,7 @@
                 else{
                   console.log('未登录')
                   $('#loginsts').text('未登录')
-                  var txt1="<a href='/login'>   点击登录</a>";
+                  var txt1="<a href='/login'> 点击登录</a>";
                   $('#loginsts').append(txt1)
                   loginsts = data
                 }

unitls/LogerinTxt.py

@@ -105,6 +105,6 @@ class ErrorLogger:
                 with open(self.filename, 'w', encoding='utf-8') as f:
                     f.write(log_entry)
         except Exception as e:
-            print(f"无法写入错误日志: {e}")
+            print(f"无法写入错误日志: {e}+\n+{error_msg}")
 # 创建单例实例（推荐直接使用这个实例）
 app_logger = ErrorLogger()

unitls/StaticDataclass.py

@@ -17,7 +17,7 @@ def get_dic(names):
                      "BAY_A":"非航前进港机位","BAY_B":"航前离港机位","WX":"维修人员","FX":"放行人员","TASKSTS":"维修状态","SJ_DEP":"随机","SJ_ARR":"随机",
                     "BL":"保留","TASKSTS_TIME":"维修状态时间","FJ_TASKIDS":"工作包","ECSJ":"二次送机","TASKSTS_ECSJ":"二送状态","FNO":"进出港航班号",
                     "FJ_WORKEROk_OK":"附加工作状态","ARR_DEP":"进出港城市","APUTYPE":"APU型号","ENG_TYPE":"发动机","ACTYPE":"机型","ACTYPE_ENG":"机型综合信息","CONFACTYPE":"详细机型",
-                    "HIGHALT":"高高原","FLYING":"上段起飞时间","NXTTASKTYPE":"后续类型","NXTSTD":"后续预计起飞","STARTDATE_PL":"备1","JBRY":"备2","ISSHIFTEX":"备3","FLIGHTID1":"备4","FLIGHTID2":"备5",'REMARK_BUSINESS':"备6","ACGGY":'备7'}
+                    "HIGHALT":"高高原","FLYING":"上段起飞时间","NXTTASKTYPE":"后续类型","NXTSTD":"后续预计起飞","STARTDATE_PL":"备1","JBRY":"备2","ISSHIFTEX":"备3","FLIGHTID1":"备4","FLIGHTID2":"备5",'REMARK_BUSINESS':"备6","ACGGY":'备7',"LAST_AF_ATA":'备8',"LAST_TAF_ATA":'备9'}
     pglistLabel=["姓名","工号","角色","班次","备注","备1","备2","备3","备4","备5","备6","备7","备8","备9","备10"]
     peopleScheduleLabel=["编号","航班编号","显示模式","放行","勤务1","勤务2","工1","工2","工3","附加消息"]
     CalllistLabel=["航班编号","电话","工号","姓名","航班号","附加消息","拨号次数","创建时间","接通时间"]
@@ -38,15 +38,15 @@ def get_dic(names):
         "实际起飞":"ATD","非航前预计到达":"ETA","预飞预达":"TA_TD","非航前进港机位":"BAY_A","航前离港机位":"BAY_B","维修人员":"WX","放行人员":"FX","维修状态":"TASKSTS",
         "随机离港":"SJ_DEP","随机进港":"SJ_ARR","保留":"BL","维修状态时间":"TASKSTS_TIME","工作包":"FJ_TASKIDS","二次送机":"ECSJ","二送状态":"TASKSTS_ECSJ",
         "进出港航班号":"FNO","附加工作状态":"FJ_WORKEROk_OK","进出港城市":"ARR_DEP","APU型号":"APUTYPE","发动机":"ENG_TYPE","机型":"ACTYPE","机型综合信息":"ACTYPE_ENG","详细机型":"CONFACTYPE",
-        "高高原":"HIGHALT","上段起飞时间":"FLYING","后续类型":"NXTTASKTYPE","后续预计起飞":"NXTSTD","备1":'STARTDATE_PL',"备2":'JBRY',"备3":'ISSHIFTEX',"备4":"FLIGHTID1","备5":"FLIGHTID2",'备6':'REMARK_BUSINESS','备7':"ACGGY"}
+        "高高原":"HIGHALT","上段起飞时间":"FLYING","后续类型":"NXTTASKTYPE","后续预计起飞":"NXTSTD","备1":'STARTDATE_PL',"备2":'JBRY',"备3":'ISSHIFTEX',"备4":"FLIGHTID1","备5":"FLIGHTID2",'备6':'REMARK_BUSINESS','备7':"ACGGY",'备8':"LAST_AF_ATA",'备9':"LAST_TAF_ATA"}
 
     headerLabelKey=["TASKID","ACNO","FLIGHTDATE","TASKTYPE","STA","STD","ATA","ATD","ETA","TA_TD","BAY_A","BAY_B","WX","FX","TASKSTS","SJ_DEP","SJ_ARR",
                     "BL","TASKSTS_TIME","FJ_TASKIDS","ECSJ","TASKSTS_ECSJ","FNO","FJ_WORKEROk_OK","ARR_DEP","APUTYPE","ENG_TYPE","ACTYPE","ACTYPE_ENG","CONFACTYPE",
-                    "HIGHALT","FLYING","NXTTASKTYPE","NXTSTD","STARTDATE_PL",'JBRY','ISSHIFTEX',"FLIGHTID1","FLIGHTID2",'REMARK_BUSINESS',"ACGGY"]
+                    "HIGHALT","FLYING","NXTTASKTYPE","NXTSTD","STARTDATE_PL",'JBRY','ISSHIFTEX',"FLIGHTID1","FLIGHTID2",'REMARK_BUSINESS',"ACGGY","LAST_AF_ATA","LAST_TAF_ATA"]
     header2num={"TASKID":0,"ACNO":1,"FLIGHTDATE":2,"TASKTYPE":3,"STA":4,"STD":5,"ATA":6,"ATD":7,"ETA":8,"TA_TD":9,"BAY_A":10,
                 "BAY_B":11,"WX":12,"FX":13,"TASKSTS":14,"SJ_DEP":15,"SJ_ARR":15,"BL":16,"TASKSTS_TIME":17,"FJ_TASKIDS":18,
                 "ECSJ":19,"TASKSTS_ECSJ":20,"FNO":21,"FJ_WORKEROk_OK":22,"ARR_DEP":23,"APUTYPE":24,"ENG_TYPE":25,"ACTYPE":26,"ACTYPE_ENG":27,"CONFACTYPE":28,
-                    "HIGHALT":29,"FLYING":30,"NXTTASKTYPE":31,"NXTSTD":32,'STARTDATE_PL':36,'JBRY':37,'ISSHIFTEX':38,"FLIGHTID1":39,"FLIGHTID2":40,'REMARK_BUSINESS':41,"ACGGY":42}
+                    "HIGHALT":29,"FLYING":30,"NXTTASKTYPE":31,"NXTSTD":32,'STARTDATE_PL':36,'JBRY':37,'ISSHIFTEX':38,"FLIGHTID1":39,"FLIGHTID2":40,'REMARK_BUSINESS':41,"ACGGY":42,"LAST_AF_ATA":43,"LAST_TAF_ATA":44}
     zydy_simple={"FLIGHT_ID":"航班编号","flightIds":"航班编号对","ACNO": "机号", "ACTYPE": "机型", "ENG_TYPE": "发动机", "FLIGHT_NO": "保障航班号",
             "STA": "计划到达", "ETA": "预计到达","DEP_CH":"进港机场","DEP_CH1":"离港机场","FLIGHT_DATE":"航班日期",
             "TASKTYPE": "航班类型","FLIGHT_STATUS":"航班状态","STD": "预计起飞","ATA": "实际到达","ATD": "实际起飞","TD": "预计起飞",
@@ -55,7 +55,7 @@ def get_dic(names):
              "AP": "航前", "TR": "短停", "AF": "航后","TAF": "特航前","":"未显示","短停":"短停","ECSJRY":"二送人员","TASKSTS_ECSJ":"二送状态","FJ":"附加消息"
             ,"CANCELID":"取消标志","FNO":"航班号","HIGHALT":"高高原性质","SJ_DEP":"随机","FJ_TASKIDS":"工作包","TASKID":"航班编号","FLIGHTDATE":"航班日期","TA_TD":"预飞预达",
             "BAY_A":"进港机位","BAY_B":"离港机位","WX":"维修人员","FX":"放行人员","SJ_ARR":"随机","ECSJ":"二送","FJ_WORKEROk_OK":"附加工作状态","ARR_DEP":"进出港城市","APUTYPE":"APU型号","ACTYPE_ENG":"机型综合信息","CONFACTYPE":"详细机型",
-            "FLYING":"上段起飞时间","NXTTASKTYPE":"后续类型","NXTSTD":"后续预计起飞","JBRY":"接班人员","ISSHIFTEX":"是否换班","REMARK_BUSINESS":"备注","STARTDATE_PL":"计划开工时间","ACGGY":"高高原能力"}
+            "FLYING":"上段起飞时间","NXTTASKTYPE":"后续类型","NXTSTD":"后续预计起飞","JBRY":"接班人员","ISSHIFTEX":"是否换班","REMARK_BUSINESS":"备注","STARTDATE_PL":"计划开工时间","ACGGY":"高高原能力","LAST_AF_ATA":"上次航后","LAST_TAF_ATA":'上次特后前'}
 
     ecsjtaskSTS={"":"空值","0":"空值",'5':'二送任务待确认', '10':'二送任务已确认', '15':'二送到位',"20":"二送离场"}
     rowlistLabel = {10: "放行", 11: "勤务1", 12: "勤务2", 13: "工1", 14: "工2", 15: "工3", -1: "附加消息"}