From 54985fd5683fc531aaffae53d425d902851d0089 Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Tue, 27 May 2025 18:17:52 +0800
Subject: [PATCH] fix bugs

---
 jsonparse/web_cmd_parse3.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/jsonparse/web_cmd_parse3.cpp b/jsonparse/web_cmd_parse3.cpp
index 32e231e..842c2d2 100644
--- a/jsonparse/web_cmd_parse3.cpp
+++ b/jsonparse/web_cmd_parse3.cpp
@@ -908,16 +908,16 @@ std::string JsonData::JsonCmd_Cgi_62(Param_62 &param){
 
         if(param.straxis == ""){
             if (param.mMode == 1){
-                sprintf(whereCon, " channelID like '%s-X'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = '0' or nodeResend is null)", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
+                sprintf(whereCon, " channelID like '%s-X'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = 0 or nodeResend is null)", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
             }else{
-                sprintf(whereCon, " data_nodeno like '%%%s%%'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = '0' or nodeResend is null)", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
+                sprintf(whereCon, " data_nodeno like '%%%s%%'  and timeStamp < '%s' and timeStamp > '%s' and (resend = 0 or resend  == '')", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
             }
         }  
         else{
             if (param.mMode == 1){
-                sprintf(whereCon, " channelID = '%s-X'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = '0' or nodeResend is null)", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
+                sprintf(whereCon, " channelID = '%s-X'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = 0 or nodeResend is null)", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
             }else{
-                sprintf(whereCon, " data_nodeno = '%s-%s'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = '0' or nodeResend is null)", param.MeasurementID.c_str(),param.straxis.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
+                sprintf(whereCon, " data_nodeno = '%s-%s'  and timeStamp < '%s' and timeStamp > '%s' and (resend = 0 or resend  == '')", param.MeasurementID.c_str(),param.straxis.c_str(), param.timeEnd.c_str(), param.timeStart.c_str());
             }
        }
 
@@ -951,15 +951,15 @@ std::string JsonData::JsonCmd_Cgi_62(Param_62 &param){
         if(param.straxis == "")
         {
             if (param.mMode == 1){
-                sprintf(whereCon, " channelID like '%s-X'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = '0' or nodeResend is null) order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);
+                sprintf(whereCon, " channelID like '%s-X'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = 0 or nodeResend is null) order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);
             }else{
-                sprintf(whereCon, " data_nodeno like '%%%s%%'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = '0' or nodeResend is null) order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);
+                sprintf(whereCon, " data_nodeno like '%%%s%%'  and timeStamp < '%s' and timeStamp > '%s' and (resend = 0 or resend  == '') order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);
             }
         }else{
             if (param.mMode == 1){
-                sprintf(whereCon, " channelID = '%s-X'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = '0' or nodeResend is null) order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);
+                sprintf(whereCon, " channelID = '%s-X'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = 0 or nodeResend is null) order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);
             }else{
-                sprintf(whereCon, "data_nodeno = '%s-%s'  and timeStamp < '%s' and timeStamp > '%s' and (nodeResend = '0' or nodeResend is null) order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(),param.straxis.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);  
+                sprintf(whereCon, "data_nodeno = '%s-%s'  and timeStamp < '%s' and timeStamp > '%s' and (resend = 0 or resend  == '') order by timeStamp asc LIMIT %d OFFSET %d", param.MeasurementID.c_str(),param.straxis.c_str(), param.timeEnd.c_str(), param.timeStart.c_str(), 550, packgeNum);  
             }
         }
         array_t vecRes;