GZHM/HM-SPMS
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: GZHM:a906bfaba7172f99decf807b9fe35dfa5df912a5
Branches Tags
GZHM:master
..
compare: GZHM:d2faf5ba513a46bf4da8dc0b3406014e299431a4
Branches Tags
GZHM:master

No commits in common. "a906bfaba7172f99decf807b9fe35dfa5df912a5" and "d2faf5ba513a46bf4da8dc0b3406014e299431a4" have entirely different histories.
a906bfaba7 ... d2faf5ba51

2 changed files with 18 additions and 33 deletions
Show Stats Expand all files Collapse all files

2
platform/src/include/tools/model_common/common_global.h
View File

@ -635,6 +635,4 @@
#define CN_IS_SAMPLE "IS_SAMPLE"
#define CN_DEV_PORT "DEV_PORT"
#define CN_NET_DESC1 "NET_DESC1"
#define CN_RTU_ADDR "RTU_ADDR"
#endif // COMMON_GLOBAL_H

49
platform/src/tools/model_plugin/TempPlugin/kbdcustominstplugindlg.cpp
View File

@ -108,7 +108,7 @@ void kbdCustomInstPluginDlg::initData()
ds.getSqlInfoToCombobox(sql,CN_DESC,CN_LOCATION_ID,m_cbLocation);
m_listColName << tr("套件") << tr("设备组标签") << tr("设备组描述") << tr("前置设备名称") << tr("前置设备描述")
<< tr("通道名称") << tr("通道描述")<< tr("通道地址") << tr("RTU名称") << tr("RTU描述")<< tr("RTU地址");
<< tr("通道名称") << tr("通道描述") << tr("RTU名称") << tr("RTU描述");
m_table->setColumnCount(m_listColName.size());
m_table->setHorizontalHeaderLabels(m_listColName);
m_table->horizontalHeader()->setStretchLastSection(true);
@ -160,28 +160,23 @@ void kbdCustomInstPluginDlg::onAdd()
item = new QTableWidgetItem(m_listChanDesInfo.first().first());
item->setData(Qt::UserRole,m_listChanDesInfo.first().last());
m_table->setItem(nCount,6,item);
}
item = new QTableWidgetItem("127.0.0.1");
m_table->setItem(nCount,7,item);
if(m_listRTUTagInfo.isEmpty())
{
m_table->setItem(nCount,7,new QTableWidgetItem);
m_table->setItem(nCount,8,new QTableWidgetItem);
m_table->setItem(nCount,9,new QTableWidgetItem);
}
else
{
item = new QTableWidgetItem(m_listRTUTagInfo.first().first());
item->setData(Qt::UserRole,m_listRTUTagInfo.first().last());
m_table->setItem(nCount,8,item);
m_table->setItem(nCount,7,item);
item = new QTableWidgetItem(m_listRTUDesInfo.first().first());
item->setData(Qt::UserRole,m_listRTUDesInfo.first().last());
m_table->setItem(nCount,9,item);
m_table->setItem(nCount,8,item);
}
item = new QTableWidgetItem("1");
m_table->setItem(nCount,10,item);
connect(m_table,&QTableWidget::itemChanged,this,&kbdCustomInstPluginDlg::onTableItemChange);
}
@ -731,13 +726,13 @@ void kbdCustomInstPluginDlg::onLoactionAndSubsystemChange()
if(m_listRTUTagInfo.isEmpty())
{
m_table->setItemDelegateForColumn(7,nullptr);
m_table->setItemDelegateForColumn(8,nullptr);
m_table->setItemDelegateForColumn(9,nullptr);
}
else
{
m_table->setItemDelegateForColumn(8,new CboxDelegate(m_listRTUTagInfo,this));
m_table->setItemDelegateForColumn(9,new CboxDelegate(m_listRTUDesInfo,this));
m_table->setItemDelegateForColumn(7,new CboxDelegate(m_listRTUTagInfo,this));
m_table->setItemDelegateForColumn(8,new CboxDelegate(m_listRTUDesInfo,this));
}
}
@ -765,23 +760,23 @@ void kbdCustomInstPluginDlg::onTableItemChange(QTableWidgetItem *item)
if(listDes.contains(item->text()))
m_table->item(nRow,5)->setText(item->data(Qt::UserRole).toString());
}
else if(bCol ==8)
else if(bCol == 7)
{
QStringList tags;
for(int i = 0;i < m_listRTUTagInfo.size();i++)
tags << m_listRTUTagInfo.at(i).first();
if(tags.contains(item->text()))
m_table->item(nRow,9)->setText(item->data(Qt::UserRole).toString());
m_table->item(nRow,8)->setText(item->data(Qt::UserRole).toString());
}
else if(bCol == 9)
else if(bCol == 8)
{
QStringList listDes;
for(int i = 0;i < m_listRTUDesInfo.size();i++)
listDes << m_listRTUDesInfo.at(i).first();
if(listDes.contains(item->text()))
m_table->item(nRow,8)->setText(item->data(Qt::UserRole).toString());
m_table->item(nRow,7)->setText(item->data(Qt::UserRole).toString());
}
connect(m_table,&QTableWidget::itemChanged,this,&kbdCustomInstPluginDlg::onTableItemChange);
}
@ -802,7 +797,7 @@ void kbdCustomInstPluginDlg::getInstDevCfg()
m_listGrpInfo.clear();
for(int i = 0;i < m_table->rowCount();i++)
{
QString pluginName, devGrpTag, devGrpName,fesGrpTag, fesGrpName, chanTag, chanName,chanAddr, RTUTag, RTUName,RTUAddr;
QString pluginName, devGrpTag, devGrpName,fesGrpTag, fesGrpName, chanTag, chanName, RTUTag, RTUName;
//套件标签
QTableWidgetItem* item = m_table->item(i,0);
@ -831,29 +826,23 @@ void kbdCustomInstPluginDlg::getInstDevCfg()
chanName = item->text();
item = m_table->item(i,7);
chanAddr = item->text();
item = m_table->item(i,8);
RTUTag = item->text();
item = m_table->item(i,9);
item = m_table->item(i,8);
RTUName = item->text();
item = m_table->item(i,10);
RTUAddr = item->text();
devGrpTag = locationTagName + "." + devGrpTag;
chanTag = locationTagName + "." + subSystemTag + "." + chanTag;
RTUTag = chanTag + "." + RTUTag;
m_listChan << (QStringList() << chanTag<<chanAddr << chanName);
m_listChan << (QStringList() << chanTag << chanName);
m_listGrpInfo <<(QStringList() << devGrpTag << devGrpName << RTUTag);
auto iterRtu = m_mapRTU.find(chanTag);
if(iterRtu != m_mapRTU.end())
iterRtu.value() << (QStringList() << RTUTag<<RTUAddr << RTUName);
iterRtu.value() << (QStringList() << RTUTag << RTUName);
else
m_mapRTU.insert(chanTag,QList<QStringList>() << (QStringList() << RTUTag<<RTUAddr << RTUName));
m_mapRTU.insert(chanTag,QList<QStringList>() << (QStringList() << RTUTag << RTUName));
auto iter = m_mapInstDev.find(pluginName);
if(iter != m_mapInstDev.end())
@ -942,7 +931,6 @@ bool kbdCustomInstPluginDlg::creatChannel()
rowData.replace(chanModelCols.findCol(CN_CHAN_NAME),strChanTag.split(".").last());
rowData.replace(chanModelCols.findCol(CN_DESC),strChanName);
rowData.replace(chanModelCols.findCol(CN_TAG_NAME),strChanTag);
rowData.replace(chanModelCols.findCol(CN_NET_DESC1),iter->at(1));
chanRowDatas << rowData;
}
@ -1041,7 +1029,6 @@ bool kbdCustomInstPluginDlg::creatRTU()
rowData.replace(rtuModelCols.findCol(CN_RTU_NAME),strRTUTag.split(".").last());
rowData.replace(rtuModelCols.findCol(CN_DESC),iterRtu->last());
rowData.replace(rtuModelCols.findCol(CN_TAG_NAME),strRTUTag);
rowData.replace(rtuModelCols.findCol(CN_RTU_ADDR),iterRtu->at(1));
rtuRowDatas << rowData;
}
m_mapRTU.erase(iter);
@ -1270,7 +1257,7 @@ bool kbdCustomInstPluginDlg::checkDevGrp(QStringList &listExistDevGrpTag)
item = m_table->item(i,5);
chanTag = item->text();
item = m_table->item(i,8);
item = m_table->item(i,7);
RTUTag = item->text();
if(plugin.isEmpty() || devGrpTag.isEmpty() || fesGrpTag.isEmpty() || chanTag.isEmpty() || RTUTag.isEmpty())
@ -1371,7 +1358,7 @@ bool kbdCustomInstPluginDlg::checkUpdateDevInfo()
item = m_table->item(i,5);
chanTag = locationTagName+ "." +subSystemTag+ "." + item->text();
item = m_table->item(i,8);
item = m_table->item(i,7);
RTUTag = chanTag + "." + item->text();
devGrpTag = locationTagName + "." +devGrpTag;