服务器搜搜优化，涵盖机型风险

Functions/QTMain.py

@@ -46,7 +46,7 @@ headerlabel_B=["序号", "机号", "机型", "发动机", "航班号", "计达",
              "临工单","AMRO记录", "电签复查", "接机电签", "任务电签", "二送电签", "备", "备", "备", "备", "备", "进出港城市",
              "维修人员", "二送人员","放行", "航班编号", "电签工卡", "备", "类型", "附加消息"]
 
-versionNumber = "17.0.1"
+versionNumber = "17.0.2"
 
 
 class MainWidget(QWidget, Ui_Form):
@@ -882,10 +882,10 @@ class MainWidget(QWidget, Ui_Form):
                 ws.cell(1, 1).value = "风险编号"
                 ws.cell(1, 2).value = "状态"
                 ws.cell(1, 3).value = "提示内容"
-                ws.cell(1, 4).value = "机位"
-                ws.cell(1, 5).value = "进出港触发"
-                ws.cell(1, 6).value = "机号"
-                ws.cell(1, 7).value = "触发条件4"
+                ws.cell(1, 4).value = "机位提醒"
+                ws.cell(1, 5).value = "进出港触发条件"
+                ws.cell(1, 6).value = "机号提醒"
+                ws.cell(1, 7).value = "机型提醒"
                 ws.cell(1, 8).value = "触发条件5"
                 if len(res) != 0:
                     ii=1

Functions/QtFunctions/findServerWidget.py

@@ -130,16 +130,19 @@ class findServerWidget(Ui_FormLink, QWidget):
                         self.tableWidget.setItem(rowNum, colNum, QTableWidgetItem(col))
                         self.tableWidget.item(rowNum, colNum).setTextAlignment(Qt.AlignmentFlag.AlignCenter)
                         if "测试服务器" in row[1]:
-                            self.tableWidget.item(rowNum, colNum).setForeground(QColor('red'))
-                        elif "主服务器" in row[1]:
+                            self.tableWidget.item(rowNum, colNum).setForeground(QColor('pink'))
+                        elif row[1] == "主服务器":
                             self.tableWidget.item(rowNum, colNum).setForeground(QColor('green'))
                             font = QFont()
-                            # font.setFamily("SimHei")
                             font.setFamily("Microsoft YaHei")
                             font.setBold(True)
                             self.tableWidget.item(rowNum, colNum).setFont(font)
                         else:
                             self.tableWidget.item(rowNum, colNum).setForeground(QColor('blue'))
+                            font = QFont()
+                            font.setFamily("Microsoft YaHei")
+                            font.setBold(True)
+                            self.tableWidget.item(rowNum , colNum).setFont(font)
                         colNum += 1
                     rowNum += 1
                 self.tableWidget.resizeColumnsToContents()

Functions/ipFind.py

@@ -35,6 +35,7 @@ def get_net_card():
     temp_dict = dict(flag=True)
     gateway_error = False
 
+    net_card_data.append({'flag': True, 'gateway1': '172.27.115.254', 'mask': '255.255.255.0'})
     for x in res[0].splitlines():
 
 
@@ -65,6 +66,7 @@ def get_net_card():
             elif "默认网关" in x:
                 try:
                     temp_dict['gateway1'] = pattern.search(x).group()
+                    #temp_dict['gateway1'] = "172.27.115.254"
                     #print("当前网卡 %s 获取默认网关信息 %s" % (temp_dict['card_name'], temp_dict['gateway1']))
                 except:
                     gateway_error = True
@@ -95,6 +97,8 @@ def get_net_card():
             pass
     # for i in net_card_data:
     #     print("%s：%s" % (i.get("card_name"), i))
+
+    #print(net_card_data)
     return net_card_data
 
 

Functions/serverFind.py

@@ -7,14 +7,15 @@ from .ipFind import ipFind  # 假设ipFind是一个从本地模块导入的函
 
 def task(i):
     """发送HTTP请求检查服务器状态的任务函数"""
-    sleep_seconds = random.randint(1, 3)
+    #sleep_seconds = random.uniform(0, 0.1)
+    #print(sleep_seconds)
     # 可选：取消注释以显示线程执行信息
     # print('线程名称：{}，参数：{}，睡眠时间：{}'.format(threading.current_thread().name, i, sleep_seconds))
     try:
         # 随机延迟，减少请求风暴
-        time.sleep(sleep_seconds)
+        #time.sleep(sleep_seconds)
         # 发送请求并设置合理的超时时间
-        r = requests.get(f'http://{i}:7162/findserver', timeout=3).text
+        r = requests.get(f'http://{i}:7162/findserver', timeout=0.5).text
     except requests.exceptions.ConnectTimeout:
         # 连接超时处理
         r = '0'