@@ -501,6 +501,7 @@ void InteractiveCAN::slotHttpResponseGetIsolationPointInfo(QByteArray data)
if (WorkNodeFormModel::instance()->modelType() == QString("isolation")) {
m_pointInfo.append(info);
if (m_pointInfo.length() == m_isolationPoints.length()) {
+ m_lockRFIDs.clear();
getLockRFIDs(m_lockRFIDs); // 获取锁的信息
}
@@ -1621,6 +1621,7 @@ bool CANClient::getLockRfids(int lockCount, QMap<int, QString> &rfids)
if (m_locksRFIDStatus[iter.key()].lockRFIDMap.find(hasKeyIter.key()) == m_locksRFIDStatus[iter.key()].lockRFIDMap.end()) {
continue;
+ if (m_locksRFIDStatus[iter.key()].lockRFIDMap[hasKeyIter.key()].isEmpty()) continue;
rfids.insert(hasKeyIter.key(), m_locksRFIDStatus[iter.key()].lockRFIDMap[hasKeyIter.key()]);
if (rfids.count() >= lockCount) {