lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug in pst

Browse Source
This commit is contained in:
lnk
2025-03-06 15:24:49 +08:00
parent 135f48f373
commit 5c61b6cd2d
5 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cfg_parse/cfg_parser.cpp
View File

@@ -11888,15 +11888,15 @@ void Worker::handleViewLogCommand(const QString& command, QTcpSocket* clientSock
activeClient = clientSocket; // <20><>¼<EFBFBD><C2BC>ǰ shell socket
clientSocket->write("\r\x1B[K");
clientSocket->write(QString("Viewing logs for level: %1 (Press 'q' to exit)\n> ").arg(logLevel).toUtf8());
clientSocket->write(QString("Viewing logs for level: %1 (Press '`' to exit)\n> ").arg(logLevel).toUtf8());
clientSocket->flush();
while (!stopViewLog) {
// **1. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>룬<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD> `q` <20>˳<EFBFBD>**
if (clientSocket->waitForReadyRead(500)) { // ? <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
QByteArray input = clientSocket->readAll().trimmed();
if (input == "q") { // ? <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD> `q`<60><><EFBFBD>˳<EFBFBD><CBB3><EFBFBD>־ģʽ
std::cout << "Received 'q' from shell socket! Exiting viewlog...\n";
if (input == "`") { // ? <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD> `q`<60><><EFBFBD>˳<EFBFBD><CBB3><EFBFBD>־ģʽ
std::cout << "Received '`' from shell socket! Exiting viewlog...\n";
stopViewLog = true;
showinshellflag = false;
break;
@@ -13999,30 +13999,6 @@ void httpThread::run()
printf("httpThread::run() is end ...... \n");
}
//<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD><D0B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><DFB3><EFBFBD><EFBFBD><EFBFBD>lnk20250107
//<2F><>ʹ<EFBFBD>ü򵥵<C3BC>ѭ<EFBFBD><D1AD><EFBFBD>̣߳<DFB3><CCA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>app<70><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4>ѭ<EFBFBD><D1AD><EFBFBD>̣߳<DFB3><CCA3><EFBFBD><EFBFBD>ҿ<EFBFBD><D2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/*void mqtestThread::run()
{
printf("mqtestThread::run() is called ...... \n");
while(1)
{
if(G_TEST_NUM != 0){
rocketmq_test_300(G_TEST_NUM,g_front_seg_index);
QThread::sleep(60); // ÿ<>η<EFBFBD><CEB7>ͼ<EFBFBD><CDBC><EFBFBD>1<EFBFBD><31><EFBFBD><EFBFBD>
}
}
printf("mqtestThread::run() is end ...... \n");
}*/
void curltest()
{
char* ptr=NULL;
std::string code = std::string("code1=recall");
SendWebAPI_web("http://192.168.1.149:8091/powerQuality/getProperties", code.c_str(), &ptr);
}
// Base64 <20><><EFBFBD>뺯<EFBFBD><EBBAAF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ Base64 <20><>ʽ //ʵ<><CAB5>json<6F>е<EFBFBD><D0B5>ļ<EFBFBD><C4BC><EFBFBD>
std::string base64_encode(const std::string& in) {

23
json/create_json.cpp
View File

@@ -1862,6 +1862,13 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
while (it != pMonitor->ItemList.end())
{
CItem* pItem = *it++;
//////////////////////////////////////////////////////////lnk20250306Ϊ<36><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⣬<EFBFBD><E2A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>FLAG
if ("FLAG" == pItem->strItemName) //<2F>޳<EFBFBD>"FLAG"<22><><EFBFBD><EFBFBD>ֹsq<73><71><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD>ָ<EFBFBD><D6B8>
{
KafkaData.strText.append(QString("\"FLAG\":%1, ").arg(data->flag)); //ƴ<><C6B4> json<6F>޳<EFBFBD><DEB3><EFBFBD><EFBFBD>ǣ<EFBFBD>1<EFBFBD><31><EFBFBD>޳<EFBFBD><DEB3><EFBFBD>0<EFBFBD>޳<EFBFBD><DEB3><EFBFBD>Ĭ<EFBFBD><C4AC><EFBFBD>޳<EFBFBD>
continue;
}
//////////////////////////////////////////////////////////
if ("TIME" == pItem->strItemName) //<2F>޳<EFBFBD>"FLAG"<22><><EFBFBD><EFBFBD>ֹsq<73><71><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD>ָ<EFBFBD><D6B8>
{
KafkaData.strText.append(QString("\"TIME\":\"%1\", ").arg(data->time)); //ƴ<><C6B4> json<6F><6E><EFBFBD><EFBFBD>ʱ<EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD>
@@ -1979,6 +1986,13 @@ int transfer_json_block_data(char v_wiring_type[], json_block_data *data) //json
while (it != pMonitor->ItemList.end())
{
CItem* pItem = *it++;
//////////////////////////////////////////////////////////lnk20250306Ϊ<36><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⣬<EFBFBD><E2A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>FLAG
if ("FLAG" == pItem->strItemName) //<2F>޳<EFBFBD>"FLAG"<22><><EFBFBD><EFBFBD>ֹsq<73><71><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD>ָ<EFBFBD><D6B8>
{
KafkaData.strText.append(QString("\"FLAG\":%1, ").arg(data->flag)); //ƴ<><C6B4> json<6F>޳<EFBFBD><DEB3><EFBFBD><EFBFBD>ǣ<EFBFBD>1<EFBFBD><31><EFBFBD>޳<EFBFBD><DEB3><EFBFBD>0<EFBFBD>޳<EFBFBD><DEB3><EFBFBD>Ĭ<EFBFBD><C4AC><EFBFBD>޳<EFBFBD>
continue;
}
//////////////////////////////////////////////////////////
if ("TIME" == pItem->strItemName) //<2F>޳<EFBFBD>"FLAG"<22><><EFBFBD><EFBFBD>ֹsq<73><71><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD>ָ<EFBFBD><D6B8>
{
KafkaData.strText.append(QString("\"TIME\":\"%1\", ").arg(data->time)); //ƴ<><C6B4> json<6F><6E><EFBFBD><EFBFBD>ʱ<EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD>
@@ -4331,15 +4345,6 @@ void qvvr_test()
transfer_json_qvvr_data(1, 123456789, 220, 180, 1730894400.123, 1730894580, 1210001,uuid_cfg,uuid_dat,mp_id,Qvvr_rptname,devtype);
}
/*
void integrity_test()
{
QString time = "2024-11-6";
QString datatime = "2024-11-6 13:13:13";
QString monitorId = "000cf2a27f3f13f330b9e8690641e7f2";
errorlog_dataintegrity_pgsql(time,datatime,monitorId,1);
}*/
void comflag_test()
{

30
json/save2json.h
View File

@@ -28,7 +28,7 @@ extern "C" {
#include <map>
#include <list>
#include "../mms/db_interface.h"
#include <QThread>
//lnk20250106
@@ -53,6 +53,8 @@ extern void ledger(const char* terminal_id = NULL,QIODevice* outputDevice = NULL
extern void value_print(const char *variableName, QTcpSocket *clientSocket);
extern int TEST_PORT;
//////////////////////////////////////////////////////////////////////////////
//struct json_pair_info
//{
@@ -307,9 +309,9 @@ private slots:
continue;
}
// 1) <20><><EFBFBD><EFBFBD> 'q' <20>˳<EFBFBD> viewlog
if (c == 'q') {
std::cout << "Received 'q' from shell socket! Exiting viewlog...\n";
// 1) <20><><EFBFBD><EFBFBD> '`' <20>˳<EFBFBD> viewlog
if (c == '`') {
std::cout << "Received '`' from shell socket! Exiting viewlog...\n";
if (activeClient == clientSocket) {
stopViewLog = true;
clientSocket->write("\r\x1B[K");
@@ -356,7 +358,7 @@ private slots:
}
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD>̶<EFBFBD>Ϊ "> "<22><><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ2
const int promptLength = 2;
const int promptLength = 1;
// 4) <20>˸<EFBFBD><CBB8><EFBFBD>
if (c == '\x7f' || c == '\b') {
@@ -421,6 +423,9 @@ private:
helpText += "set - Execute rocketmq_test_set\r\n";
helpText += "only - Execute rocketmq_test_only\r\n";
helpText += "log - Execute rocketmq_test_log\r\n";
helpText += "soe - Execute http_test_soe\r\n";
helpText += "qvvr - Execute http_test_qvvr\r\n";
helpText += "connect - Execute http_test_connect\r\n";
helpText += "ledger <id> - Execute ledger with optional terminal_id\r\n";
helpText += "viewlog <level> - View logs (ERROR, WARN, NORMAL, DEBUG)\r\n";
helpText += "value <valuename> - Execute value print with valuename : frontindex remtable iedcount frontfun log init\r\n";
@@ -475,6 +480,21 @@ private:
clientSocket->write("\r\x1B[K");
clientSocket->write("Executed rocketmq_test_log\r\n");
}
else if (cmd.startsWith("soe")) {
SOEFileWeb_test();
clientSocket->write("\r\x1B[K");
clientSocket->write("Executed http_test_soe\r\n");
}
else if (cmd.startsWith("qvvr")) {
qvvr_test();
clientSocket->write("\r\x1B[K");
clientSocket->write("Executed http_test_qvvr\r\n");
}
else if (cmd.startsWith("connect")) {
comflag_test();
clientSocket->write("\r\x1B[K");
clientSocket->write("Executed http_test_connect\r\n");
}
else if (cmd.startsWith("ledger")) {
QStringList parts = cmd.split(" ");
if (parts.size() > 1) {

2
mms/db_interface.h
View File

@@ -190,10 +190,8 @@ void DeletcRecallXml();
/*lnk10-11*////////////////////////////////////////////////////////////////////////
void rocketmq_test();
void rocketmq_test_300(int mpnum,int front_index);
void curltest();
void SOEFileWeb_test();
void qvvr_test();
void integrity_test();
void comflag_test();
int parse_device_web_test_ext();

8
mms/main.c
View File

@@ -309,14 +309,6 @@ int main(int argc, const char **argv)
apr_sleep(apr_time_from_sec(1));
/* ÿ30<33><30><EFBFBD>Ӽ<EFBFBD><D3BC><EFBFBD>һ<EFBFBD><D2BB>״̬ */
/*202411-1lnk<6E><6B><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC>ϴ<EFBFBD><CFB4><EFBFBD><EFBFBD><EFBFBD> */
//SOEFileWeb_test();
//<2F><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD><CFB4><EFBFBD><EFBFBD><EFBFBD>
//qvvr_test();
//apr_sleep(apr_time_from_sec(3));
//comflag_test();
//apr_sleep(apr_time_from_sec(3));
if( !(stimer++ % 60) ) {//<2F><><EFBFBD><EFBFBD>
if (g_dead_lock_counter++ >=3) {//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
g_thread_blocked_times++;