Browse Source

change Inspection_Shenlan_Miivill, fix a bug. change fwupdate, add some code, not complete.

yuchuli 1 year ago
parent
commit
70b68917da

+ 1 - 1
src/tool/Inspection_Shenlan_Miivill/mainwindow.cpp

@@ -37,7 +37,7 @@ MainWindow::MainWindow(QWidget *parent) :
     pa = iv::modulecomm::RegisterRecvPlus("canrecv1",fun1);
     pa = iv::modulecomm::RegisterRecvPlus("hcp2_gpsimu",fun1);
     pa = iv::modulecomm::RegisterRecvPlus("lidar_pc",fun1);
-    pa = iv::modulecomm::RegisterRecvPlus("lidaprc_left",fun1);
+    pa = iv::modulecomm::RegisterRecvPlus("lidarprc_left",fun1);
     pa = iv::modulecomm::RegisterRecvPlus("lidarpc_right",fun1);
     pa = iv::modulecomm::RegisterRecvPlus("image00",fun1);
     pa = iv::modulecomm::RegisterRecvPlus("lidar_pointpillar",fun1);

+ 11 - 1
src/tool/fwupdate_admin/mainwindowadminuser.cpp

@@ -39,7 +39,7 @@ void MainWindowAdminUser::on_pushButton_clicked()
     }
 
     iv::fw::adminreq xadminreq;
-    xadminreq.set_admintype(iv::fw::ADMINREQ_TYPE::QUERYUSER);
+    xadminreq.set_admintype(iv::fw::ADMINREQ_TYPE::ADDUSER);
     xadminreq.set_username(struser);
     xadminreq.set_password(struser);
 
@@ -137,3 +137,13 @@ void MainWindowAdminUser::EnableAllButton()
     ui->pushButton_ResetPass->setEnabled(true);
 }
 
+
+void MainWindowAdminUser::on_pushButton_Query_clicked()
+{
+    if(ui->lineEdit_queryname->text().length() == 0)
+    {
+        QMessageBox::warning(this,tr("Warning"),tr("Query User Name is NULL."),QMessageBox::YesAll);
+        return;
+    }
+
+}

+ 2 - 0
src/tool/fwupdate_admin/mainwindowadminuser.h

@@ -23,6 +23,8 @@ public:
 private slots:
     void on_pushButton_clicked();
 
+    void on_pushButton_Query_clicked();
+
 signals:
     void adminstate(int nstate,const char * strerr);
 

+ 1 - 1
src/tool/fwupdate_admin/mainwindowadminuser.ui

@@ -138,7 +138,7 @@
      <string>yyyy/M/d hh:mm</string>
     </property>
    </widget>
-   <widget class="QLineEdit" name="lineEdit_2">
+   <widget class="QLineEdit" name="lineEdit_queryname">
     <property name="geometry">
      <rect>
       <x>40</x>

+ 33 - 0
src/tool/server_fwupdate/fwdb.cpp

@@ -238,6 +238,39 @@ int fwdb::CheckAuth(std::string strusername, std::string strpassword ,std::strin
     return nrtn;
 }
 
+int fwdb::QueryUser(std::string strusername,std::string & strvalidtime, std::string &strerrorcode)
+{
+    mmutexdb.lock();
+    QSqlQuery query(mdatabase);
+    char strsen[1000];
+
+
+    snprintf(strsen,1000,"select * from accountdata where((accountdata.username = \"%s\"))",
+             strusername.data());
+    query.exec(strsen);
+    if(!query.exec(strsen))
+    {
+        std::cout<<query.lastError().text().toLatin1().data()<<std::endl;
+        strerrorcode = "SQL Error.";
+        mmutexdb.unlock();
+        return 0;
+    }
+    else
+    {
+        if(query.next())
+        {
+            strerrorcode = "User Exist.";
+            strvalidtime = query.value("uservalidtime").toString().toStdString();
+            mmutexdb.unlock();
+            return 1;
+
+        }
+    }
+
+    strerrorcode = "No this user.";
+    return 0;
+}
+
 int fwdb::AddUser(std::string strusername, std::string strpassword, std::string &strerrorcode)
 {
  //   int nrtn = 0;

+ 2 - 0
src/tool/server_fwupdate/fwdb.h

@@ -25,6 +25,8 @@ public:
 
     int AddUser(std::string strusername,std::string strpassword, std::string & strerrorcode);
 
+    int QueryUser(std::string strusername,std::string & strvalidtime,std::string & strerrorcode);
+
 private:
     std::thread * mpthread;
     bool mbthreadrun = true;