lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates InfrastructureManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across ism service.
This commit is contained in:
berrux-dev committed 2026-09-21 02:45:09 +02:00
1 parent 472f537313
commit 82356f23e5
30 files changed
+1322 -1314
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp
+73 -73
View File
@@ -26,13 +26,13 @@ ObjectMainSchedule::~ObjectMainSchedule()
//----------------------------------------------------------------------------------------------------
bool ObjectMainSchedule::isValid() const
{
return m_data.id() > 0;
return m_data.id > 0;
}
//----------------------------------------------------------------------------------------------------
bool ObjectMainSchedule::isUsed() const
{
return m_data.isUsed();
return m_data.isUsed;
}
//----------------------------------------------------------------------------------------------------
@@ -40,10 +40,10 @@ Core::FunctionReplyObject ObjectMainSchedule::createObject(const MainSchedule &d
{
m_data = data;
if (m_data.id() <= 0)
if (m_data.id <= 0)
{
// This is a brand new Item to push into the Database
m_data.isUsed(false);
m_data.isUsed = false;
Database::IsmMountingPointSchedule dbData;
dbData = toDbData(data);
@@ -51,8 +51,8 @@ Core::FunctionReplyObject ObjectMainSchedule::createObject(const MainSchedule &d
if (!db()->insert(dbData))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting IsmMainSchedule-data into database"));
m_data.id(dbData.id);
DEBUG_LOG(m_logger) << "New Id: " << m_data.id();
m_data.id = dbData.id;
DEBUG_LOG(m_logger) << "New Id: " << m_data.id;
// Publish Data via DTS
dts()->publish(m_data);
}
@@ -61,23 +61,23 @@ Core::FunctionReplyObject ObjectMainSchedule::createObject(const MainSchedule &d
// Cannot be done within createObject as the SQL Janitor prevents this!
// Therefore, this item is not published in this case, but within loadMountingPointPlans()!
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
// Cannot be done within createObject as the SQL Janitor prevents this!
bool ObjectMainSchedule::loadMountingPointPlans()
{
m_data.elements().clear();
m_data.elements.clear();
// Data from DB is pushed in here, we just need to update MPPs
auto cbMps = [this] (const Database::IsmMountingPointPlan &data)
{
MountingPointPlan ddsData = ObjectMainSchedule::toDdsData(data);
m_data.elements().push_back(ddsData);
m_mppMap.insert(ddsData.structureElementId(), ddsData);
m_data.elements.push_back(ddsData);
m_mppMap.insert(ddsData.structureElementId, ddsData);
};
// create Mounting Point Schedule objects
if (!db()->selectByMountingPointScheduleId(cbMps,m_data.id()))
if (!db()->selectByMountingPointScheduleId(cbMps,m_data.id))
return false;
return dts()->publish(m_data);
@@ -88,29 +88,29 @@ bool ObjectMainSchedule::loadMountingPointPlans()
Core::FunctionReplyObject ObjectMainSchedule::updateObject(const MainSchedule &data)
{
if (!isValid())
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
Database::IsmMountingPointSchedule dbData;
dbData = toDbData(data);
if (!db()->update(dbData))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating IsmMainSchedule-data into database"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating IsmMainSchedule-data into database"));
// Change state if different
if (m_data.statusId() != data.statusId())
setScheduleStatus(data.statusId());
if (m_data.statusId != data.statusId)
setScheduleStatus(data.statusId);
// If elements are not saved, a MainSchedule with 0 elements will be published.
std::vector< InfrastructureManagement::MountingPointPlan > tempElements = m_data.elements();
std::vector< InfrastructureManagement::MountingPointPlan > tempElements = m_data.elements;
m_data = data;
m_data.elements(tempElements);
m_data.elements = tempElements;
DEBUG_LOG(m_logger) << "Data changed for Id: " << m_data.id();
DEBUG_LOG(m_logger) << "Data changed for Id: " << m_data.id;
// Publish Data via DTS
dts()->publish(m_data);
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//----------------------------------------------------------------------------------------------------
@@ -135,11 +135,11 @@ Core::FunctionReplyObject ObjectMainSchedule::copyObject(qint32 scheduleId)
// auto cbMps = [this] (const Database::IsmMountingPointPlan &data)
// {
// InfrastructureManagement::MountingPointPlan ddsData = ObjectMainSchedule::toDdsData(data);
// m_data.elements().push_back(ddsData);
// m_data.elements.push_back(ddsData);
// };
// // create Mounting Point Schedule objects
// if (!db()->selectByMountingPointScheduleId(cbMps,m_data.id()))
// if (!db()->selectByMountingPointScheduleId(cbMps,m_data.id))
// {
// return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting IsmMountingPointPlan-data into DDS Structure"));
// }
@@ -155,23 +155,23 @@ Core::FunctionReplyObject ObjectMainSchedule::updateElements(const std::vector<M
bool retVal = true;
for (const MountingPointPlan &mpp : newElements)
{
int seId = mpp.structureElementId();
int seId = mpp.structureElementId;
if (m_mppMap.contains(seId))
{
if (mpp.mountingPointState() == MountingPointState_def::Idle)
if (mpp.mountingPointState == MountingPointState::Idle)
{
retVal &= db()->deleteMountingPointPlan(m_data.id(), seId);
retVal &= db()->deleteMountingPointPlan(m_data.id, seId);
m_mppMap.remove(seId);
}
else
{
retVal &= db()->updateMountingPointPlan(m_data.id(), seId, mpp.mountingPointState());
retVal &= db()->updateMountingPointPlan(m_data.id, seId, mpp.mountingPointState);
m_mppMap[seId] = mpp;
}
}
else
{
auto copy = toDbData(m_data.id(), mpp);
auto copy = toDbData(m_data.id, mpp);
m_mppMap[seId] = mpp;
// Do this as a bulk....
insert.push_back(copy);
@@ -180,50 +180,50 @@ Core::FunctionReplyObject ObjectMainSchedule::updateElements(const std::vector<M
retVal &= db()->insertMountingPointPlans(insert);
trans.commit();
m_data.elements().clear();
m_data.elements().reserve(m_mppMap.size());
std::copy(m_mppMap.begin(), m_mppMap.end(),std::back_inserter(m_data.elements()));
m_data.elements.clear();
m_data.elements.reserve(m_mppMap.size());
std::copy(m_mppMap.begin(), m_mppMap.end(),std::back_inserter(m_data.elements));
QTimer::singleShot(50, [this](){dts()->publish(m_data);});
if (!retVal)
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Error on updating MountingPoint Plans."));
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error on updating MountingPoint Plans."));
return Core::FunctionReplyObject(m_data.id);
}
//----------------------------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectMainSchedule::setUsed(bool isUsed)
{
if (!isValid())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed IsmMainSchedule object"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed IsmMainSchedule object"));
m_data.isUsed(isUsed);
m_data.isUsed = isUsed;
// Publish Data via DTS
//onPublishData();
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//----------------------------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectMainSchedule::removeObject()
{
if (isUsed())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "MainSchedule still in use"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "MainSchedule still in use"));
if (!db()->removeIsmMountingPointSchedule(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "MainSchedule with id %1 can not be removed from DB")).arg(m_data.id());
if (!db()->removeIsmMountingPointSchedule(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "MainSchedule with id %1 can not be removed from DB")).arg(m_data.id);
if (!dts()->removeMainScheduleByKey(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "MainSchedule with id %1 can not be removed from DDS")).arg(m_data.id());
if (!dts()->removeMainScheduleByKey(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "MainSchedule with id %1 can not be removed from DDS")).arg(m_data.id);
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//----------------------------------------------------------------------------------------------------
bool ObjectMainSchedule::setScheduleStatus(const ScheduleStatus &status)
{
if (m_data.statusId() == status)
if (m_data.statusId == status)
return true;
if (!isValid())
@@ -232,22 +232,22 @@ bool ObjectMainSchedule::setScheduleStatus(const ScheduleStatus &status)
return false;
}
DEBUG_LOG(m_logger) << "## old status = " << m_data.statusId();
DEBUG_LOG(m_logger) << "## old status = " << m_data.statusId;
DEBUG_LOG(m_logger) << "## new status = " << status;
m_data.statusId() = status;
m_data.statusId = status;
QDateTime changed = QDateTime::currentDateTimeUtc();
if (m_data.timeCreated() <= 0)
m_data.timeCreated() = changed.toMSecsSinceEpoch();
if (m_data.timeCreated <= 0)
m_data.timeCreated = changed.toMSecsSinceEpoch();
switch (m_data.statusId().underlying())
switch (m_data.statusId)
{
case ScheduleStatus::Active:
m_data.timeStart() = changed.toMSecsSinceEpoch();
m_data.timeStart = changed.toMSecsSinceEpoch();
break;
case ScheduleStatus::Inactive:
m_data.timeEnd() = changed.toMSecsSinceEpoch();
m_data.timeEnd = changed.toMSecsSinceEpoch();
break;
default:
break;
@@ -258,13 +258,13 @@ bool ObjectMainSchedule::setScheduleStatus(const ScheduleStatus &status)
if (!db()->update(dbData))
{
ERROR_LOG(m_logger) << "Error updating MainSchedule-data in database (ScheduleStatus) for id = " << m_data.id() << " : " << db()->getLastError().text();;
ERROR_LOG(m_logger) << "Error updating MainSchedule-data in database (ScheduleStatus) for id = " << m_data.id << " : " << db()->getLastError().text();;
return false;
}
Database::IsmScheduleStatusChange stateChange;
stateChange.id = 0;
stateChange.scheduleId = m_data.id();
stateChange.scheduleId = m_data.id;
stateChange.changedAt = changed.currentMSecsSinceEpoch();
// record stateChange
@@ -286,20 +286,20 @@ Database::IsmMountingPointSchedule ObjectMainSchedule::toDbData(const MainSchedu
{
Database::IsmMountingPointSchedule dbData;
dbData.id = ddsData.id();
dbData.name = QString::fromStdString(ddsData.name());
dbData.timeCreated = QDateTime::fromMSecsSinceEpoch(ddsData.timeCreated());
dbData.statusId = ddsData.statusId();
if (ddsData.timeStart().is_set() && ddsData.timeStart().get() > 0)
dbData.timeStart = QDateTime::fromMSecsSinceEpoch(ddsData.timeStart().get());
dbData.id = ddsData.id;
dbData.name = QString::fromStdString(ddsData.name);
dbData.timeCreated = QDateTime::fromMSecsSinceEpoch(ddsData.timeCreated);
dbData.statusId = ddsData.statusId;
if (ddsData.timeStart.is_set() && ddsData.timeStart.get() > 0)
dbData.timeStart = QDateTime::fromMSecsSinceEpoch(ddsData.timeStart.get());
else
dbData.timeStart = QDateTime();
if (ddsData.timeEnd().is_set() && ddsData.timeEnd().get() > 0)
dbData.timeEnd = QDateTime::fromMSecsSinceEpoch(ddsData.timeEnd().get());
if (ddsData.timeEnd.is_set() && ddsData.timeEnd.get() > 0)
dbData.timeEnd = QDateTime::fromMSecsSinceEpoch(ddsData.timeEnd.get());
else
dbData.timeEnd = QDateTime();
if (ddsData.exerciseId().is_set() && ddsData.exerciseId().get() > 0)
dbData.exerciseId = ddsData.exerciseId().get();
if (ddsData.exerciseId.is_set() && ddsData.exerciseId.get() > 0)
dbData.exerciseId = ddsData.exerciseId.get();
return dbData;
}
@@ -309,9 +309,9 @@ Database::IsmMountingPointPlan ObjectMainSchedule::toDbData(int scheduleId, cons
{
Database::IsmMountingPointPlan dbData;
dbData.structureElementId = ddsData.structureElementId();
dbData.structureElementId = ddsData.structureElementId;
dbData.mountingPointScheduleId = scheduleId;
dbData.mountingPointState= ddsData.mountingPointState();
dbData.mountingPointState= ddsData.mountingPointState;
return dbData;
}
@@ -323,19 +323,19 @@ MainSchedule ObjectMainSchedule::toDdsData(const Database::IsmMountingPointSched
{
MainSchedule ddsData;
ddsData.id(dbData.id);
ddsData.name(dbData.name.toStdString());
ddsData.statusId(dbData.statusId);
ddsData.id = dbData.id;
ddsData.name = dbData.name.toStdString();
ddsData.statusId = dbData.statusId;
if (!dbData.timeStart.isNull() && dbData.timeStart.isValid() && dbData.timeStart.toMSecsSinceEpoch() > 0)
ddsData.timeStart(dbData.timeStart.toMSecsSinceEpoch());
ddsData.timeStart = dbData.timeStart.toMSecsSinceEpoch();
if (!dbData.timeEnd.isNull() && dbData.timeEnd.isValid() && dbData.timeEnd.toMSecsSinceEpoch() > 0)
ddsData.timeEnd(dbData.timeEnd.toMSecsSinceEpoch());
ddsData.timeCreated(dbData.timeCreated.toMSecsSinceEpoch());
ddsData.timeEnd = dbData.timeEnd.toMSecsSinceEpoch();
ddsData.timeCreated = dbData.timeCreated.toMSecsSinceEpoch();
if (!dbData.exerciseId.isNull() && dbData.exerciseId.canConvert<int>())
ddsData.exerciseId(dbData.exerciseId.toInt());
ddsData.exerciseId = dbData.exerciseId.toInt();
// init data not in db
ddsData.isDeleted(false);
ddsData.isUsed(false);
ddsData.isDeleted = false;
ddsData.isUsed = false;
return ddsData;
}
@@ -343,8 +343,8 @@ MainSchedule ObjectMainSchedule::toDdsData(const Database::IsmMountingPointSched
MountingPointPlan ObjectMainSchedule::toDdsData(const Database::IsmMountingPointPlan &dbData)
{
MountingPointPlan ddsData;
ddsData.mountingPointState(dbData.mountingPointState);
ddsData.structureElementId(dbData.structureElementId);
ddsData.mountingPointState = dbData.mountingPointState;
ddsData.structureElementId = dbData.structureElementId;
return ddsData;
}