diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
index d491a6c..cc02581 100644
--- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
+++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
@@ -1,7 +1,7 @@
 #include "beexamined_deviceitem.h"
 #include "ui_beexamined_deviceitem.h"
 #include "QMessageBox.h"
-#include "tested_device_manage_serve.h"
+//#include "tested_device_manage_serve.h"
 
 //被检设备
 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) :

diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
index d491a6c..cc02581 100644
--- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
+++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
@@ -1,7 +1,7 @@
 #include "beexamined_deviceitem.h"
 #include "ui_beexamined_deviceitem.h"
 #include "QMessageBox.h"
-#include "tested_device_manage_serve.h"
+//#include "tested_device_manage_serve.h"
 
 //被检设备
 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) :
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index a5dcc78..5497af2 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -1,6 +1,6 @@
 #include "checkdevice.h"
 #include "ui_checkdevice.h"
-#include "biz_device_manage_serve.h"
+#include "basecommonapi.h"
 #include <QCheckBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
@@ -24,11 +24,9 @@
 
 void CheckDevice::getStandardDevice()
 {
-    BizDeviceManage dbManager;
-    // 调用数据库管理器的函数获取数据
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = dbManager.getBizDeviceManage();
+    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
     for (const BizDevice& bizDevice : data) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);

diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
index d491a6c..cc02581 100644
--- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
+++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
@@ -1,7 +1,7 @@
 #include "beexamined_deviceitem.h"
 #include "ui_beexamined_deviceitem.h"
 #include "QMessageBox.h"
-#include "tested_device_manage_serve.h"
+//#include "tested_device_manage_serve.h"
 
 //被检设备
 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) :
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index a5dcc78..5497af2 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -1,6 +1,6 @@
 #include "checkdevice.h"
 #include "ui_checkdevice.h"
-#include "biz_device_manage_serve.h"
+#include "basecommonapi.h"
 #include <QCheckBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
@@ -24,11 +24,9 @@
 
 void CheckDevice::getStandardDevice()
 {
-    BizDeviceManage dbManager;
-    // 调用数据库管理器的函数获取数据
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = dbManager.getBizDeviceManage();
+    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
     for (const BizDevice& bizDevice : data) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 25134ba..f3662bc 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,7 +2,6 @@
 #include "ui_checkwindow.h"
 #include "dialogcheckresult.h"
 #include <QMessageBox>
-#include "my_tasks_serve.h"
 #include "basecommonapi.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
@@ -58,11 +57,9 @@
 
 void CheckWindow::getCheckDevice()
 {
-    MyTasks dbManager;
-    // 调用数据库管理器的函数获取数据
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = dbManager.getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
 
     int rowCount = 0;
     int row=0;

diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
index d491a6c..cc02581 100644
--- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
+++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
@@ -1,7 +1,7 @@
 #include "beexamined_deviceitem.h"
 #include "ui_beexamined_deviceitem.h"
 #include "QMessageBox.h"
-#include "tested_device_manage_serve.h"
+//#include "tested_device_manage_serve.h"
 
 //被检设备
 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) :
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index a5dcc78..5497af2 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -1,6 +1,6 @@
 #include "checkdevice.h"
 #include "ui_checkdevice.h"
-#include "biz_device_manage_serve.h"
+#include "basecommonapi.h"
 #include <QCheckBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
@@ -24,11 +24,9 @@
 
 void CheckDevice::getStandardDevice()
 {
-    BizDeviceManage dbManager;
-    // 调用数据库管理器的函数获取数据
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = dbManager.getBizDeviceManage();
+    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
     for (const BizDevice& bizDevice : data) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 25134ba..f3662bc 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,7 +2,6 @@
 #include "ui_checkwindow.h"
 #include "dialogcheckresult.h"
 #include <QMessageBox>
-#include "my_tasks_serve.h"
 #include "basecommonapi.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
@@ -58,11 +57,9 @@
 
 void CheckWindow::getCheckDevice()
 {
-    MyTasks dbManager;
-    // 调用数据库管理器的函数获取数据
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = dbManager.getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
 
     int rowCount = 0;
     int row=0;
diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp
index 12b0bcc..e665fb4 100644
--- a/softwareDirectory/AutoVerScheme/my_task.cpp
+++ b/softwareDirectory/AutoVerScheme/my_task.cpp
@@ -1,7 +1,7 @@
 #include "my_task.h"
 #include "ui_my_task.h"
 #include "QMessageBox"
-#include "my_tasks_serve.h"
+#include "basecommonapi.h"
 
 My_Task::My_Task(QWidget *parent) :
     InfoBase(parent),
@@ -64,11 +64,11 @@
     //先设置为行为0
     ui->tableWidget->setRowCount(0);
 
-    MyTasks dbManager;
+    //MyTasks dbManager;
     // 调用数据库管理器的函数获取数据
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = dbManager.getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
 
     int rowCount = 0;
     int row=0;

diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
index d491a6c..cc02581 100644
--- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
+++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
@@ -1,7 +1,7 @@
 #include "beexamined_deviceitem.h"
 #include "ui_beexamined_deviceitem.h"
 #include "QMessageBox.h"
-#include "tested_device_manage_serve.h"
+//#include "tested_device_manage_serve.h"
 
 //被检设备
 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) :
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index a5dcc78..5497af2 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -1,6 +1,6 @@
 #include "checkdevice.h"
 #include "ui_checkdevice.h"
-#include "biz_device_manage_serve.h"
+#include "basecommonapi.h"
 #include <QCheckBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
@@ -24,11 +24,9 @@
 
 void CheckDevice::getStandardDevice()
 {
-    BizDeviceManage dbManager;
-    // 调用数据库管理器的函数获取数据
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = dbManager.getBizDeviceManage();
+    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
     for (const BizDevice& bizDevice : data) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 25134ba..f3662bc 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,7 +2,6 @@
 #include "ui_checkwindow.h"
 #include "dialogcheckresult.h"
 #include <QMessageBox>
-#include "my_tasks_serve.h"
 #include "basecommonapi.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
@@ -58,11 +57,9 @@
 
 void CheckWindow::getCheckDevice()
 {
-    MyTasks dbManager;
-    // 调用数据库管理器的函数获取数据
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = dbManager.getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
 
     int rowCount = 0;
     int row=0;
diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp
index 12b0bcc..e665fb4 100644
--- a/softwareDirectory/AutoVerScheme/my_task.cpp
+++ b/softwareDirectory/AutoVerScheme/my_task.cpp
@@ -1,7 +1,7 @@
 #include "my_task.h"
 #include "ui_my_task.h"
 #include "QMessageBox"
-#include "my_tasks_serve.h"
+#include "basecommonapi.h"
 
 My_Task::My_Task(QWidget *parent) :
     InfoBase(parent),
@@ -64,11 +64,11 @@
     //先设置为行为0
     ui->tableWidget->setRowCount(0);
 
-    MyTasks dbManager;
+    //MyTasks dbManager;
     // 调用数据库管理器的函数获取数据
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = dbManager.getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
 
     int rowCount = 0;
     int row=0;
diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp
index d51bdea..52e098c 100644
--- a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp
+++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp
@@ -2,7 +2,7 @@
 #include "ui_standard_deviceitem.h"
 #include "InfoBase.h"
 #include "QMessageBox"
-#include "biz_device_manage_serve.h"
+#include "basecommonapi.h"
 
 
 //标准设备管理 .cpp
@@ -92,11 +92,11 @@
 
     // 创建数据库管理器对象
     //BizDeviceManage包含虚方法 指针实例化
-    BizDeviceManage dbManager;
+    //BizDeviceManage dbManager;
     // 调用数据库管理器的函数获取数据
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = dbManager.getBizDeviceManage();
+    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
 
 
     for (const BizDevice& bizDevice : data) {
@@ -154,8 +154,8 @@
 {
 
 
-     BizDeviceManage dbManager;
-     QList<CatDeviceInfor> data = dbManager.getCatDeviceInfor(id);
+     //BizDeviceManage dbManager;
+     QList<CatDeviceInfor> data = BaseCommonApi::getCatDeviceInfor(id);
      // 获取当前日期 使用年限=当前日期减去购进日期
      QDate currentDate = QDate::currentDate();
      QDate purchase_date;
@@ -200,8 +200,9 @@
 
      //获取核查点tablewight的数据
       QStringList headlist;
-      QString DeviceName = dbManager.getApparatus(id);
-      QList<CheckDCPower> bizDeviceManageData=dbManager.getCheckDCPower(DeviceName,&headlist);
+      QString DeviceName = BaseCommonApi::getApparatus(id);
+      //QList<CheckDCPower> bizDeviceManageData=dbManager.getCheckDCPower(DeviceName,&headlist);
+      QList<CheckDCPower> bizDeviceManageData = BaseCommonApi::getCheckDCPower(id);
       //设置tablewight
       ui->tableWidgetItem->setRowCount(0);
       ui->tableWidgetItem->setColumnCount(headlist.count());

diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
index d491a6c..cc02581 100644
--- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
+++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp
@@ -1,7 +1,7 @@
 #include "beexamined_deviceitem.h"
 #include "ui_beexamined_deviceitem.h"
 #include "QMessageBox.h"
-#include "tested_device_manage_serve.h"
+//#include "tested_device_manage_serve.h"
 
 //被检设备
 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) :
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index a5dcc78..5497af2 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -1,6 +1,6 @@
 #include "checkdevice.h"
 #include "ui_checkdevice.h"
-#include "biz_device_manage_serve.h"
+#include "basecommonapi.h"
 #include <QCheckBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
@@ -24,11 +24,9 @@
 
 void CheckDevice::getStandardDevice()
 {
-    BizDeviceManage dbManager;
-    // 调用数据库管理器的函数获取数据
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = dbManager.getBizDeviceManage();
+    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
     for (const BizDevice& bizDevice : data) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 25134ba..f3662bc 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,7 +2,6 @@
 #include "ui_checkwindow.h"
 #include "dialogcheckresult.h"
 #include <QMessageBox>
-#include "my_tasks_serve.h"
 #include "basecommonapi.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
@@ -58,11 +57,9 @@
 
 void CheckWindow::getCheckDevice()
 {
-    MyTasks dbManager;
-    // 调用数据库管理器的函数获取数据
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = dbManager.getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
 
     int rowCount = 0;
     int row=0;
diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp
index 12b0bcc..e665fb4 100644
--- a/softwareDirectory/AutoVerScheme/my_task.cpp
+++ b/softwareDirectory/AutoVerScheme/my_task.cpp
@@ -1,7 +1,7 @@
 #include "my_task.h"
 #include "ui_my_task.h"
 #include "QMessageBox"
-#include "my_tasks_serve.h"
+#include "basecommonapi.h"
 
 My_Task::My_Task(QWidget *parent) :
     InfoBase(parent),
@@ -64,11 +64,11 @@
     //先设置为行为0
     ui->tableWidget->setRowCount(0);
 
-    MyTasks dbManager;
+    //MyTasks dbManager;
     // 调用数据库管理器的函数获取数据
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = dbManager.getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
 
     int rowCount = 0;
     int row=0;
diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp
index d51bdea..52e098c 100644
--- a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp
+++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp
@@ -2,7 +2,7 @@
 #include "ui_standard_deviceitem.h"
 #include "InfoBase.h"
 #include "QMessageBox"
-#include "biz_device_manage_serve.h"
+#include "basecommonapi.h"
 
 
 //标准设备管理 .cpp
@@ -92,11 +92,11 @@
 
     // 创建数据库管理器对象
     //BizDeviceManage包含虚方法 指针实例化
-    BizDeviceManage dbManager;
+    //BizDeviceManage dbManager;
     // 调用数据库管理器的函数获取数据
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = dbManager.getBizDeviceManage();
+    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
 
 
     for (const BizDevice& bizDevice : data) {
@@ -154,8 +154,8 @@
 {
 
 
-     BizDeviceManage dbManager;
-     QList<CatDeviceInfor> data = dbManager.getCatDeviceInfor(id);
+     //BizDeviceManage dbManager;
+     QList<CatDeviceInfor> data = BaseCommonApi::getCatDeviceInfor(id);
      // 获取当前日期 使用年限=当前日期减去购进日期
      QDate currentDate = QDate::currentDate();
      QDate purchase_date;
@@ -200,8 +200,9 @@
 
      //获取核查点tablewight的数据
       QStringList headlist;
-      QString DeviceName = dbManager.getApparatus(id);
-      QList<CheckDCPower> bizDeviceManageData=dbManager.getCheckDCPower(DeviceName,&headlist);
+      QString DeviceName = BaseCommonApi::getApparatus(id);
+      //QList<CheckDCPower> bizDeviceManageData=dbManager.getCheckDCPower(DeviceName,&headlist);
+      QList<CheckDCPower> bizDeviceManageData = BaseCommonApi::getCheckDCPower(id);
       //设置tablewight
       ui->tableWidgetItem->setRowCount(0);
       ui->tableWidgetItem->setColumnCount(headlist.count());
diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp
index e730e57..1a13c60 100644
--- a/softwareDirectory/AutoVerScheme/verifydevice.cpp
+++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp
@@ -1,6 +1,6 @@
 #include "verifydevice.h"
 #include "ui_verifydevice.h"
-#include "biz_device_manage_serve.h"
+#include "basecommonapi.h"
 #include <QCheckBox>
 
 VerifyDevice::VerifyDevice(QWidget *parent) :
@@ -25,11 +25,9 @@
 
 void VerifyDevice::getVerifyDevice()
 {
-    BizDeviceManage dbManager;
-    // 调用数据库管理器的函数获取数据
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = dbManager.getBizDeviceManage();
+    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
     for (const BizDevice& bizDevice : data) {
         rowCount = ui->tableWidget->rowCount();
         ui->tableWidget->insertRow(rowCount);
@@ -45,11 +43,9 @@
 
 void VerifyDevice::getCheckDevice()
 {
-    BizDeviceManage dbManager;
-    // 调用数据库管理器的函数获取数据
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = dbManager.getBizDeviceManage();
+    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
     for (const BizDevice& bizDevice : data) {
         rowCount = ui->tableWidget_2->rowCount();
         ui->tableWidget_2->insertRow(rowCount);