mirror of
https://gitee.com/js-yhsec/energy_storage.git
synced 2026-05-27 18:59:26 +08:00
1.新增服务端UI界面,显示服务基础信息。2.修改设备显示配置。3.监控页面储能系统显示储能模式,模式设置新增'手动'
This commit is contained in:
@@ -440,8 +440,8 @@ Errcode DAO::queryDeviceList(std::shared_ptr<DaoEntity> dao, vector<Fields>& res
|
||||
// 分页查询设备信息列表
|
||||
Errcode DAO::queryDeviceList(PageInfo& pageInfo, vector<Fields>& result)
|
||||
{
|
||||
std::string sqlFrom = "FROM " + DMDevice::TABLENAME;
|
||||
return QueryPagination("*", sqlFrom, pageInfo, result);
|
||||
std::string sqlFrom = "FROM device d LEFT JOIN station s ON d.station_id =s.station_id";
|
||||
return QueryPagination("d.*, s.name station_name", sqlFrom, pageInfo, result);
|
||||
}
|
||||
|
||||
// 查询设备类型定义
|
||||
@@ -637,7 +637,7 @@ Errcode DAO::queryPolicyTypeDef(std::shared_ptr<DaoEntity> dao, vector<Fields>&
|
||||
return DAO::exec(dao, sql, result);
|
||||
}
|
||||
|
||||
Errcode DAO::insertStatStation(std::shared_ptr<DaoEntity> dao, Fields& fields)
|
||||
Errcode DAO::insertStatDay(std::shared_ptr<DaoEntity> dao, Fields& fields)
|
||||
{
|
||||
// 根据主键(dt、station_id、category),写入或更新数据
|
||||
if (!dao) { dao = DaoEntity::create("stat_day"); }
|
||||
@@ -686,10 +686,18 @@ Errcode DAO::queryRuntimeData(std::shared_ptr<DaoEntity> dao, std::string dt, in
|
||||
return Errcode(ret);
|
||||
}
|
||||
|
||||
Errcode DAO::queryRuntimeData(std::shared_ptr<DaoEntity> dao, std::string dt, vector<Fields>& result)
|
||||
Errcode DAO::queryRuntimeDataHistory(std::shared_ptr<DaoEntity> dao, std::string dt, vector<Fields>& result)
|
||||
{
|
||||
if (!dao) { dao = DaoEntity::create("history_day"); }
|
||||
if (!dao) { dao = DaoEntity::create(""); }
|
||||
std::string sql = "SELECT * FROM history_day WHERE dt='" + dt + "';";
|
||||
int ret = dao->exec(sql, result);
|
||||
return Errcode(ret);
|
||||
}
|
||||
|
||||
Errcode DAO::queryPredictHistory(std::shared_ptr<DaoEntity> dao, std::string dt, vector<Fields>& result)
|
||||
{
|
||||
if (!dao) { dao = DaoEntity::create(""); }
|
||||
std::string sql = "SELECT * FROM predict_day WHERE dt='" + dt + "';";
|
||||
int ret = dao->exec(sql, result);
|
||||
return Errcode(ret);
|
||||
}
|
||||
Reference in New Issue
Block a user