From da5d22bb689d1ffef2b9368c1fabe03dcb735f42 Mon Sep 17 00:00:00 2001
From: zcwBit <a452669850@outlook.com>
Date: Fri, 8 Aug 2025 21:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E5=B7=A5=E7=A8=8B=E5=90=8E=E5=8E=86=E5=8F=B2=E8=B6=8B?=
 =?UTF-8?q?=E5=8A=BF=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UI/TrendManage/TrendWidget.py           | 13 ++++++------
 model/HistoryDBModel/HistoryDBManage.py | 27 ++++++++++++++-----------
 model/ProjectModel/ProjectManage.py     | 11 ----------
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/UI/TrendManage/TrendWidget.py b/UI/TrendManage/TrendWidget.py
index e481c83..7ba4227 100644
--- a/UI/TrendManage/TrendWidget.py
+++ b/UI/TrendManage/TrendWidget.py
@@ -299,6 +299,7 @@ class TrendWidgets(QWidget):
     
     def exchangeProject(self):
         # 项目切换时调用
+        # self.historyDB = None
         self.historyDB = Globals.getValue('historyDBManage')
         self.refreshVarList()
     
@@ -306,9 +307,9 @@ class TrendWidgets(QWidget):
         # 刷新变量列表
         self.varListWidget.clear()
         self.statusLabel.setText("正在加载变量列表...")
-        if not self.historyDB or not hasattr(self.historyDB, 'getAllVarNames'):
+        if not self.historyDB:
             self.statusLabel.setText("未连接历史数据库，无法获取变量列表")
-            return
+            self.historyDB = Globals.getValue('historyDBManage')
         varNames = self.historyDB.getAllVarNames()
         # print(varNames)
         # 对变量名称进行排序
@@ -760,7 +761,7 @@ class TrendWidgets(QWidget):
             
             if len(data_lines) == 0:
                 # 没有数据线时不创建十字标线
-                print("没有数据线，跳过十字标线创建")
+                # print("没有数据线，跳过十字标线创建")
                 return
             
             try:
@@ -830,12 +831,12 @@ class TrendWidgets(QWidget):
                     va='bottom'
                 )
                 
-                print("✅ 十字标线组件创建完成")
+                # print("✅ 十字标线组件创建完成")
                 
             except Exception as e:
                 # 如果创建失败，清理并重置引用
                 self._cleanupCrosshair()
-                print(f"❌ 创建十字标线失败: {e}")
+                # print(f"❌ 创建十字标线失败: {e}")
     
     def _cleanupCrosshair(self):
         """清理十字标线组件"""
@@ -867,7 +868,7 @@ class TrendWidgets(QWidget):
         # 如果十字标线组件不存在，直接返回
         if (self.crosshair_v is None or self.crosshair_h is None or 
             self.crosshair_point is None or self.crosshair_text is None):
-            print("十字标线组件不存在，无法更新")
+            # print("十字标线组件不存在，无法更新")
             return
         
         try:
diff --git a/model/HistoryDBModel/HistoryDBManage.py b/model/HistoryDBModel/HistoryDBManage.py
index f99b12d..ae84224 100644
--- a/model/HistoryDBModel/HistoryDBManage.py
+++ b/model/HistoryDBModel/HistoryDBManage.py
@@ -26,6 +26,7 @@ class HistoryDBManage:
         self.host = host
         self.token = token
         self.org = org
+        # print(self.table, 1111111111111111)
 
         # 写入回调
         def onSuccess(conf, data, exception=None):
@@ -119,7 +120,7 @@ class HistoryDBManage:
             if isinstance(df, pd.DataFrame):
                 data = df["value"].tolist() if "value" in df.columns else []
                 timeList = df["time"].tolist() if "time" in df.columns else []
-                print(f"查询到 {len(data)} 个数据点")
+                # print(f"查询到 {len(data)} 个数据点")
             else:
                 # print(f"查询结果不是DataFrame: {type(df)}")
                 data, timeList = [], []
@@ -150,7 +151,9 @@ class HistoryDBManage:
         """获取所有去重后的变量名列表"""
         sql = f'SELECT DISTINCT("varName") FROM "{self.table}"'
         try:
+            # print(self.table, 2222222222222222)
             df = self.client.query(sql, mode="pandas")
+            # print(df)
             import pandas as pd
             if isinstance(df, pd.DataFrame) and 'varName' in df.columns:
                 return df['varName'].tolist()
@@ -195,17 +198,17 @@ class HistoryDBManage:
         self.stopWriteThread()
         self.client.close()
 
-if __name__ == '__main__':
-    db = HistoryDBManage(
-        database="dcs",
-        table="p1",
-        host="http://localhost:8181",
-        token="apiv3_ynlNTgq_OX164srSzjYXetWZJGOpgokFJbp_JaToWYlzwIPAZboPxKt4ss6vD1_4jj90QOIDnRDodQSJ66m3_g",
-        org="dcs"
-    )
-    data, times = db.queryVarHistory("有源/无源4-20mA输入通道1")
-    print(data, times)
-    db.close()
+# if __name__ == '__main__':
+#     db = HistoryDBManage(
+#         database="dcs",
+#         table="p1",
+#         host="http://localhost:8181",
+#         token="apiv3_ynlNTgq_OX164srSzjYXetWZJGOpgokFJbp_JaToWYlzwIPAZboPxKt4ss6vD1_4jj90QOIDnRDodQSJ66m3_g",
+#         org="dcs"
+#     )
+#     data, times = db.queryVarHistory("有源/无源4-20mA输入通道1")
+#     print(data, times)
+#     db.close()
 
 
 	
\ No newline at end of file
diff --git a/model/ProjectModel/ProjectManage.py b/model/ProjectModel/ProjectManage.py
index 94c9d3d..d64f69e 100644
--- a/model/ProjectModel/ProjectManage.py
+++ b/model/ProjectModel/ProjectManage.py
@@ -279,17 +279,6 @@ class ProjectManage(object):
 			popenBeat = subprocess.Popen('celery -A HARTTask beat', stdout=subprocess.PIPE, cwd = 'protocol/Celery/HARTCelery')
 		Globals.setValue('beatPopen', popenBeat)
 
-	@classmethod
-	def recordingHistory(self, projectName, cursor):
-		# 记录打开通讯的时间 并创建INFLUXDB表
-		curTime = time.time()
-		# influxMem = InfluxMem()
-		# influxMem.createMem(time)
-		curTime = float("{:.5f}".format(curTime))
-		cursor.execute('insert into InfluxMem (mem) values ({})'.format(str(curTime)))
-
-		historyDB = HistoryDBManage(mem = curTime, bucket =  projectName, isCelery = True)
-		return historyDB
 
 	@classmethod
 	def editProject(self, name, Nname, des):