板卡初始化时不提交配置信息,
This commit is contained in:
parent
86c69992d5
commit
8765f74530
@ -870,10 +870,10 @@ void CBoardSetting::on_pushButton_Init_clicked()
|
|||||||
strTablename = "t_TriggerConfig";
|
strTablename = "t_TriggerConfig";
|
||||||
g_SqliteDB->DeleteData(strTablename);
|
g_SqliteDB->DeleteData(strTablename);
|
||||||
|
|
||||||
QString strURL = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitWorkConditionsInfo.json");
|
// QString strURL = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitWorkConditionsInfo.json");
|
||||||
g_FtpClient->SetServerInfo(strURL);
|
// g_FtpClient->SetServerInfo(strURL);
|
||||||
g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
// g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
||||||
g_FtpClient->UpLoadFile(fileName,"UnitWorkConditionsInfo.json");
|
// g_FtpClient->UpLoadFile(fileName,"UnitWorkConditionsInfo.json");
|
||||||
customLogMessageHandler(QtDebugMsg,"初始化工况配置信息推送完成!");
|
customLogMessageHandler(QtDebugMsg,"初始化工况配置信息推送完成!");
|
||||||
QJsonDocument jsonDocUnit;
|
QJsonDocument jsonDocUnit;
|
||||||
QJsonObject UnitObj;
|
QJsonObject UnitObj;
|
||||||
@ -885,10 +885,10 @@ void CBoardSetting::on_pushButton_Init_clicked()
|
|||||||
fileUnit.open(QIODevice::WriteOnly);
|
fileUnit.open(QIODevice::WriteOnly);
|
||||||
fileUnit.write(jsonDocUnit.toJson());
|
fileUnit.write(jsonDocUnit.toJson());
|
||||||
fileUnit.close();
|
fileUnit.close();
|
||||||
QString str2 = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitConfigurations.json");
|
// QString str2 = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitConfigurations.json");
|
||||||
g_FtpClient->SetServerInfo(str2);
|
// g_FtpClient->SetServerInfo(str2);
|
||||||
g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
// g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
||||||
g_FtpClient->UpLoadFile(fileNameUnit,"UnitConfigurations.json");
|
// g_FtpClient->UpLoadFile(fileNameUnit,"UnitConfigurations.json");
|
||||||
customLogMessageHandler(QtDebugMsg,"初始化机组配置信息推送完成!");
|
customLogMessageHandler(QtDebugMsg,"初始化机组配置信息推送完成!");
|
||||||
g_channelSetting = g_SqliteDB->GetDataMultiLine("t_ChannelSetting");
|
g_channelSetting = g_SqliteDB->GetDataMultiLine("t_ChannelSetting");
|
||||||
g_ChannelBaseInfo.clear();
|
g_ChannelBaseInfo.clear();
|
||||||
@ -937,15 +937,15 @@ void CBoardSetting::on_pushButton_Init_clicked()
|
|||||||
fileTri.open(QIODevice::WriteOnly);
|
fileTri.open(QIODevice::WriteOnly);
|
||||||
fileTri.write(jsonDocTri.toJson());
|
fileTri.write(jsonDocTri.toJson());
|
||||||
fileTri.close();
|
fileTri.close();
|
||||||
QString str1 = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("TriggerSettings.json");
|
// QString str1 = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("TriggerSettings.json");
|
||||||
g_FtpClient->SetServerInfo(str1);
|
// g_FtpClient->SetServerInfo(str1);
|
||||||
g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
// g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
||||||
g_FtpClient->UpLoadFile(fileNameTri,"TriggerSettings.json");
|
// g_FtpClient->UpLoadFile(fileNameTri,"TriggerSettings.json");
|
||||||
|
|
||||||
QString str = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitBoardsInfo.json");
|
// QString str = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("UnitBoardsInfo.json");
|
||||||
g_FtpClient->SetServerInfo(str);
|
// g_FtpClient->SetServerInfo(str);
|
||||||
g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
// g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
||||||
g_FtpClient->UpLoadFile(name,"UnitBoardsInfo.json");
|
// g_FtpClient->UpLoadFile(name,"UnitBoardsInfo.json");
|
||||||
customLogMessageHandler(QtDebugMsg,"初始化机组板卡配置信息推送完成!");
|
customLogMessageHandler(QtDebugMsg,"初始化机组板卡配置信息推送完成!");
|
||||||
putJson();
|
putJson();
|
||||||
|
|
||||||
@ -1089,10 +1089,10 @@ void CBoardSetting::putJson()
|
|||||||
g_ChannelBaseInfo.append(tempchannelbaseinfo);
|
g_ChannelBaseInfo.append(tempchannelbaseinfo);
|
||||||
}
|
}
|
||||||
initReadConfig();
|
initReadConfig();
|
||||||
QString str = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("ChannelSettings.json");
|
// QString str = QString("ftp://%1/CIDW/qtconfig/%2").arg(IP).arg("ChannelSettings.json");
|
||||||
g_FtpClient->SetServerInfo(str);
|
// g_FtpClient->SetServerInfo(str);
|
||||||
g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
// g_FtpClient->SetUserInfo("root","@#cidw!@123456");
|
||||||
g_FtpClient->UpLoadFile(name,"ChannelSettings.json");
|
// g_FtpClient->UpLoadFile(name,"ChannelSettings.json");
|
||||||
customLogMessageHandler(QtDebugMsg,"初始化通道配置信息推送完成!");
|
customLogMessageHandler(QtDebugMsg,"初始化通道配置信息推送完成!");
|
||||||
disconnect(g_NetMgr,SIGNAL(sigNetMgr(QString, const QVariant&)), this, SLOT(slotNetMgr(QString,const QVariant&)));
|
disconnect(g_NetMgr,SIGNAL(sigNetMgr(QString, const QVariant&)), this, SLOT(slotNetMgr(QString,const QVariant&)));
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user