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-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

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;