jsyhsec/energy_storage
7
0
Fork 0
mirror of https://gitee.com/js-yhsec/energy_storage.git synced 2026-05-28 03:09:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改运行监控场站及设备信息查询接口

Browse Source
This commit is contained in:
lixiaoyuan
2025-09-06 15:23:07 +08:00
parent aca9a8f0ae
commit 566a3b050c
17 changed files with 468 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pv/pages/MaskPageRunning.cpp
View File

@@ -245,7 +245,7 @@ void MaskPageRunning::initModule(Module& module, std::string name, int x, int y,
{
module.name = name;
int deviceNum = activeStation->getDeviceNumByGroup(name);
int deviceNum = activeStation->getDeviceNumByGroup(1);
int pid = module.widget = PvApp::label(p, 0, x, y, w, h, "", QSS::LABEL_BOX);
PvApp::label(p, module.widget, 10, 20, w, 30, module.name, QSS::LABEL_TITLE);
pvSetAlignment(p, module.widget, AlignTop | AlignLeft);
@@ -283,7 +283,7 @@ void MaskPageRunning::activeBoxPanel(Module* module)
{
// 更新卡片：
std::vector<std::shared_ptr<Device>> vecDevice;
activeStation->getDeviceByGroup(module->name, vecDevice);
activeStation->getDeviceByGroup(1, vecDevice);
pvSetText(p, module->labelNum, std::to_string(vecDevice.size()).c_str());
@@ -298,7 +298,7 @@ void MaskPageRunning::activeBoxPanel(Module* module)
if (typeDef)
{
std::vector<std::string> vecKeys;
NJson::parse(typeDef->fieldsAttr.value("key"), vecKeys);
JSON::parse(typeDef->fieldsAttr.value("key"), vecKeys);
card->setCard(typeDef->name, device->name, device->code);
card->setParamkeys(vecKeys);
}

44
src/pv/pages/PanelPolicy.cpp
View File

@@ -265,14 +265,14 @@ void PanelPolicyPeak::setTimeText(int id, std::string s)
void PanelPolicyPeak::parseAttr(std::string str)
{
NJsonNode jsonroot;
bool ret = NJson::parse(str, jsonroot);
njson jsonroot;
bool ret = JSON::parse(str, jsonroot);
if (!ret)
{
return;
}
NJson::read(jsonroot, "times", data.times);
JSON::read(jsonroot, "times", data.times);
// 更新UI (充电策略)
if (data.times == 2)
{
@@ -286,7 +286,7 @@ void PanelPolicyPeak::parseAttr(std::string str)
}
std::vector<std::vector<int>> vecTmp;
NJson::read<std::vector<std::vector<int>>>(jsonroot, "period", vecTmp);
JSON::read<std::vector<std::vector<int>>>(jsonroot, "period", vecTmp);
for (int row = 0; row < data.vecPeriods.size(); ++row)
{
auto& vecRows = data.vecPeriods[row];
@@ -358,13 +358,13 @@ void PanelPolicyPeak::parseAttr(std::string str)
std::string PanelPolicyPeak::dumpAttr()
{
NJsonNode jsonroot;
njson jsonroot;
jsonroot["period"] = data.vecPeriods;
jsonroot["times"] = data.times;
NJsonNode nodeCycle = NJsonNode::array();
njson nodeCycle = njson::array();
NJsonNode nodeAttr1;
njson nodeAttr1;
nodeAttr1["charge_start"] = data.attr1.chargeTimeStart;
nodeAttr1["charge_end"] = data.attr1.chargeTimeEnd;
nodeAttr1["charge_power"] = data.attr1.chargePower;
@@ -374,7 +374,7 @@ std::string PanelPolicyPeak::dumpAttr()
nodeCycle.push_back(nodeAttr1);
if (data.times > 1)
{
NJsonNode nodeAttr2;
njson nodeAttr2;
nodeAttr2["charge_start"] = data.attr2.chargeTimeStart;
nodeAttr2["charge_end"] = data.attr2.chargeTimeEnd;
nodeAttr2["charge_power"] = data.attr2.chargePower;
@@ -423,17 +423,17 @@ PanelPolicyRequire::PanelPolicyRequire(PARAM* p, int parent, int ix, int iy, int
void PanelPolicyRequire::parseAttr(std::string str)
{
NJsonNode jsonroot;
bool ret = NJson::parse(str, jsonroot);
njson jsonroot;
bool ret = JSON::parse(str, jsonroot);
if (!ret)
{
return;
}
NJson::read(jsonroot, "charge_soc", data.chargeSoc);
NJson::read(jsonroot, "charge_power", data.chargePower);
NJson::read(jsonroot, "discharge_soc", data.dischargeSoc);
NJson::read(jsonroot, "discharge_power", data.dischargePower);
JSON::read(jsonroot, "charge_soc", data.chargeSoc);
JSON::read(jsonroot, "charge_power", data.chargePower);
JSON::read(jsonroot, "discharge_soc", data.dischargeSoc);
JSON::read(jsonroot, "discharge_power", data.dischargePower);
// 更新UI
pvSetText(p, ui.chargeSoc, std::to_string(data.chargeSoc).c_str());
@@ -444,7 +444,7 @@ void PanelPolicyRequire::parseAttr(std::string str)
std::string PanelPolicyRequire::dumpAttr()
{
NJsonNode jsonroot;
njson jsonroot;
jsonroot["discharge_soc"] = data.dischargeSoc;
jsonroot["discharge_power"] = data.dischargePower;
jsonroot["charge_soc"] = data.chargeSoc;
@@ -471,17 +471,17 @@ PanelPolicySelf::PanelPolicySelf(PARAM* p, int parent, int ix, int iy, int iw, i
void PanelPolicySelf::parseAttr(std::string str)
{
NJsonNode jsonroot;
bool ret = NJson::parse(str, jsonroot);
njson jsonroot;
bool ret = JSON::parse(str, jsonroot);
if (!ret)
{
return;
}
NJson::read(jsonroot, "used_soc", data.usedSoc);
NJson::read(jsonroot, "grid_soc", data.gridSoc);
NJson::read(jsonroot, "charge_power", data.chargePower);
NJson::read(jsonroot, "discharge_power", data.dischargePower);
JSON::read(jsonroot, "used_soc", data.usedSoc);
JSON::read(jsonroot, "grid_soc", data.gridSoc);
JSON::read(jsonroot, "charge_power", data.chargePower);
JSON::read(jsonroot, "discharge_power", data.dischargePower);
// 更新UI
pvSetText(p, ui.usedSoc, std::to_string(data.usedSoc).c_str());
@@ -492,7 +492,7 @@ void PanelPolicySelf::parseAttr(std::string str)
std::string PanelPolicySelf::dumpAttr()
{
NJsonNode jsonroot;
njson jsonroot;
jsonroot["used_soc"] = data.usedSoc;
jsonroot["grid_soc"] = data.gridSoc;
jsonroot["charge_power"] = data.chargePower;