mirror of
https://gitee.com/js-yhsec/energy_storage.git
synced 2026-05-27 18:59:26 +08:00
修改http统计查询接口
This commit is contained in:
lixiaoyuan
@@ -85,7 +85,7 @@ void Application::runThreadMain()
|
||||
}
|
||||
|
||||
static TimeTick ttMqtt; // 检查 场站的 MQTT 连接
|
||||
if (ttMqtt.elapse(30))
|
||||
if (ttMqtt.elapse(10))
|
||||
{
|
||||
for (auto& item : appdata.mapStation)
|
||||
{
|
||||
|
||||
@@ -6,9 +6,8 @@
|
||||
#include "common/JsonN.h"
|
||||
#include "app/DataStruct.h"
|
||||
#include <unordered_set>
|
||||
|
||||
|
||||
|
||||
#include "Application.h"
|
||||
#include "Station.h"
|
||||
|
||||
static std::unordered_set<int> g_setCacheDeviceType = {3, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110};
|
||||
static bool CheckCacheType(int type)
|
||||
@@ -276,6 +275,12 @@ void Device::setParam(std::string k, int v)
|
||||
else if (type == 109) // 光伏板
|
||||
{
|
||||
}
|
||||
|
||||
if (err )
|
||||
{
|
||||
auto station = Application::data().getStation(stationId);
|
||||
station->err = 1;
|
||||
}
|
||||
}
|
||||
|
||||
std::string Device::getParam(std::string k, std::string defaultVal)
|
||||
|
||||
@@ -308,6 +308,7 @@ string Station::getGatewayParam()
|
||||
|
||||
void Station::checkDevice()
|
||||
{
|
||||
int err = 0;
|
||||
for (auto& item: mapDevice)
|
||||
{
|
||||
auto& device = item.second;
|
||||
@@ -317,8 +318,13 @@ void Station::checkDevice()
|
||||
{
|
||||
device->online = 0;
|
||||
}
|
||||
if (device->type != 5 && (device->err == 1 || device->online == 0))
|
||||
{
|
||||
err = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
this->err = err;
|
||||
}
|
||||
|
||||
void Station::readAlert(std::shared_ptr<Device> device, std::string addr, int v, std::string text)
|
||||
@@ -333,7 +339,7 @@ void Station::readAlert(std::shared_ptr<Device> device, std::string addr, int v,
|
||||
if (device) { fields.set("device_id", device->deviceId); }
|
||||
fields.set("type", int(EAlertType::DEVICE));
|
||||
fields.set("content", text + ":故障(" + std::to_string(v) + ")");
|
||||
fields.set("status", 1);
|
||||
fields.set("status", 0);
|
||||
auto dao = DaoEntity::create("log_alert");
|
||||
dao->insertFields(fields);
|
||||
mapAlertCache[alertId] = ts;
|
||||
@@ -611,17 +617,6 @@ void Station::writeStatistic()
|
||||
}
|
||||
}
|
||||
|
||||
if (statData.ts > 0)
|
||||
{
|
||||
{ // stat_day
|
||||
Fields fields;
|
||||
fields.set("dt", Utils::dateStr(statData.ts));
|
||||
fields.set("station_id", this->stationId);
|
||||
fields.set("storage_elect_in", statData.dayElectIn);
|
||||
fields.set("storage_elect_out", statData.dayElectOut);
|
||||
fields.set("income_elect", statData.dayIncome);
|
||||
DAO::insertStatDay(dao, fields);
|
||||
}
|
||||
{
|
||||
Fields fields;
|
||||
fields.set("dt", Utils::dateStr(statData.ts));
|
||||
@@ -647,6 +642,19 @@ void Station::writeStatistic()
|
||||
"fee_in", "fee_Out", "income"
|
||||
});
|
||||
}
|
||||
if (statData.ts > 0)
|
||||
{
|
||||
{ // stat_day
|
||||
Fields fields;
|
||||
fields.set("dt", Utils::dateStr(statData.ts));
|
||||
fields.set("station_id", this->stationId);
|
||||
fields.set("storage_elect_in", statData.dayElectIn);
|
||||
fields.set("storage_elect_out", statData.dayElectOut);
|
||||
fields.set("income_elect", statData.dayIncome);
|
||||
DAO::insertStatDay(dao, fields);
|
||||
}
|
||||
|
||||
if (statData.dayElectIn > 0.0f || statData.dayElectOut > 0.0f)
|
||||
{
|
||||
Fields fields;
|
||||
fields.set("dt", Utils::dateStr(statData.ts));
|
||||
@@ -699,6 +707,23 @@ void Station::writeStatistic()
|
||||
fields.set("value", MapValueToJson(pos, mapCacheElectCharger));
|
||||
dao->duplicateUpdate(fields, {"value"});
|
||||
}
|
||||
{
|
||||
std::string sql = std::format("select dt, station_id, count(1) count from ( "
|
||||
" select DATE(la.create_time) as dt, station_id, la.device_id, count(1), la.content from log_alert la "
|
||||
" LEFT JOIN device d ON d.device_id = la.device_id "
|
||||
"where la.create_time >= '{}' group by la.content, station_id, device_id, dt "
|
||||
") as tmp group by tmp.dt, station_id; ", Utils::dateStr(Utils::time()- 86400 * 7));
|
||||
vector<Fields> result;
|
||||
dao->exec(sql, result);
|
||||
for (auto& item : result)
|
||||
{
|
||||
string dt = item.value("dt");
|
||||
string station_id = item.value("station_id");
|
||||
string count = item.value("count");
|
||||
std::string sqlUpdate = std::format("update stat_day set storage_num_err='{}' where dt='{}' AND station_id='{}'", count, dt, station_id);
|
||||
dao->exec(sqlUpdate);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -735,15 +760,24 @@ void Station::predict()
|
||||
|
||||
if (vdptr)
|
||||
{
|
||||
int v0 = 0;
|
||||
string& strval = fields.value("value");
|
||||
std::vector<int> vec;
|
||||
JSON::parseArray(strval, vec);
|
||||
for (int i = 0; i<vdptr->size() && i<vec.size(); ++i)
|
||||
{
|
||||
auto& v0 = vec[i];
|
||||
auto& v = vec[i];
|
||||
if (v < v0)
|
||||
{
|
||||
v = v0;
|
||||
}
|
||||
else
|
||||
{
|
||||
v0 = v;
|
||||
}
|
||||
//if (v0 > 0)
|
||||
{
|
||||
(*vdptr)[i] += v0;
|
||||
(*vdptr)[i] += v;
|
||||
if (datatype == 1) { countStorageIn[i]++; }
|
||||
else if (datatype == 2) { countStorageOut[i]++; }
|
||||
else if (datatype == 3) { countCharge[i]++; }
|
||||
|
||||
@@ -144,6 +144,10 @@ public:
|
||||
//SysPolicy policy;
|
||||
std::string launchDate {};
|
||||
|
||||
int err = 0;
|
||||
int online = 0;
|
||||
int running = 0;
|
||||
|
||||
bool isConnected {false};
|
||||
|
||||
int workMode {}; // 运行模式
|
||||
|
||||
@@ -97,7 +97,7 @@ static Errcode QueryCount(DaoEntity& dao, std::string sqlFrom, int& count)
|
||||
}
|
||||
|
||||
|
||||
static Errcode QueryPagination(std::string sqlFields, std::string sqlFrom, PageInfo& page, vector<Fields>& result)
|
||||
static Errcode QueryPagination(std::string sqlFields, std::string sqlFrom, PageInfo& page, vector<Fields>& result, std::string orderby="")
|
||||
{
|
||||
DaoEntity dao("");
|
||||
if (!dao.isConnected())
|
||||
@@ -114,7 +114,7 @@ static Errcode QueryPagination(std::string sqlFields, std::string sqlFrom, PageI
|
||||
if (page.index < 1) page.index = 1;
|
||||
if (page.size <= 0) page.size = 10;
|
||||
page.total = count;
|
||||
std::string sql = "SELECT " + sqlFields + " " + sqlFrom + DAO::sqlPageLimit(page.index -1, page.size);
|
||||
std::string sql = "SELECT " + sqlFields + " " + sqlFrom + orderby + DAO::sqlPageLimit(page.index -1, page.size);
|
||||
int ret = dao.exec(sql, result);
|
||||
return Errcode(ret);
|
||||
}
|
||||
@@ -490,7 +490,7 @@ Errcode DAO::deletePolicyById(std::string policyId)
|
||||
Errcode DAO::querySystemLogList(PageInfo& pageInfo, vector<Fields>& result)
|
||||
{
|
||||
std::string sqlFrom = "FROM " + DMLogSystem::TABLENAME;
|
||||
return QueryPagination("*", sqlFrom, pageInfo, result);
|
||||
return QueryPagination("*", sqlFrom, pageInfo, result, " order by create_time desc ");
|
||||
}
|
||||
Errcode DAO::insertSystemLog(Fields& params)
|
||||
{
|
||||
@@ -534,8 +534,8 @@ Errcode DAO::insertSystemLogDevice(int stationId, int deviceId, std::string cont
|
||||
|
||||
Errcode DAO::queryAlertLogList(PageInfo& pageInfo, vector<Fields>& result)
|
||||
{
|
||||
std::string sqlFrom = "FROM " + DMLogAlert::TABLENAME;
|
||||
return QueryPagination("*", sqlFrom, pageInfo, result);
|
||||
std::string sqlFrom = "from log_alert la left join device d on d.device_id =la.device_id left join station s on s.station_id = d.station_id";
|
||||
return QueryPagination("d.station_id, s.name station_name, d.name device_name, la.*", sqlFrom, pageInfo, result, " order by create_time desc ");
|
||||
}
|
||||
Errcode DAO::insertAlertLog(Fields& params)
|
||||
{
|
||||
@@ -601,7 +601,7 @@ Errcode DAO::queryStatStationList(PageInfo& pageInfo, Fields& params, vector<Fie
|
||||
std::string endDate = params.value("end_date");
|
||||
|
||||
std::string sqlCondition;
|
||||
if (!startDate.empty() && endDate.empty())
|
||||
if (!startDate.empty() && !endDate.empty())
|
||||
{
|
||||
sqlCondition += "dt BETWEEN '" + startDate + "' AND '" + endDate + "'";
|
||||
}
|
||||
|
||||
@@ -629,6 +629,15 @@ Errcode HttpEntity::queryStationList(const httplib::Request& req, njson& json, s
|
||||
|
||||
std::vector<Fields> result;
|
||||
auto err = DAO::queryStationList(pageinfo, result);
|
||||
for (auto& item : result)
|
||||
{
|
||||
int stationId = item.get<int>("station_id");
|
||||
auto station = Application::data().getStation(stationId);
|
||||
if (station)
|
||||
{
|
||||
item.set("err", station->err);
|
||||
}
|
||||
}
|
||||
HttpHelper::setPagination(pageinfo, result, json);
|
||||
return err;
|
||||
};
|
||||
@@ -1111,7 +1120,7 @@ Errcode HttpEntity::queryPredictionDetail(const httplib::Request& req, njson& js
|
||||
for (auto& item : Application::data().mapStation)
|
||||
{
|
||||
auto& station = item.second;
|
||||
|
||||
//auto station = Application::data().getStation(5);
|
||||
for (int i = 0; i < num; ++i)
|
||||
{
|
||||
vecStoreIn[i] += station->predictStorageIn[i];
|
||||
@@ -1155,6 +1164,8 @@ Errcode HttpEntity::queryStatSystem(const httplib::Request& req, njson& json, st
|
||||
electStorageOut += station->electStorageOut;
|
||||
}
|
||||
|
||||
float income = 0.0;
|
||||
|
||||
njson jsondata;
|
||||
jsondata["launch_date"] = appdata.launchDate; //: 系统上线启用日期，格式：yyyy-mm-dd
|
||||
jsondata["income_total"] = incomeTotal; // : 累计收益（元），精度0.01
|
||||
@@ -1167,14 +1178,17 @@ Errcode HttpEntity::queryStatSystem(const httplib::Request& req, njson& json, st
|
||||
jsondata["storage_elect_in"] = electStorageIn; // : 储能充电总电量（kWh），精度0.001
|
||||
jsondata["storage_elect_out"] = electStorageOut; // : 储能放电总电量（kWh），精度0.001
|
||||
|
||||
std::string sql = "SELECT SUM(income_elect) income_total FROM stat_day;";
|
||||
// 总览页面：累计收益
|
||||
std::string sql = "SELECT * FROM stat_total st INNER JOIN "
|
||||
"(SELECT station_id, MAX(dt) max_dt FROM stat_total GROUP BY station_id) tmp "
|
||||
"ON st.station_id = tmp.station_id AND st.dt = tmp.max_dt; ";
|
||||
std::vector<Fields> result;
|
||||
DAO::exec(NULL, sql, result);
|
||||
if (result.size() > 0)
|
||||
for (auto& item: result)
|
||||
{
|
||||
jsondata["income_total"] = result[0].get<float>("income_total");
|
||||
income += item.get<float>("income");
|
||||
}
|
||||
|
||||
jsondata["income_total"] = income;
|
||||
json["data"] = jsondata;
|
||||
return Errcode::OK;
|
||||
}
|
||||
@@ -1184,17 +1198,18 @@ Errcode HttpEntity::queryStatStationGroup(const httplib::Request& req, njson& js
|
||||
njson jsondata = njson::array();
|
||||
|
||||
auto dao = DaoEntity::create("");
|
||||
std::string sql = R"(SELECT s.station_id, s.name station_name, ss.income_elect, ss.income_charge, ss.storage_usage FROM station s LEFT JOIN
|
||||
(SELECT station_id, SUM(income_elect ) income_elect , SUM(income_charge) income_charge, avg(storage_usage) storage_usage FROM stat_day GROUP BY station_id) AS ss
|
||||
ON ss.station_id = s.station_id)";
|
||||
std::string sql = R"(SELECT s.name station_name, st.* FROM stat_total st INNER JOIN
|
||||
(SELECT station_id, MAX(dt) max_dt FROM stat_total GROUP BY station_id) tmp
|
||||
ON st.station_id=tmp.station_id AND st.dt=tmp.max_dt
|
||||
LEFT JOIN station s ON s.station_id=st.station_id;)";
|
||||
std::vector<Fields> vecStations;
|
||||
auto err = dao->exec(sql, vecStations);
|
||||
for (auto& fields: vecStations)
|
||||
{
|
||||
njson jsonnode;
|
||||
jsonnode["station_name"] = fields.value("station_name");
|
||||
jsonnode["income"] = fields.get<float>("income_elect") + fields.get<float>("income_charge");
|
||||
jsonnode["usage_rate"] = fields.get<float>("storage_usage");
|
||||
jsonnode["income"] = fields.get<float>("income");
|
||||
jsonnode["usage_rate"] = fields.get<float>("usage");
|
||||
jsondata.push_back(jsonnode);
|
||||
}
|
||||
json["data"] = jsondata;
|
||||
@@ -1255,23 +1270,23 @@ Errcode HttpEntity::queryStatTotal(const httplib::Request& req, njson& json, std
|
||||
{
|
||||
Fields params;
|
||||
std::string sqlCondition = GetRequestStatParams(req, params);
|
||||
std::string sql = R"(SELECT
|
||||
SUM(storage_elect_in) storage_elect_in,
|
||||
SUM(storage_elect_out) storage_elect_out,
|
||||
SUM(storage_num_in) storage_num_in,
|
||||
SUM(storage_num_out) storage_num_out,
|
||||
SUM(storage_num_err) storage_num_err,
|
||||
SUM(solar_elect_gen) solar_elect_gen,
|
||||
SUM(solar_elect_grid) solar_elect_grid,
|
||||
SUM(solar_num_err) solar_num_err,
|
||||
AVG(storage_usage) storage_usage,
|
||||
SUM(charge_elect) charge_elect,
|
||||
SUM(charge_num) charge_num,
|
||||
SUM(charge_num_err) charge_num_err,
|
||||
AVG(charge_usage) charge_usage,
|
||||
SUM(income_elect) income_elect,
|
||||
SUM(income_charge) income_charge
|
||||
FROM stat_day ss)" + sqlCondition + ";";
|
||||
//std::string sql = R"(SELECT
|
||||
// SUM(storage_elect_in) storage_elect_in,
|
||||
// SUM(storage_elect_out) storage_elect_out,
|
||||
// SUM(storage_num_in) storage_num_in,
|
||||
// SUM(storage_num_out) storage_num_out,
|
||||
// SUM(storage_num_err) storage_num_err,
|
||||
// SUM(solar_elect_gen) solar_elect_gen,
|
||||
// SUM(solar_elect_grid) solar_elect_grid,
|
||||
// SUM(solar_num_err) solar_num_err,
|
||||
// AVG(storage_usage) storage_usage,
|
||||
// SUM(charge_elect) charge_elect,
|
||||
// SUM(charge_num) charge_num,
|
||||
// SUM(charge_num_err) charge_num_err,
|
||||
// AVG(charge_usage) charge_usage,
|
||||
// SUM(income_elect) income_elect,
|
||||
// SUM(income_charge) income_charge
|
||||
// FROM stat_day ss)" + sqlCondition + ";";
|
||||
|
||||
std::string stationId = params.value("station_id");
|
||||
|
||||
@@ -1285,6 +1300,9 @@ Errcode HttpEntity::queryStatTotal(const httplib::Request& req, njson& json, std
|
||||
|
||||
auto& appdata = Application::data();
|
||||
std::vector<Fields> result;
|
||||
std::string sql = std::format("SELECT * FROM stat_total st INNER JOIN "
|
||||
"(SELECT station_id, MAX(dt) max_dt FROM stat_total ss {} GROUP BY station_id) tmp "
|
||||
"ON st.station_id = tmp.station_id AND st.dt = tmp.max_dt; ", sqlCondition);
|
||||
DaoEntity::execOnce(sql, result);
|
||||
if (result.size() > 0)
|
||||
{
|
||||
@@ -1292,20 +1310,20 @@ Errcode HttpEntity::queryStatTotal(const httplib::Request& req, njson& json, std
|
||||
|
||||
//jsondata["launch_date"] = appdata.launchDate; //: 系统上线启用日期，格式：yyyy-mm-dd
|
||||
// jsondata["station_id"] = station_id;
|
||||
jsondata["storage_elect_in"] = fields.value("storage_elect_in"); //储能充电电量（kWh），精度：0.001
|
||||
jsondata["storage_elect_out"] = fields.value("storage_elect_out"); //储能放电电量（kWh），精度：0.001
|
||||
jsondata["storage_num_in"] = fields.value("storage_elect_out"); //储能设备充电次数
|
||||
jsondata["storage_num_out"] = fields.value("storage_num_out"); //储能设备放电次数
|
||||
jsondata["storage_num_err"] = fields.value("storage_num_err"); //储能设备故障次数
|
||||
jsondata["solar_elect_gen"] = fields.value("solar_elect_gen"); //光伏发电电量（kWh），精度：0.001
|
||||
jsondata["solar_elect_grid"] = fields.value("solar_elect_grid"); //光伏入网电量（kWh），精度：0.001
|
||||
jsondata["solar_num_err"] = fields.value("solar_num_err"); //光伏设备故障次数
|
||||
jsondata["charge_elect"] = fields.value("charge_elect"); //充电设备充电电量（kWh），精度：0.001
|
||||
jsondata["charge_num"] = fields.value("charge_num"); //充电设备充电次数
|
||||
jsondata["charge_num_err"] = fields.value("charge_num_err"); //充电设备故障次数
|
||||
jsondata["income_elect"] = fields.value("income_elect"); //发电收益（元），精度：0.01
|
||||
jsondata["storage_elect_in"] = fields.value("E_in"); //储能充电电量（kWh），精度：0.001
|
||||
jsondata["storage_elect_out"] = fields.value("E_out"); //储能放电电量（kWh），精度：0.001
|
||||
jsondata["storage_num_in"] = fields.value("t_in"); //储能设备充电次数
|
||||
jsondata["storage_num_out"] = fields.value("t_out"); //储能设备放电次数
|
||||
jsondata["storage_num_err"] = fields.value("n_err"); //储能设备故障次数
|
||||
jsondata["solar_elect_gen"] = fields.value("E_gen"); //光伏发电电量（kWh），精度：0.001
|
||||
jsondata["solar_elect_grid"] = fields.value("E_grid"); //光伏入网电量（kWh），精度：0.001
|
||||
jsondata["solar_num_err"] = fields.value("n_err_solor"); //光伏设备故障次数
|
||||
jsondata["charge_elect"] = fields.value("E_charge"); //充电设备充电电量（kWh），精度：0.001
|
||||
jsondata["charge_num"] = fields.value("n_charge"); //充电设备充电次数
|
||||
jsondata["charge_num_err"] = fields.value("n_err_charge"); //充电设备故障次数
|
||||
jsondata["income_elect"] = fields.value("income"); //发电收益（元），精度：0.01
|
||||
jsondata["income_charge"] = fields.value("income_charge"); //充电收益（元），精度：0.01
|
||||
jsondata["usage_rate"] = Utils::toStr(float(fields.get<int>("storage_usage")+fields.get<int>("storage_usage"))*0.5f, 0);
|
||||
jsondata["usage_rate"] = 0; //Utils::toStr(float(fields.get<int>("storage_usage") + fields.get<int>("storage_usage")) * 0.5f, 0);
|
||||
json["data"] = jsondata;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user