Iranian passport less than 24 hours layover in PVG

Hi

I am US permanent resident flying to Thailand (I have Thailand visa).
Flight will be Honolulu (USA)- PVG- Thailand
there will be few hours stop on PVG and change the flight .
all flight is by China eastern airline.
Do I need Transit visa? I have to go through custom and immigration check?
Does my luggage go directly to Thailand?
I read lost of online comment on luggage need to check out/in again in PVG and if we need to go through custom.