From 8ef5de9944a5ff01a26d12c501097a11b328305b Mon Sep 17 00:00:00 2001 From: zjk <1553836110@qq.com> Date: Fri, 14 Aug 2026 15:35:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20aarch64=20=E7=BC=96?= =?UTF-8?q?=E8=AF=91=EF=BC=9Ato=5Fulong()/size()=20=E8=BF=94=E5=9B=9E=20un?= =?UTF-8?q?signed=20long=EF=BC=8C=E8=B5=8B=E7=BB=99=20Json::Value=20?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E6=AD=A7=E4=B9=89=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=98=BE=E5=BC=8F=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pPowerManger/httpserver/httpserver.cpp | 2 +- src/pPowerManger/upmsg/uPower_disSysState.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pPowerManger/httpserver/httpserver.cpp b/src/pPowerManger/httpserver/httpserver.cpp index 7562f62..68c82dc 100644 --- a/src/pPowerManger/httpserver/httpserver.cpp +++ b/src/pPowerManger/httpserver/httpserver.cpp @@ -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(logs.size()); // 返回总条数 response["content"] = Json::arrayValue; if (reverse) { diff --git a/src/pPowerManger/upmsg/uPower_disSysState.h b/src/pPowerManger/upmsg/uPower_disSysState.h index b249138..e7f7fed 100644 --- a/src/pPowerManger/upmsg/uPower_disSysState.h +++ b/src/pPowerManger/upmsg/uPower_disSysState.h @@ -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(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(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(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(m_state_of_bus_lv_a.relay_states.to_ulong()); //构建配电系统故障码 Json::Value faultCodeDis_array = Json::Value(Json::arrayValue);