jsyhsec/energy_storage
7
0
Fork 0
mirror of https://gitee.com/js-yhsec/energy_storage.git synced 2026-05-27 18:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改场站策略解析及网关指令下发

Browse Source
This commit is contained in:
lixiaoyuan
2025-09-14 16:00:30 +08:00
parent d1a8fb0665
commit 6418335d9d
14 changed files with 252 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/Release/assets/config/monitoraddr.json
View File

@@ -103,7 +103,7 @@
["功率限值", "31077", "0.0", " kW"],
["输出电压", "31079", "0.0", " V"],
["输出电流", "31081", "0.0", " A"],
["输出功率", "31083", "0.0", " kW"],
["输出功率", "31083", "0.0", " kW"]
]
}
}

5
src/app/AppData.cpp
View File

@@ -106,7 +106,8 @@ bool AppData::initFromDB()
}
{ // 数据库读取场站信息
str = "", result.clear();
DAO::queryStationList(dao, result);
std::string sql = "SELECT s.*, p.name policy_name, p.`type` policy_type, p.value FROM station s LEFT JOIN policy p ON s.policy_id=p.policy_id;";
dao->exec(sql, result);
for (auto& fields: result)
{
auto station = std::make_shared<Station>();
@@ -140,7 +141,7 @@ bool AppData::initFromDB()
DAO::queryPolicyList(dao, result);
for (auto& fields: result)
{
auto policy = std::make_shared<MyPolicy>();
auto policy = std::make_shared<SysPolicy>();
policy->policyId = fields.get<int>(DMPolicy::POLICY_ID);
policy->type = fields.get<int>(DMPolicy::TYPE);
policy->name = fields.value(DMPolicy::NAME);

4
src/app/AppData.h
View File

@@ -11,7 +11,7 @@
class Station;
class Device;
class MyPolicy;
class SysPolicy;
using VecPairSS = std::vector<std::pair<std::string, std::string>>;
@@ -155,7 +155,7 @@ public:
std::unordered_map<int, std::string> mapPolicyType;
// 策略信息
std::unordered_map<int, std::shared_ptr<MyPolicy>> mapPolicy;
std::unordered_map<int, std::shared_ptr<SysPolicy>> mapPolicy;
// 电力峰谷分段 (12个月，每个月按小时分成24个时段)
std::vector<std::vector<std::string>> vecElectPeriods;

146
src/app/Policy.cpp
View File

@@ -0,0 +1,146 @@
#include "Policy.h"
#include "common/Spdlogger.h"
#include "Utils.h"
void SysPolicy::setFields(Fields& fields)
{
this->policyId = fields.get<int>("policy_id");
this->type = fields.get<int>("policy_type");
this->name = fields.value("policy_name");
this->value = fields.value("value");
this->parseValue(value);
}
/// type=1: 峰谷套利
static void ParseJsonType1(njson& json)
{
}
void SysPolicy::getGatewayJsonPrice(njson& json)
{
}
// 1：峰谷套利，2：配网增容，3：应急供电，4：并网保电，5：自定时段
void SysPolicy::parseValue(std::string jsonstr)
{
njson jsonroot;
if (!JSON::parse(jsonstr, jsonroot))
{
spdlog::error("[policy] json parse policy value error, policy_id={}, value={}", policyId, jsonstr);
return;
}
// 读取电价
if (jsonroot.contains("price"))
{
auto& jsonArrayPrice = jsonroot["price"];
for (int i = 0; i<vecPrice.size(); ++i)
{
if (i<jsonArrayPrice.size())
{
vecPrice[i] = Utils::toFloat(jsonArrayPrice[i].get<std::string>());
}
}
}
if (this->type == 1 || this->type == 5)
{
this->parseJsonPeriods(jsonroot);
}
}
void SysPolicy::parseJsonPeriods(njson& jsonroot)
{
if (!jsonroot.contains("period"))
{
spdlog::error("[policy] json parse policy value error, [period] is not exist, value={}", jsonroot.dump());
return;
}
auto& json = jsonroot["period"];
if (!json.is_array())
{
spdlog::error("[policy] json parse policy value error, [period] is not array, value={}", json.dump());
return;
}
// 1: 谷，2：平，3：峰，4：尖
if (this->type == 1) // 峰谷套利
{
vecPeriods1.clear();
for (int i = 0; i<json.size() && i<12; ++i) // 月份信息，最多12个月
{
if (json[i].size() > 0)
{
vecPeriods1.push_back(std::vector<std::pair<std::string, std::string>>());
for (auto& itemMonth: json[i])
{
if (itemMonth.size() >=2) { vecPeriods1[i].push_back({itemMonth[0], itemMonth[1]}); }
}
}
}
}
else if (this->type == 5)
{
//{
// "period":[
// {"charge_time":[],"discharge_time":[],"charge_power":"","discharge_power":""},
// {"charge_time":[],"discharge_time":[],"charge_power":"","discharge_power":""}
// ],
// "price":["0.00","0.00","0.00","0.00"]
//}
vecPeriods1.clear();
for (int i = 0; i<json.size(); ++i) // 一充一放或二充二放
{
vecPeriods1.push_back(std::vector<std::pair<std::string, std::string>>());
auto& item = json[i];
if (item.contains("charge_time") && item["charge_time"].size() >= 2)
{
auto& jsonP = item["charge_time"];
vecPeriods1[i].push_back({jsonP[0], "谷"}); // 第一/二次充电开始
vecPeriods1[i].push_back({jsonP[1], "平"}); // 第一/二次充电结束
}
if (item.contains("discharge_time") && item["discharge_time"].size() >= 2)
{
auto& jsonP = item["discharge_time"];
vecPeriods1[i].push_back({jsonP[0], "尖"}); // 第一/二次放电开始
vecPeriods1[i].push_back({jsonP[1], "峰"}); // 第一/二次放电结束
}
}
}
}
static void PeriodsTimeStrToInt(std::string str, int& h, int& m)
{
int pos = str.find(":");
if (pos != std::string::npos)
{
h = Utils::toInt(str.substr(0, pos));
m = Utils::toInt(str.substr(pos+1));
}
}
void SysPolicy::getGatewayJsonPeriods(njson& json)
{
if (type == 1 || type == 5)
{
// std::vector<std::vector<std::pair<std::string, std::string>>>
for (auto& itemMonth: vecPeriods1)
{
njson jsonArrayMonth = njson::array();
for (auto& item: itemMonth)
{
int h = 0; int m = 0;
PeriodsTimeStrToInt(item.first, h, m);
int p = 1;
if (item.second == "谷") p = 1;
else if (item.second == "平") p = 2;
else if (item.second == "峰") p = 3;
else if (item.second == "尖") p = 4;
jsonArrayMonth.push_back({h, m, p});
}
json.push_back(jsonArrayMonth);
}
}
}

21
src/app/Policy.h
View File

@@ -1,15 +1,32 @@
#pragma once
#include <string>
#include <vector>
#include "common/Fields.h"
#include "common/JsonN.h"
class MyPolicy
class SysPolicy
{
public:
int policyId {0};
// 1：峰谷套利，2：配网增容，3：应急供电，4：并网保电，5：自定时段
int type {0};
std::string name;
std::string value;
int isOpen {0};
int isOpen {1};
Fields fields;
std::vector<float> vecPrice {0.0f, 0.0f, 0.0f, 0.0f};
std::vector<std::vector<std::pair<std::string, std::string>>> vecPeriods1;
void setFields(Fields& fields);
void parseValue(std::string jsonstr);
void parseJsonPeriods(njson& json);
void getGatewayJsonPrice(njson& json);
void getGatewayJsonPeriods(njson& json);
};

17
src/app/Station.cpp
View File

@@ -40,6 +40,9 @@ void Station::setFields(Fields& fields)
this->workModeId = fields.get<int>(DMStation::WORK_MODE);
this->code = fields.value(DMStation::CODE);
this->status = fields.get<int>(DMStation::STATUS);
this->operationDate = fields.value(DMStation::OPERATION_DATE);
this->policy.setFields(fields);
}
void Station::addDevice(int deviceId, std::shared_ptr<Device> device)
@@ -210,7 +213,19 @@ void Station::setGarewayWorkMode()
json["ts"] = Utils::time();
json["no"] = 1; // 设备编号
json["40001"] = this->workModeId;
if (policy.type == 1)
{
json["40002"] = njson::array(); // 峰谷套利
policy.getGatewayJsonPeriods(json["40002"]);
}
else if (policy.type == 5)
{
json["40021"] = njson::array(); // 自定时段
policy.getGatewayJsonPeriods(json["40021"]);
}
std::string text = json.dump();
spdlog::info(text);
mqttCli->publish("Gateway_YT", text);
}
}

5
src/app/Station.h
View File

@@ -3,6 +3,7 @@
#include <memory>
#include <unordered_map>
#include "common/Fields.h"
#include "Policy.h"
class Device;
class MqttClient;
@@ -106,7 +107,6 @@ public:
void setWorkMode(int modeId);
void setPolicy(int policyId);
void writeRuntimeData(std::string dt, int npos);
void initMqtt();
@@ -119,6 +119,9 @@ public:
std::string code;
bool isOpen {false};
int status {0};
std::string operationDate;
SysPolicy policy;
bool isConnected {false};
int workModeId {}; // 运行模式

1
src/database/DataModelDef.h
View File

@@ -93,6 +93,7 @@ namespace DMStation
const string POLICY_ID = "policy_id";
const string CODE = "code";
const string ATTR = "attr";
const string OPERATION_DATE = "operation_date";
}
namespace DMDefDeviceType

11
src/database/MysqlClient.cpp
View File

@@ -1,7 +1,6 @@
#include "MysqlClient.h"
#include "common/Utils.h"
//#include "Spdlogger.h"
#include "Logger.h"
#include "Spdlogger.h"
#include <chrono>
using namespace std;
@@ -28,7 +27,7 @@ int MysqlClient::conn()
{
return 0;
}
if (GetTimestamp() - g_tickErr <= 5)
if (GetTimestamp() - g_tickErr <= 10)
{
return 1;
}
@@ -73,19 +72,19 @@ static int MysqlQuery(MYSQL* mysql, const std::string& sql)
int err = 0;
if (!mysql)
{
XLOGE() << "Mysql exec error, database is not connected.";
spdlog::error("Mysql exec error, database is not connected.");
return err;
}
if (sql.empty())
{
XLOGE() << "Mysql exec error, sql is empty.";
spdlog::error("Mysql exec error, sql is empty.");
return err;
}
err = mysql_query(mysql, sql.c_str());
if (0 != err)
{
err = mysql_errno(mysql);
XLOGE() << "Mysql exec error: " << err << "," << mysql_error(mysql) << ", sql=" << sql;
spdlog::error("Mysql exec error: {}, {}, sql={}", err, mysql_error(mysql), sql);
return err;
}
return err;

53
src/main.cpp
View File

@@ -127,57 +127,14 @@ int main(int argc, char** argv)
SetConsoleOutputCP(CP_UTF8);
// 设置控制台输入为 UTF-8 编码（如果需要输入中文）
SetConsoleCP(CP_UTF8);
float ratio = 1.1f;
int precision = 0;
if (ratio != 1.0f)
{
precision = 2;
};
//qputenv("QTWEBENGINE_REMOTE_DEBUGGING", "9222"); // 即使内置视图，有时也需要开启调试端口
//QApplication app(argc, argv);
//QMainWindow mainWindow;
//// 主窗口和布局
//QWidget myRoot;
//QHBoxLayout* layout = new QHBoxLayout(&myRoot);
//// 创建主 Web 视图
//QWebEngineView* mainWebView = new QWebEngineView;
//mainWebView->load(QUrl("https://www.example.com"));
//// 创建用于显示开发者工具的 Web 视图
//QWebEngineView* devToolsView = new QWebEngineView;
//// 将主 Web 页面的开发者工具页面设置为 devToolsView 的页面
//mainWebView->page()->setDevToolsPage(devToolsView->page());
//// 如果你需要先导航主页面，然后在某个事件（如按钮点击）后显示开发者工具，可以将这行代码放在事件处理函数中。
//// 将两个视图添加到布局中
//layout->addWidget(mainWebView);
//layout->addWidget(devToolsView);
//// 可以适当设置两个视图的大小比例，例如：
//// layout->setStretchFactor(0, 2); // 主视图占2份
//// layout->setStretchFactor(1, 1); // 开发者工具视图占1份
//myRoot.show();
//mainWindow.resize(1600, 900);
//mainWindow.setCentralWidget(&myRoot);
//mainWindow.show();
//// 如果你想在启动时自动打开开发者工具，可以触发一个“打开”事件（但setDevToolsPage本身调用后通常需要一些条件才弹出，有时需要手动在浏览器中inspected后再内置查看）
//// 更常见的做法是连接一个信号，例如页面加载完成后，或者通过一个按钮触发 devToolsView->show()。
//return app.exec();
// 初始化日志
Spdlogger::init(spdlog::level::debug, "");
spdlog::info("[main] start ... ======================================================================");
njson json;
json = {1, 2, 3, 4};
spdlog::info(json.dump());
// 运行后台服务
Application::instance().init();

34
src/protocol/HttpEntity.cpp
View File

@@ -341,7 +341,7 @@ Errcode HttpEntity::login(const httplib::Request& req, njson& json, std::string&
json["permission"] = nodePermission;
}
DAO::insertSystemLogUser(token, "用户登录：" + ErrcodeStr(err), (err==Errcode::OK) ? 0: 1);
DAO::insertSystemLogUser(token, "用户登录：" + ErrcodeStr(err), (err==Errcode::OK) ? 1: 0);
return err;
}
@@ -358,7 +358,7 @@ Errcode HttpEntity::queryUserList(const httplib::Request& req, njson& json, std:
{
HttpHelper::setPagination(pageinfo, result, json);
}
DAO::insertSystemLogUser(token, "查询用户列表：" + ErrcodeStr(err), (err==Errcode::OK) ? 0 : 1);
//DAO::insertSystemLogUser(token, "查询用户列表：" + ErrcodeStr(err), (err==Errcode::OK) ? 1 : 0);
return err;
}
@@ -601,12 +601,38 @@ Errcode HttpEntity::insertStation(const httplib::Request& req, njson& json, std:
Errcode HttpEntity::updateStation(const httplib::Request& req, njson& json, std::string& errmsg)
{
Fields params;
GetRequestParam(req, {"station_id", "name", "address", "lon", "lat", "tel", "capacity", "status", "work_mode"}, params);
GetRequestParam(req, {"station_id", "name", "address", "lon", "lat", "tel", "capacity", "status", "work_mode", "policy_id"}, params);
std::string stationId = params.value("station_id");
params.check("capacity", "", "0.0");
params.check("lon", "", "0.0");
params.check("lat", "", "0.0");
params.check("status", "", "1");
return DAO::updateStationById(params);
Errcode err = DAO::updateStationById(params);
if (err == Errcode::OK)
{
std::string sql = "SELECT s.*, p.name policy_name, p.`type` policy_type, p.value FROM station s LEFT JOIN policy p ON s.policy_id=p.policy_id"
" WHERE s.station_id='" + stationId + "';";
std::vector<Fields> result;
int ret = DaoEntity::execOnce(sql, result);
if (ret != 0)
{
spdlog::error("[http] update station success, set station cache error, station_id={}", stationId);
}
else
{
if (result.size() > 0)
{
auto station = Application::data().getStation(Utils::toInt(stationId));
if (station)
{
station->setFields(result[0]);
station->setGarewayWorkMode();
}
}
}
}
return err;
};
Errcode HttpEntity::deleteStation(const httplib::Request& req, njson& json, std::string& errmsg)

2
src/protocol/MqttEntity.cpp
View File

@@ -194,6 +194,8 @@ void MqttClient::subscribe()
int MqttClient::publish(std::string topic, std::string text)
{
if (!client) return 0;
MQTTAsync_responseOptions options = MQTTAsync_responseOptions_initializer;
options.onSuccess = [](void* context, MQTTAsync_successData* response) {};
options.onFailure = [](void* context, MQTTAsync_failureData* response) {};

15
src/qt/MainWeb.cpp
View File

@@ -79,6 +79,12 @@ MainWeb::MainWeb()
void MainWeb::initWebview()
{
labelWebErr.setParent(this);
labelWebErr.setGeometry(180, 100, 800, 50);
labelWebErr.setText("WEB服务异常！！！");
labelWebErr.setStyleSheet("font: bold 20px;");
labelWebErr.hide();
qputenv("QTWEBENGINE_REMOTE_DEBUGGING", "9222"); // 即使内置视图，有时也需要开启调试端口
//this->setCentralWidget(&webView);
webView.setParent(this);
@@ -104,11 +110,13 @@ void MainWeb::initWebview()
if (ok)
{
webView.show();
labelWebErr.hide();
}
else
{
spdlog::error("[web] webview load failed, url={}", Config::option.webSrvUrl);
webView.hide();
labelWebErr.show();
}
});
}
@@ -186,8 +194,13 @@ bool MainWeb::event(QEvent* e)
void MainWeb::keyPressEvent(QKeyEvent* e)
{
if (e->key() == Qt::Key_F12)
auto key = e->key();
if (key == Qt::Key_F12)
{
this->showDevTools();
}
else if (key == Qt::Key_F5)
{
webView.load(QUrl(Config::option.webSrvUrl.c_str()));
}
}

4
src/qt/MainWeb.h
View File

@@ -18,9 +18,13 @@ public:
void keyPressEvent(QKeyEvent* event);
public:
QLabel labelWebErr;
QWebEngineView webView;
QWebEngineView devTools;
std::shared_ptr<QSplashScreen> splash;
QLabel label1;
QLabel labelProgress;