fix qvvr new funtion
This commit is contained in:
@@ -4378,8 +4378,11 @@ static void scanAndResendOfflineFiles(const std::string &dirPath)
|
||||
{
|
||||
// <20><>ȡĿ¼<C4BF><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>Ϣ
|
||||
std::vector<FileInfo> fileList;
|
||||
|
||||
std::cout << "getDirectoryFilesInfo" << std::endl;
|
||||
getDirectoryFilesInfo(dirPath, fileList);
|
||||
|
||||
std::cout << "send every file" << std::endl;
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ط<EFBFBD>
|
||||
for (size_t i = 0; i < fileList.size(); ++i) {
|
||||
// <20><>ȡ<EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>(<28><>֮ǰ<D6AE><C7B0><EFBFBD><EFBFBD> JSON)
|
||||
@@ -4399,24 +4402,46 @@ static void scanAndResendOfflineFiles(const std::string &dirPath)
|
||||
}
|
||||
fclose(fp);
|
||||
|
||||
std::cout << "send jsonContent" << jsonContent << std::endl;
|
||||
|
||||
// <20><><EFBFBD>Է<EFBFBD><D4B7><EFBFBD>
|
||||
char* ptr = NULL; // <20><><EFBFBD>շ<EFBFBD><D5B7><EFBFBD>
|
||||
SendJsonAPI_web(0, "", jsonContent.c_str(), &ptr);
|
||||
SendJsonAPI_web(WEB_EVENT, "", jsonContent.c_str(), &ptr);
|
||||
if (ptr != NULL) {
|
||||
// <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD><C4BF>Ҫ<EFBFBD>ɼӸ<C9BC><D3B8><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD>ж<EFBFBD>
|
||||
handleCommentResponse(std::string(ptr));
|
||||
free(ptr);
|
||||
// ɾ<><C9BE><EFBFBD>ļ<EFBFBD>
|
||||
remove(fileList[i].fileName.c_str());
|
||||
|
||||
cJSON* j_r = cJSON_Parse(ptr);
|
||||
if (j_r == NULL) {
|
||||
std::cout << "old file send fail" << std::endl;
|
||||
// <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD><C4BF>Ҫ<EFBFBD>ɼӸ<C9BC><D3B8><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD>ж<EFBFBD>
|
||||
handleCommentResponse(std::string(ptr));
|
||||
}
|
||||
else{
|
||||
std::cout << "old file send success,remove it" << std::endl;
|
||||
// ɾ<><C9BE><EFBFBD>ļ<EFBFBD>
|
||||
remove(fileList[i].fileName.c_str());
|
||||
|
||||
free(j_r);
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
// <20><><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD><DCA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD>Ա<EFBFBD><D4B1>´<EFBFBD><C2B4><EFBFBD><EFBFBD><EFBFBD>
|
||||
std::cout << "old file send fail" << std::endl;
|
||||
}
|
||||
free(ptr);
|
||||
}
|
||||
}
|
||||
// *****************************************************************************************
|
||||
|
||||
|
||||
std::string FormatTimeForFilename(const std::string& timeStr) {
|
||||
std::string result;
|
||||
for (char c : timeStr) {
|
||||
if (isdigit(c)) {
|
||||
result += c;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
// ======================== ԭ<>ȵĺ<C8B5><C4BA><EFBFBD> ========================
|
||||
int transfer_json_qvvr_data(unsigned int func_type, int monitor_id,
|
||||
double mag, double dur, long long start_tm, long long end_tm, int dis_kind,
|
||||
@@ -4484,9 +4509,12 @@ char* mp_id,char* Qvvr_rptname,char* devtype)
|
||||
|
||||
// ================ <20><><EFBFBD><EFBFBD><EFBFBD>¹<EFBFBD><C2B9><EFBFBD> =========================
|
||||
// ********** <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܿ<EFBFBD>ʼ **********
|
||||
if(ptr != NULL)
|
||||
{
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>(ptr == NULL)<29><><EFBFBD><EFBFBD><EFBFBD>ѵ<EFBFBD>ǰ json <20><><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8>Ŀ¼(/FeProject/dat/qvvr/)
|
||||
if (ptr == NULL) {
|
||||
cJSON* j_r = cJSON_Parse(ptr);
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>(j_r == NULL)<29><><EFBFBD><EFBFBD><EFBFBD>ѵ<EFBFBD>ǰ json <20><><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8>Ŀ¼(/FeProject/dat/qvvr/)
|
||||
if (j_r == NULL) {
|
||||
std::cout << "qvvr send fail ,store in local" << std::endl;
|
||||
// 1) <20>ȼ<EFBFBD><C8BC><EFBFBD>/FeProject/dat/qvvr/Ŀ¼<C4BF>ļ<EFBFBD><C4BC><EFBFBD>С<EFBFBD>Ƿ<C7B7> 10M<30><4D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><C9BE><EFBFBD><EFBFBD><EFBFBD>ϵ<EFBFBD>һ<EFBFBD><D2BB><EFBFBD>ļ<EFBFBD>
|
||||
std::string qvvrDir = "/FeProject/dat/qvvr/";
|
||||
checkAndRemoveOldestIfNeeded(qvvrDir, 10LL * 1024 * 1024);
|
||||
@@ -4496,7 +4524,7 @@ char* mp_id,char* Qvvr_rptname,char* devtype)
|
||||
std::string fileName = qvvrDir;
|
||||
fileName += mp_id;
|
||||
fileName += "-";
|
||||
fileName += start_time_str;
|
||||
fileName += FormatTimeForFilename(start_time_str);
|
||||
fileName += "-";
|
||||
|
||||
char buf[64];
|
||||
@@ -4505,27 +4533,32 @@ char* mp_id,char* Qvvr_rptname,char* devtype)
|
||||
fileName += ".txt";
|
||||
|
||||
// <20><> json_string д<><D0B4><EFBFBD>ļ<EFBFBD>
|
||||
writeJsonToFile(fileName.c_str(), json_string);
|
||||
}
|
||||
|
||||
// <20><><EFBFBD>۴˴η<CBB4><CEB7>ͳɹ<CDB3><C9B9><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD><DCA3><EFBFBD>Ҫɨ<D2AA><C9A8>/FeProject/dat/qvvr/Ŀ¼<C4BF>µ<EFBFBD><C2B5>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ط<EFBFBD>
|
||||
{
|
||||
std::string qvvrDir = "/FeProject/dat/qvvr/";
|
||||
scanAndResendOfflineFiles(qvvrDir);
|
||||
writeJsonToFile(fileName.c_str(), json_string);
|
||||
}
|
||||
else{
|
||||
free(j_r);
|
||||
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
}
|
||||
}
|
||||
// <20><><EFBFBD>۴˴η<CBB4><CEB7>ͳɹ<CDB3><C9B9><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD><DCA3><EFBFBD>Ҫɨ<D2AA><C9A8>/FeProject/dat/qvvr/Ŀ¼<C4BF>µ<EFBFBD><C2B5>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ط<EFBFBD>
|
||||
if(1)
|
||||
{
|
||||
std::string qvvrDir = "/FeProject/dat/qvvr/";
|
||||
scanAndResendOfflineFiles(qvvrDir);
|
||||
}
|
||||
// ********** <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܽ<EFBFBD><DCBD><EFBFBD> **********
|
||||
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><DFBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD><DFBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>η<EFBFBD><EFBFBD><EFBFBD>
|
||||
if (ptr != NULL) {
|
||||
std::cout << "current qvvr handle response" << std::endl;
|
||||
handleCommentResponse(std::string(ptr));
|
||||
free(ptr);
|
||||
} else {
|
||||
// <20><><EFBFBD><EFBFBD> ptr Ϊ NULL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
std::cout << "Error: Received NULL response" << std::endl;
|
||||
// <20>ͷ<EFBFBD><CDB7>ڴ<EFBFBD>
|
||||
cJSON_Delete(root);
|
||||
free(json_string);
|
||||
// <20>ͷ<EFBFBD><CDB7>ڴ<EFBFBD>
|
||||
cJSON_Delete(root);
|
||||
free(json_string);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user