分享使用记录 功能 迁移到 工具v3

requirements.txt

@@ -10,4 +10,5 @@ PySide6
 pyperclip
 selenium
 mysql-connector-python
+tqdm
 

工具v3/database_tools_2.py

@@ -993,10 +993,9 @@ def GetSamePairs(prodict): #获取已标注的相同题目组
             same_groups.append([id]+same)
     return(same_groups) #返回相同题目组, 每组由一些相同的题目构成
 
-def ShareSameUsagesinDB(id1,id2): #有问题， 待修改
-    mydb = connect(hostname = "wwylss.synology.me", port = "13306", username="tikuuser", pwd="Kjmathds_2024", db = "tikutest")
-    mycursor = mydb.cursor()
-    sql = "SELECT ID,date,classname,diff FROM usages WHERE ID = (%s);"
+def ShareSameUsagesinDB(id1,id2,db): #有问题， 待修改
+    mycursor = db.cursor()
+    sql = "SELECT date,classname,diff FROM usages WHERE ID = (%s);"
     val = (id1,)
     mycursor.execute(sql,val)
     id1_usages_list = mycursor.fetchall()
@@ -1004,21 +1003,22 @@ def ShareSameUsagesinDB(id1,id2): #有问题， 待修改
     mycursor.execute(sql,val)
     id2_usages_list = mycursor.fetchall()
     for item in set(id1_usages_list)-set(id2_usages_list):
+        print(f"{id1} -> {id2}: {item}")
         sql = "INSERT INTO usages (ID,date,classname,diff) VALUE (%s,%s,%s,%s);"
-        val = (id2,item[1],item[2],item[3])
+        val = (id2,item[0],item[1],item[2])
         mycursor.execute(sql,val)
         sql = "INSERT INTO logs (DATE,TIME,username,action,db_content) VALUE (%s,%s,%s,%s,%s);"
-        val = (GetDate(),GetTime(),get_git_username(),"分享使用数据",f"{id1} -> {id2}: {item[1]}\t{item[2]}\t{item[3]}")
+        val = (GetDate(),GetTime(),get_git_username(),"分享使用数据",f"{id1} -> {id2}: {item}")
         mycursor.execute(sql,val)
     for item in set(id2_usages_list)-set(id1_usages_list):
+        print(f"{id2} -> {id1}: {item}")
         sql = "INSERT INTO usages (ID,date,classname,diff) VALUE (%s,%s,%s,%s);"
-        val = (id1,item[1],item[2],item[3])
+        val = (id1,item[0],item[1],item[2])
         mycursor.execute(sql,val)
         sql = "INSERT INTO logs (DATE,TIME,username,action,db_content) VALUE (%s,%s,%s,%s,%s);"
-        val = (GetDate(),GetTime(),get_git_username(),"分享使用数据",f"{id2} -> {id1}: {item[1]}\t{item[2]}\t{item[3]}")
+        val = (GetDate(),GetTime(),get_git_username(),"分享使用数据",f"{id2} -> {id1}: {item}")
         mycursor.execute(sql,val)
-    mydb.commit()
-    mydb.close()
+
     return 0
 
 

工具v3/分享使用记录.py

@@ -0,0 +1,16 @@
+from database_tools_2 import *
+import tqdm
+same_list = generate_same_list()
+mydb = connect(hostname = "wwylss.synology.me", port = "13306", username="tikuuser", pwd="Kjmathds_2024", db = "tikutest")
+for id,same_id in tqdm.tqdm(same_list):
+    ShareSameUsagesinDB(id,same_id,mydb)
+mydb.commit()
+mydb.close()
+
+
+# prodict = load_dict(prodictpath)
+# same_groups = GetSamePairs(prodict)
+# for sg in same_groups:
+#     ShareSameUsages(prodict,sg)
+# SortUsages(prodict)
+# save_dict(prodict,prodictpath)

工具v3/合并使用记录并排序.py

@@ -1,14 +0,0 @@
-from database_tools_2 import *
-
-same_list = generate_same_list()
-for id,same_id in same_list:
-    ShareSameUsagesinDB(id,same_id)
-    print(f"{id} 与 {same_id} 的使用记录分享完成")
-
-
-# prodict = load_dict(prodictpath)
-# same_groups = GetSamePairs(prodict)
-# for sg in same_groups:
-#     ShareSameUsages(prodict,sg)
-# SortUsages(prodict)
-# save_dict(prodict,prodictpath)

工具v3/工具面板.py

@@ -37,7 +37,7 @@ class MyWindow(QMainWindow,Ui_MainWindow):
         self.action_tkdr.triggered.connect(lambda: run_command("统考数据导入",[]))#已完成
         self.action_dygg.triggered.connect(lambda: run_command("单元挂钩",[]))#已完成
         self.action_tqda.triggered.connect(lambda: run_command("文件或文本框提取答案",[]))#已完成
-        self.action_hbsy.triggered.connect(lambda: run_command("合并使用记录并排序",[]))#已完成
+        self.action_hbsy.triggered.connect(lambda: run_command("分享使用记录",[]))#已完成
         self.action_tjjc.triggered.connect(lambda: run_command("新增基础知识梳理",[]))#已完成
         self.action_sxth.triggered.connect(lambda: run_command("关键字筛选题号",[]))#已完成
         self.action_xtby.triggered.connect(lambda: run_command("指定题号编译pdf",[]))#已完成