The aim of the thesis is to intensify the peak-shaving function of the solar power system combined with double energy storage and enhance its economic benefits by using the PV system during peak hours. The study starts with modifying sPV-1000 controller’s design defect and raising its reliability. Using SCR power controller to do thermal energy storage control, we can make battery not discharge in PV heating mode and save electricity power until peak hours. We can also reduce the power loss of solar energy caused by using electric water heater with constant power. Besides, the study tries to use CCU, which can connect one system to another system and support its electricity to another to improve the power generating efficiency of the overall system.