Recently, photovoltaic (PV) with energy storage systems (ESS) have been widely adopted in buildings to overcome growing power demands and earn financial benefits. The overall energy cost can be optimized by combining a well-sized hybrid PV/ESS system with an efficient energy management system (EMS). Generally, EMS is implemented within the overall functions of the Building Automation System (BAS). However, due to its limited computing resources, BAS cannot handle complex algorithms that aim to optimize energy use in real-time under different operating conditions. Furthermore, islanding the building's local network to maximize the PV energy share represents a challenging task due to the potential technical risks. In this context, this article addresses an improved approach based on upgrading the BAS data analytics capability by means of an edge computing technology. The edge communicates with the BAS low-level controller using a serial communication protocol. Taking advantage of the high computing ability of the edge device, an optimization-based EMS of the PV/ESS hybrid system is implemented. Different testing scenarios have been carried out on a real prototype with different weather conditions, and the results show the implementation feasibility and technical performance of such advanced EMS for the management of building energy resources. It has also been proven to be feasible and advantageous to operate the local energy network in island mode while ensuring system safety. Additionally, an estimated energy saving improvement of 6.23 % has been achieved using optimization-based EMS compared to the classical rule-based EMS, with better ESS constraints fulfillment.