mirror of
https://gitee.com/js-yhsec/energy_storage.git
synced 2026-05-27 18:59:26 +08:00
修改运行监控场站及设备信息查询接口
This commit is contained in:
@@ -11,19 +11,19 @@
|
||||
|
||||
void ElectPeriod::parse(std::string jsonstr)
|
||||
{
|
||||
NJsonNode jsonroot;
|
||||
NJson::parse(jsonstr, jsonroot);
|
||||
njson jsonroot;
|
||||
JSON::parse(jsonstr, jsonroot);
|
||||
|
||||
NJson::read(jsonroot, "price_super_peak", this->priceSuperPeak);
|
||||
NJson::read(jsonroot, "price_peak", this->pricePeak);
|
||||
NJson::read(jsonroot, "price_shoulder", this->priceShoulder);
|
||||
NJson::read(jsonroot, "price_off_peak", this->priceOffPeak);
|
||||
NJson::read<std::vector<std::vector<std::string>>>(jsonroot, "periods", this->vecPeriods);
|
||||
JSON::read(jsonroot, "price_super_peak", this->priceSuperPeak);
|
||||
JSON::read(jsonroot, "price_peak", this->pricePeak);
|
||||
JSON::read(jsonroot, "price_shoulder", this->priceShoulder);
|
||||
JSON::read(jsonroot, "price_off_peak", this->priceOffPeak);
|
||||
JSON::read<std::vector<std::vector<std::string>>>(jsonroot, "periods", this->vecPeriods);
|
||||
}
|
||||
|
||||
std::string ElectPeriod::dump()
|
||||
{
|
||||
NJsonNode jsonroot;
|
||||
njson jsonroot;
|
||||
jsonroot["price_super_peak"] = this->priceSuperPeak;
|
||||
jsonroot["price_peak"] = this->pricePeak;
|
||||
jsonroot["price_shoulder"] = this->priceShoulder;
|
||||
@@ -130,8 +130,6 @@ void AppData::initFromDB()
|
||||
if (station)
|
||||
{
|
||||
auto device = Device::create(fields);
|
||||
auto deviceTypeDef = this->getDeviceTypeDef(device->type);
|
||||
device->group = deviceTypeDef->group;
|
||||
station->addDevice(deviceId, device);
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user