zjk/H100PowerManger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修复 aarch64 编译：to_ulong()/size() 返回 unsigned long，赋给 Json::Value 产生歧义，改为显式转换
build-test-deploy / ci (push) Failing after 7m15s
Details

Browse Source
This commit is contained in:
zjk
2026-08-14 15:35:03 +08:00
parent 6d765ee165
commit 8ef5de9944
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pPowerManger/httpserver/httpserver.cpp
+1 -1
View File
@@ -865,7 +865,7 @@ void HttpServer::handleLogRequest(struct mg_connection* c, const std::string& ms
response["type"] = "log";
response["page"] = page;
response["pageSize"] = pageSize;
response["total"] = logs.size(); // 返回总条数
response["total"] = static_cast<unsigned long long>(logs.size()); // 返回总条数
response["content"] = Json::arrayValue;
if (reverse) {
src/pPowerManger/upmsg/uPower_disSysState.h
+4 -4
View File
@@ -152,7 +152,7 @@ public:
m_state_of_bus_hv.set_fb_reserved_breaker((data.power_bus_status.fbReservedCircuitBreaker == 1));
m_state_of_bus_hv.set_tyz_reserved_breaker((data.power_bus_status.tyzReservedCircuitBreaker == 1));
m_state_of_bus_hv.set_reserved_breaker((data.power_bus_status.reservedCircuitBreaker == 1));
dis["HVolABusBreaker_uint16"] = m_state_of_bus_hv.relay_states.to_ulong();
dis["HVolABusBreaker_uint16"] = static_cast<unsigned long long>(m_state_of_bus_hv.relay_states.to_ulong());
m_state_of_bus_hv_a.set_bow_ft_device_1_3_breaker((data.power_a_bus_status.bowFTDevice123CircuitBreaker == 1));
@@ -161,7 +161,7 @@ public:
m_state_of_bus_hv_a.set_xcz_breaker((data.power_a_bus_status.xczCircuitBreaker == 1));
m_state_of_bus_hv_a.set_bow_rudder_control_box_breaker((data.power_a_bus_status.bowRudderControlBoxCircuitBreaker == 1));
m_state_of_bus_hv_a.set_open_water_cover_actuator_breaker((data.power_a_bus_status.openWaterCoverStartCylinderCircuitBreaker == 1));
dis["HVolBBusBreaker_uint16"] = m_state_of_bus_hv_a.relay_states.to_ulong();
dis["HVolBBusBreaker_uint16"] = static_cast<unsigned long long>(m_state_of_bus_hv_a.relay_states.to_ulong());
m_state_of_bus_lv.set_bow_low_voltage_box_breaker((data.instrument_main_bus_status.bowLowVoltageDistributionBoxCircuitBreaker == 1));
m_state_of_bus_lv.set_dc_c1_dc_distribution_board_breaker((data.instrument_main_bus_status.dcC1DCDistributionPanelCircuitBreaker == 1));
@@ -170,7 +170,7 @@ public:
m_state_of_bus_lv.set_emergency_lithium_battery_group_2_breaker((data.instrument_main_bus_status.emergencyLithiumBatteryGroup2CircuitBreaker == 1));
m_state_of_bus_lv.set_reserved_breaker_1((data.instrument_main_bus_status.reservedCircuitBreaker1 == 1));
m_state_of_bus_lv.set_reserved_breaker_2((data.instrument_main_bus_status.reservedCircuitBreaker2 == 1));
dis["HVolBusBreaker_uint16"] = m_state_of_bus_lv.relay_states.to_ulong();
dis["HVolBusBreaker_uint16"] = static_cast<unsigned long long>(m_state_of_bus_lv.relay_states.to_ulong());
m_state_of_bus_lv_a.set_unit1_breaker((data.instrument_bus_status.unit1CircuitBreaker == 1));
@@ -181,7 +181,7 @@ public:
m_state_of_bus_lv_a.set_reserved_breaker_1((data.instrument_bus_status.reservedCircuitBreaker1 == 1));
m_state_of_bus_lv_a.set_reserved_breaker_2((data.instrument_bus_status.reservedCircuitBreaker2 == 1));
m_state_of_bus_lv_a.set_emergency_lithium_battery_group_1_breaker((data.instrument_bus_status.emergencyLithiumBatteryGroup1CircuitBreaker == 1));
dis["LVolBusBreaker_uint16"] = m_state_of_bus_lv_a.relay_states.to_ulong();
dis["LVolBusBreaker_uint16"] = static_cast<unsigned long long>(m_state_of_bus_lv_a.relay_states.to_ulong());
//构建配电系统故障码
Json::Value faultCodeDis_array = Json::Value(Json::arrayValue);