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