Browse Source

电子巡检记录接口统计TotalCount字段取值从取所有站点巡检记录总数改成每次前端请求站点的巡检记录总数

James 4 years ago
parent
commit
081dc4a76e
2 changed files with 8 additions and 2 deletions
  1. 1 1
      ytDashBoard.pro.user
  2. 7 1
      ytDashBoardCore/websocketserver.cpp

+ 1 - 1
ytDashBoard.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.7.2, 2021-07-09T18:42:40. -->
+<!-- Written by QtCreator 4.7.2, 2021-07-15T14:09:55. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

+ 7 - 1
ytDashBoardCore/websocketserver.cpp

@@ -322,15 +322,19 @@ void WebSocketServer::processTextMessage(QString message)
                 QString timestr;
                 int clientstart = client->Start.toInt();
                 int clientlimit = client->Limit.toInt() ;
+                int stationtotalcount = 0;
+
                 printf("client->Order = %s\n",client->Order.toUtf8().data());
                 if(QString::compare(client->Order,"DESC")==0)
                 {
+                    stationtotalcount = 0;
                     //printf("testest11111");
                     counttemp=0;
                     for(int i=PatrolRecordList.size()-1;i>=0;i--){
                         //printf("testest22222");
                         if(QString::compare(PatrolRecordList.at(i).StationId,client->StationId)==0)
                         {
+                            stationtotalcount++;
                             //printf("counttemp = %d\n",counttemp);
                             counttemp++;
                             if(counttemp >= clientstart && counttemp < clientstart+clientlimit)
@@ -345,10 +349,12 @@ void WebSocketServer::processTextMessage(QString message)
 
                 if(QString::compare(client->Order,"ASC")==0)
                 {
+                    stationtotalcount = 0;
                     counttemp=0;
                     for(int i=0;i<PatrolRecordList.size();i++){
                         if(QString::compare(PatrolRecordList.at(i).StationId,client->StationId)==0)
                         {
+                            stationtotalcount++;
                             counttemp++;
                             if(counttemp >= clientstart && counttemp < clientstart+clientlimit)
                             {
@@ -361,7 +367,7 @@ void WebSocketServer::processTextMessage(QString message)
                 timestr=timestr.left(timestr.length()-1);
 
                 QString stationname;
-                QString totalcount = QString::number(PatrolRecordList.size());
+                QString totalcount = QString::number(stationtotalcount);
                 for(int i=0;i<16;i++)
                 {
                     if(QString::compare(client->StationId,ytStationCount->station[i].StationID)==0)