Abstract: In view of problem of harmonic current existed in power conversion system with bi-directional energy control, an integrated current waveform control strategy based on dual-stage main circuit topology was proposed. Double circuit and carrier phase-shifting control method are used in DC side in order to reduce volume of filter inductor, which effectively decreases output current ripple and switching losses. A hybrid control method based on PI control and repetitive control is applied in AC side in order to improve grid-connected power quality, which effectively suppresses harmonic content of grid-connected current, and improves dynamic response speed. The experimental results verify effectiveness and feasibility of the control strategy.