Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
134 lines
4.4 KiB
C++
134 lines
4.4 KiB
C++
/**
|
|
* Handler for the HMI language
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "object_charge_administration.h"
|
|
|
|
#include <AreaEffectSimulation/aes_dts.h>
|
|
|
|
namespace AreaEffectSimulation
|
|
{
|
|
|
|
ObjectChargeAdministration::ObjectChargeAdministration(MainHandler *mainHandler, QObject *parent)
|
|
: QObject(parent)
|
|
, m_mainHandler(mainHandler)
|
|
, m_logger(getLogger("ObjectChargeAdministration"))
|
|
{
|
|
}
|
|
|
|
ObjectChargeAdministration::~ObjectChargeAdministration() { m_mainHandler->dds()->dts()->removeChargeAdministrationByKey(m_data.id); }
|
|
|
|
Core::FunctionReplyObject ObjectChargeAdministration::createObject(const Database::AesChargeAdministration &data)
|
|
{
|
|
m_data = data;
|
|
m_data.changed = m_mainHandler->dds()->currentPartitionTimeMSec();
|
|
|
|
m_isAdlerChargeType = m_mainHandler->dds()->pdmDtc()->isAdlerChargeType(data.chargeTypeId);
|
|
|
|
// New Data!
|
|
if (m_data.id <= 0)
|
|
{
|
|
if (!m_mainHandler->db()->insert(m_data))
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error inserting ChargeAdministration-data into database."));
|
|
}
|
|
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectChargeAdministration::updateObject(const Database::AesChargeAdministration &data)
|
|
{
|
|
m_data = data;
|
|
m_data.changed = m_mainHandler->dds()->currentPartitionTimeMSec();
|
|
if (!m_mainHandler->db()->update(m_data))
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating charge with id %1 in database.")).arg(m_data.id);
|
|
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectChargeAdministration::claimPlannedCharge(int count)
|
|
{
|
|
DEBUG_LOG(m_logger) << "claimPlannedCharge for id : " << m_data.chargeTypeId << ", count: " << count;
|
|
|
|
// Works both directions, can "claim" negative count!
|
|
if (m_data.amount - m_data.planned < count)
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Not enough charges left. Wanted to claim %1, but only %2 left."))
|
|
.arg(count)
|
|
.arg(m_data.amount - m_data.planned);
|
|
|
|
m_data.planned += count;
|
|
if (m_data.planned < 0) // cannot have negative planned
|
|
m_data.planned = 0;
|
|
|
|
m_data.changed = m_mainHandler->dds()->currentPartitionTimeMSec();
|
|
if (!m_mainHandler->db()->update(m_data))
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating charge with id %1 in database.")).arg(m_data.id);
|
|
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
Core::FunctionReplyObject ObjectChargeAdministration::consumeCharge(int count, bool wasPlanned)
|
|
{
|
|
if (!m_isAdlerChargeType)
|
|
{
|
|
if (m_data.planned < count)
|
|
{
|
|
// consume what is possible
|
|
WARNING_LOG(m_logger) << "Cannot consume " << count << ", consuming instead " << m_data.planned << " planned";
|
|
count = m_data.planned;
|
|
}
|
|
|
|
DEBUG_LOG(m_logger) << "consumeCharge for id : " << m_data.chargeTypeId << ", count: " << count;
|
|
|
|
if (wasPlanned && m_data.planned < count)
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Wanted to consume %1 planned charges, but only %2 had been planned.")).arg(count).arg(m_data.planned);
|
|
|
|
if (!wasPlanned && m_data.planned < count)
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Wanted to consume %1 freely available charges, but only %2 had not yet been planned."))
|
|
.arg(count)
|
|
.arg(m_data.amount - m_data.planned);
|
|
|
|
if (wasPlanned)
|
|
m_data.planned -= count;
|
|
}
|
|
|
|
m_data.amount -= count;
|
|
|
|
if (count > 0)
|
|
m_data.used += count;
|
|
|
|
m_data.changed = m_mainHandler->dds()->currentPartitionTimeMSec();
|
|
if (!m_mainHandler->db()->update(m_data))
|
|
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating charge with id %1 in database.")).arg(m_data.id);
|
|
|
|
onPublishData();
|
|
|
|
return Core::FunctionReplyObject(m_data.id);
|
|
}
|
|
|
|
int ObjectChargeAdministration::availableCharge() const { return m_data.amount - m_data.planned; }
|
|
|
|
void ObjectChargeAdministration::onPublishData()
|
|
{
|
|
ChargeAdministration ddsData(m_data.id,
|
|
m_data.chargeTypeId,
|
|
m_data.partyId,
|
|
m_data.effectSourceId,
|
|
m_data.planned,
|
|
m_data.amount,
|
|
m_data.used,
|
|
m_data.amountChangedByOperator,
|
|
m_data.changed);
|
|
m_mainHandler->dds()->dts()->publish(ddsData);
|
|
}
|
|
|
|
} // namespace AreaEffectSimulation
|