修改运行监控显示信息,提交electron代码

This commit is contained in:
lixiaoyuan
2025-09-26 16:51:09 +08:00
parent cb3d3aa4b1
commit 4ce1368321
13 changed files with 337 additions and 125 deletions

View File

@@ -116,13 +116,14 @@ public:
void checkDevice();
string getGatewayMode();
string getGatewayParam();
void readAlert(std::shared_ptr<Device> device, std::string addr, int v, std::string text);
void readRuntimeData(int deviceNo, string addr, int val);
void readTHData(int deviceNo, string addr, int val);
void readFire40Data(int deviceNo, string addr, int val);
void readCoolingData(int deviceNo, string addr, int val);
void readGatewayMode(int mode);
void readGatewayMode(int mode, string p1, string p2, string p3);
void readGatewayStatus(int cdzStatus, int emuStatus);
void setCache(int datatype, std::vector<float>& vd);
@@ -144,9 +145,16 @@ public:
bool isConnected {false};
int workMode {}; // 运行模式
int workModeGateway { -1 }; // 运行模式
int runPolicyId {}; // 运行策略
struct {
int mode {-1}; // 运行模式
std::string param1;
std::string param2;
std::string param3;
} gatewayParam;
///////////////////////////////////////////////////////////////////////////////////////////////
/// === 系统统计 ===
// 累计发电量单位kWh
@@ -163,22 +171,6 @@ public:
// 储能容量
double capacity {};
///////////////////////////////////////////////////////////////////////////////////////////////
/// === 日统计 ===
//double storageIn {}; // 储能充电电量
//double storageOut {}; // 储能放电电量
//int storageNumIn {}; // 储能充电次数
//int storageNumOut {}; // 储能放电次数
//int storageNumErr {}; // 储能故障次数
//double solarGen {}; // 光伏发电电量
//double solarGrid {}; // 光伏入网电量
//int solarNumErr {}; // 光伏故障次数
//double chargeElect {}; // 充电设备充电电量
//int chargeNum {}; // 充电设备充电次数
//int chargeNumErr {}; // 充电设备故障次数
//double incomeElect {}; // 发电收益金额
//double incomeCharge {}; // 充电收益金额
///////////////////////////////////////////////////////////////////////////////////////////////
/// === 环境 ===
// 光照度
@@ -220,45 +212,41 @@ public:
struct {
int64_t ts {0};
float totalElectIn {0.0}; //充电电量 R uint32 1kWh 6659(0x112D) 0x112C
float totalElectOut {0.0}; //放电电量 R uint32 1kWh 4925(0x112F) 0x112E
float totalFeeIn {0.0}; //充电费用 R uint32 1RMB 6605(0x1131) 0x1130
float totalFeeOut {0.0}; //放电费用 R uint32 1RMB 4949(0x1133) 0x1132
float totalIncome {0.0}; //收益 R int32 1RMB -1 0x1134
//储能充放电时段hh R uint16 时 336 0x01 0x121C
//储能充放电时段mm R uint16 分 0 0x01 0x121D
//储能充放电时段ss R uint16 秒 0 0x01 0x121E
float dayElectIn {0.0}; //充电电量 R uint32 1kWh 0x002F
float dayElectOut {0.0}; //放电电量 R uint32 1kWh 0x0031
float dayFeeIn {0.0}; //充电费用 R uint32 1RMB 0x0033
float dayFeeOut {0.0}; //放电费用 R uint32 1RMB 0x0035
float dayIncome {0.0}; //收益 R int32 1RMB 0x0037
float dayElectIn_J {0.0}; //日正向尖有功电能 R uint32 1kWh 0x0039
float dayElectIn_F {0.0}; //日正向峰有功电能 R uint32 1kWh 0x003B
float dayElectIn_P {0.0}; //日正向平有功电能 R uint32 1kWh 0x003D
float dayElectIn_G {0.0}; //日正向谷有功电能 R uint32 1kWh 0x003F
float dayElectIn_Total {0.0};//日正向总有功电能 R uint32 1kWh 0x0041
float totalDurationIn {0.0};
float totalDurationOut {0.0};
float dayElectOut_J {0.0}; //日反向尖有功电能 R uint32 1kWh 0x0043
float dayElectOut_F {0.0}; //日反向峰有功电能 R uint32 1kWh 0x0045
float dayElectOut_P {0.0}; //日反向平有功电能 R uint32 1kWh 0x0047
float dayElectOut_G {0.0}; //日反向谷有功电能 R uint32 1kWh 0x0049
float dayElectOut_Total {0.0}; //日反向总有功电能 R uint32 1kWh 0x004B
float dayElectIn {0.0}; // 充电电量 R uint32 1kWh 0 0x110E
float dayElectOut {0.0}; // 放电电量 R uint32 1kWh 0 0x1110
float dayFeeIn {0.0}; // 充电费用 R uint32 1RMB 0 0x1112
float dayFeeOut {0.0}; // 放电费用 R uint32 1RMB 0 0x1114
float dayIncome {0.0}; // 收益 R int32 1RMB 0 0x1116
float totalElectIn {0.0}; // 充电电量 R uint32 1kWh 0x004D
float totalElectOut {0.0}; // 放电电量 R uint32 1kWh 0x004F
float totalFeeIn {0.0}; // 充电费用 R uint32 1RMB 0x0051
float totalFeeOut {0.0}; // 放电费用 R uint32 1RMB 0x0053
float totalIncome {0.0}; // 收益 R int32 1RMB 0x0055
//正向尖有功电能 R uint32 1kWh 0x0039
//正向峰有功电能 R uint32 1kWh 0x003B
//正向平有功电能 R uint32 1kWh 0x003D
//正向谷有功电能 R uint32 1kWh 0x003F
//正向总有功电能 R uint32 1kWh 0x0041
//日反向尖有功电能 R uint32 1kWh 0x0043
//日反向峰有功电能 R uint32 1kWh 0x0045
//日反向平有功电能 R uint32 1kWh 0x0047
//日反向谷有功电能 R uint32 1kWh 0x0049
//日反向总有功电能 R uint32 1kWh 0x004B
float totalElectIn_J {0.0}; //正向尖有功电能 R uint32 1kWh 0x0057
float totalElectIn_F {0.0}; //正向峰有功电能 R uint32 1kWh 0x0059
float totalElectIn_P {0.0}; //正向平有功电能 R uint32 1kWh 0x005B
float totalElectIn_G {0.0}; //正向谷有功电能 R uint32 1kWh 0x005D
float totalElectIn_Total {0.0}; //正向总有功电能 R uint32 1kWh 0x005F
//总向尖有功电能 R uint32 1kWh 0x0057
//总向峰有功电能 R uint32 1kWh 0x0059
//总向平有功电能 R uint32 1kWh 0x005B
//总向谷有功电能 R uint32 1kWh 0x005D
//总向总有功电能 R uint32 1kWh 0x005F
//总反向尖有功电能 R uint32 1kWh 0x0061
//总反向峰有功电能 R uint32 1kWh 0x0063
//总反向平有功电能 R uint32 1kWh 0x0065
//总反向谷有功电能 R uint32 1kWh 0x0067
//总反向总有功电能 R uint32 1kWh 0x0069
float totalElectOut_J {0.0}; //总向尖有功电能 R uint32 1kWh 0x0061
float totalElectOut_F {0.0}; //总向峰有功电能 R uint32 1kWh 0x0063
float totalElectOut_P {0.0}; //总向平有功电能 R uint32 1kWh 0x0065
float totalElectOut_G {0.0}; //总向谷有功电能 R uint32 1kWh 0x0067
float totalElectOut_Total {0.0}; //总向总有功电能 R uint32 1kWh 0x0069
} statData;
@@ -267,8 +255,8 @@ public:
} runtimeData;
int cdzStatus {-1};
int emuStatus {-1};
int cdzStatus {-1}; // 充电桩 1在线0离线
int emuStatus {-1}; // 储能 1在线0离线
std::map<std::string, int64_t> mapAlertCache;