change some code in fwadmin. not complete.

src/include/proto/fwadmin.proto

@@ -16,6 +16,7 @@ message adminreq
 	required string username = 2;
 	optional string password = 3;
 	optional string strvalidtime = 4;
+	
 };
 
 
@@ -23,6 +24,8 @@ message adminreply
 {
 	required int32 nresult = 1;  //0 fail    1 success
 	optional string errstr = 2; //
+	optional string strvalidtime = 3;  //valid time
+	required ADMINREQ_TYPE admintype = 4;
 }
 
 

src/tool/fwupdate_admin/mainwindowadminuser.cpp

@@ -101,6 +101,10 @@ void MainWindowAdminUser::threadadmin(iv::queryrpcReq  xreq)
                     }
                     else
                     {
+                        if(xAdminReply.admintype() == iv::fw::ADMINREQ_TYPE::QUERYUSER)
+                        {
+                            mstrvalidtime = xAdminReply.strvalidtime();
+                        }
                         emit adminstate(1,"Success.");
                     }
                 }

src/tool/fwupdate_admin/mainwindowadminuser.h

@@ -40,6 +40,8 @@ private:
     std::thread * mpthread;
 
     char mstrlasterr[256];
+
+    std::string mstrvalidtime;
 };
 
 #endif // MAINWINDOWADMINUSER_H

src/tool/server_fwupdate/fwadminproc.cpp

@@ -80,6 +80,7 @@ iv::queryrpcReply fwadminproc::ProcAdminUser(const iv::queryrpcReq *req)
             {
             int nauth = mpfwdb->AddUser(xadminreq.username(),xadminreq.password(),strerrorcode);
             xadminreply.set_nresult(nauth);
+            xadminreply.set_admintype(iv::fw::ADMINREQ_TYPE::ADDUSER);
             if(nauth == 0)
             {
                 xadminreply.set_errstr(strerrorcode);
@@ -87,6 +88,21 @@ iv::queryrpcReply fwadminproc::ProcAdminUser(const iv::queryrpcReq *req)
             }
             break;
         case iv::fw::ADMINREQ_TYPE::QUERYUSER:
+            {
+            std::string strvalidtime;
+            int nauth = mpfwdb->QueryUser(xadminreq.username(),strvalidtime,strerrorcode);
+            xadminreply.set_nresult(nauth);
+            xadminreply.set_admintype(iv::fw::ADMINREQ_TYPE::QUERYUSER);
+            if(nauth == 1)
+            {
+                xadminreply.set_strvalidtime(strvalidtime);
+            }
+            else
+            {
+                xadminreply.set_nresult(0);
+                xadminreply.set_errstr(strerrorcode);
+            }
+            }
             break;
         default:
             break;

src/tool/server_fwupdate/fwdb.cpp

@@ -22,14 +22,6 @@ void fwdb::OpenDataBase()
         mdatabase = QSqlDatabase::database("sqliteadc");
     else
         mdatabase = QSqlDatabase::addDatabase("QSQLITE","sqliteadc");
-//    mdatabase = QSqlDatabase::addDatabase("QSQLITE");
-
-
-//    if(QSqlDatabase::contains("sqlite"))
-//        mdatabase = QSqlDatabase::database("sqlite");
-//    else
-//        mdatabase = QSqlDatabase::addDatabase("QSQLITE","sqlite");
-
 
 
     mdatabase.setDatabaseName(mstrdbpath.data());
@@ -50,7 +42,6 @@ void fwdb::OpenDataBase()
 
     bool bHaveTable = true;
 
-    //查询数据
     sql_query.exec("select count(*)  from sqlite_master where type='table' and name = 'accountdata'");
     if(!sql_query.exec())
     {
@@ -79,21 +70,7 @@ void fwdb::OpenDataBase()
             qDebug() << "Error: Fail to create table."<< sql_query.lastError();
             return;
         }
-//        if(!sql_query.exec("CREATE INDEX index_vehid ON groupdata (vehid)"))
-//        {
-//            qDebug() << "Error: Fail to create index_vehid."<< sql_query.lastError();
-//            return;
-//        }
-//        if(!sql_query.exec("CREATE INDEX index_recvtime ON groupdata (recvtime)"))
-//        {
-//            qDebug() << "Error: Fail to create index_recvtime."<< sql_query.lastError();
-//            return;
-//        }
-//        if(!sql_query.exec("CREATE INDEX index_recordid ON groupdata (recordid)"))
-//        {
-//            qDebug() << "Error: Fail to create index_recordid."<< sql_query.lastError();
-//            return;
-//        }
+
         char strsen[1000];
         QDateTime now = QDateTime::currentDateTime();
 
@@ -201,11 +178,6 @@ int fwdb::CheckAuth(std::string strusername, std::string strpassword ,std::strin
                 }
             }
 
-//            int id = query.value(0).toInt();
-//            qint64 recordid = query.value(1).toLongLong();
-//            mql_xvectorrecordtime.push_back(recordid);
-//            std::string strvehid = query.value(3).toString().toStdString();
-
         }
         else
         {
@@ -269,14 +241,14 @@ int fwdb::QueryUser(std::string strusername,std::string & strvalidtime, std::str
         {
             strerrorcode = "No this user.";
             mmutexdb.unlock();
-            return 0;
+            return -2;
         }
     }
 
     mmutexdb.unlock();
 
     strerrorcode = "No this user.";
-    return 0;
+    return -2;
 }
 
 int fwdb::AddUser(std::string strusername, std::string strpassword, std::string &strerrorcode)

src/tool/server_fwupdate/mainwindow.cpp

@@ -36,13 +36,9 @@ void MainWindow::newfwupdateConnect()
         std::shared_ptr<fwupdateClient> p = std::shared_ptr<fwupdateClient>( new fwupdateClient);
         p->mnState = 0;
         p->mpSocket = pSocket;
-
-//        p->mLat = 0;
-//        p->mLon = 0;
         mMutex.lock();
         mvectorFC.push_back(p);
         mMutex.unlock();
-//        mnNCCount++;
     }
     else
     {
@@ -53,7 +49,7 @@ void MainWindow::readfwupdateMessage()
 {
     QTcpSocket * pSocket = static_cast<QTcpSocket *>(this->sender());
     QByteArray ba = pSocket->readAll();
-    int i;
+    unsigned int i;
     bool bNeedClose = false;
     mMutex.lock();
     for(i=0;i<mvectorFC.size();i++)
@@ -89,13 +85,12 @@ void MainWindow::errorfwupdate()
 {
     QTcpSocket * pSocket = static_cast<QTcpSocket *>(this->sender());
     mMutex.lock();
-    int i;
+    unsigned int i;
     for(i=0;i<mvectorFC.size();i++)
     {
         if(pSocket == mvectorFC.at(i)->mpSocket)
         {
             mvectorFC.erase(mvectorFC.begin()+i);
-  //            mnNCCount--;
         }
     }
     mMutex.unlock();
@@ -106,7 +101,7 @@ void MainWindow::disconnetfwupdate()
     qDebug("disconnect");
     QTcpSocket * pSocket = static_cast<QTcpSocket *>(this->sender());
     mMutex.lock();
-    int i;
+    unsigned int i;
     for(i=0;i<mvectorFC.size();i++)
     {
         if(pSocket == mvectorFC.at(i)->mpSocket)