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

qvvr has bug

Browse Source
This commit is contained in:
lnk
2025-05-20 16:31:12 +08:00
parent 093e8e5dd6
commit 3ad2e7c590
12 changed files with 314 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
json/create_json.cpp
View File

@@ -218,6 +218,39 @@ extern int isdelta_flag;//lnk2024-8-16 角型接线标志
void connectlog_pgsql(char* id,char* datetime,int status);
///////////////////////////////////////////////lnk20241021替换web接口//////////////////////////////////
//lnk20250520 获取映射文件中的一些数据/////////////////////////////////////////////////////////////////
bool get_xml_config_by_dev_type(const char* dev_type, XmlConfigC* out_cfg) {
if (!dev_type || !out_cfg)
{
printf("null dev_type");
return false;
}
QString dev_type_q = QString::fromUtf8(dev_type);
QMap<QString, Xmldata*>::iterator it = xmlinfo_list.find(dev_type_q);
if (it == xmlinfo_list.end() || it.value() == nullptr) {
printf("this dev_type not contain");
return false;
}
const XmlConfig& cfg = it.value()->xmlcfg;
// 将 QString 复制到结构体中的 char[]，确保不越界
strncpy(out_cfg->WavePhasicFlag, cfg.WavePhasicFlag.toUtf8().constData(), sizeof(out_cfg->WavePhasicFlag) - 1);
strncpy(out_cfg->WavePhasicA, cfg.WavePhasicA.toUtf8().constData(), sizeof(out_cfg->WavePhasicA) - 1);
strncpy(out_cfg->WavePhasicB, cfg.WavePhasicB.toUtf8().constData(), sizeof(out_cfg->WavePhasicB) - 1);
strncpy(out_cfg->WavePhasicC, cfg.WavePhasicC.toUtf8().constData(), sizeof(out_cfg->WavePhasicC) - 1);
strncpy(out_cfg->UnitOfTimeUnit, cfg.UnitOfTimeUnit.toUtf8().constData(), sizeof(out_cfg->UnitOfTimeUnit) - 1);
strncpy(out_cfg->ValueOfTimeUnit, cfg.ValueOfTimeUnit.toUtf8().constData(),sizeof(out_cfg->ValueOfTimeUnit) - 1);
strncpy(out_cfg->WaveTimeFlag, cfg.WaveTimeFlag.toUtf8().constData(), sizeof(out_cfg->WaveTimeFlag) - 1);
strncpy(out_cfg->IEDname, cfg.IEDname.toUtf8().constData(), sizeof(out_cfg->IEDname) - 1);
strncpy(out_cfg->LDevicePrefix, cfg.LDevicePrefix.toUtf8().constData(), sizeof(out_cfg->LDevicePrefix) - 1);
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//lnk2024-8-16 适配角型接线
bool ParseXMLConfig2(int xml_flag, XmlConfig *cfg, list<CTopic*> *ctopiclist,QString path) //解析JiangSu_Config.xml配置文件
{
@@ -2611,8 +2644,8 @@ char* Get_IED(char* devtype)
}
QString ied;
ied.append(xmlinfo_list[type]->xmlcfg.IEDname); // PQMonitor
ied.append(xmlinfo_list[type]->xmlcfg.LDevicePrefix);
ied.append(xmlinfo_list[type]->xmlcfg.IEDname); // 从配置文件读取的终端名
ied.append(xmlinfo_list[type]->xmlcfg.LDevicePrefix); //// 从配置文件读取的监测点名
ied.append("%d");
QByteArray byteArray = ied.toLocal8Bit();

5
json/save2json.cpp
View File

@@ -71,6 +71,8 @@ extern "C" {
#define nullptr NULL
#endif
extern uint32_t g_mqproducer_blocked_times;
extern int INITFLAG;
extern std::string FRONT_INST;
@@ -528,6 +530,9 @@ void KafkaSendThread::run()
QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz").toAscii().data());
}
//清空计数器
g_mqproducer_blocked_times =0;
QThread::msleep(10); // 避免 CPU 空转lnk20250326
}