deploy

custom_components/state_grid/const.py

@@ -1,4 +1,4 @@
 DOMAIN = "state_grid"
 PACKAGE_NAME = "custom_components.state_grid"
-VERSION = "0.0.8"
+VERSION = "0.1.2"
 VERSION_STORAGE = 1

custom_components/state_grid/data_client.py

@@ -47,15 +47,15 @@ _A2='account'
 _A1='account_balance'
 _A0='resultCode'
 _z='quInfo'
-_y=True
+_y='BCP_000026'
-_x='BCP_000026'
+_x='app'
-_w='app'
+_w='WEBALIPAY_01'
-_v='WEBALIPAY_01'
+_v='order'
-_u='order'
+_u='state_grid'
-_t='state_grid'
+_t='latestBillMonth'
-_s='latestBillMonth'
+_s='consNo_dst'
-_r='consNo_dst'
+_r='consNo'
-_q='consNo'
+_q=True
 _p='authFlag'
 _o='09'
 _n='0101183'
@@ -102,7 +102,7 @@ import json,time,aiohttp,urllib.parse,datetime
 from.utils.logger import LOGGER
 from.utils.store import async_save_to_store
 from.utils.crypt import a,b,c,d,e
-configuration={_K:{_U:_L,_X:'',_Y:'',_V:_t},_E:_Z,_R:'32101',_I:_L,_AJ:_L,'toPublish':_a,'siteId':'2012000000033700',_M:'',_O:'',_D:'',_C:{_u:_i,'uploadPic':'0101296','pauseSCode':'0101250','pauseTCode':'0101251','listconsumers':'0101093','messageList':'0101343','submit':'0101003','sbcMsg':'0101210','powercut':'0104514','BkAuth01':'f15','BkAuth02':'f18','BkAuth03':'f02','BkAuth04':'f17','BkAuth05':'f05','BkAuth06':'f16','BkAuth07':'f01','BkAuth08':'f03'},'electricityArchives':{'servicecode':'0104505',_E:_L},'subscriptionList':{_M:'APP_SGPMS_05_030',_O:'22',_I:_L,_D:'22',_R:'-1'},'userInformation':{_C:'01008183',_E:_Z},'userInform':{_C:_n,_E:_Z},'elesum':{_I:_L,_D:_v,_c:_F,_T:_F,_C:'0101143',_E:_w},_A2:{_I:_L,_D:'WEBA1007200'},_AS:{_E:_L,_R:'-1',_I:_o,_AJ:_o,_C:_A3,_D:'WEBA40050000',_K:{_U:_L,_X:'',_Y:'',_V:_t}},'doorAuth':{_E:_Z,_C:'f04'},'xinZ':{_N:'101',_AT:'101','fJ_busiTypeCode':'102',_AU:'03','fJ_custType':'02',_AV:_a,_P:'',_D:_AK,_u:_i,_E:_Z,_A4:_F},'onedo':{_C:_A9,_E:_Z,_D:_AK,'queryType':'03'},'xinHuTongDian':{_N:'110',_J:'211',_P:'21102',_D:'WEBA10071200',_I:_L,_E:_o,_C:_n},'company':{_N:'104',_D:_AK,_AV:'02',_A4:_F,_p:_F,_E:_Z,_u:_i},'charge':{_I:_o,_D:'WEBA10071300',_AJ:'0901',_N:'102',_AU:_a,_AT:'102'},'other':{_I:_o,_D:'WEBA10079700',_N:'129',_J:'999',_P:'21501',_C:_x,_M:'',_O:''},'vatchange':{'submit':'0101003',_J:'320',_P:'',_N:'115',_D:'WEBA10074000',_p:_F},'bill':{_f:_F,_D:_v,_T:_F,_C:_x},_m:{_I:_L,_D:_v,_T:_F,_f:_o,_C:_x,_E:_w},_h:{_I:_L,_f:'11',_D:_v,_c:_F,_T:_F,_C:_x,_E:_w},'mouthOut':{_I:_L,_f:'11',_D:_v,_c:_F,_T:_F,_C:_x,_E:_w},'meter':{_N:'114',_J:'304',_D:'WEBA10071000',_P:'',_C:_A9,_O:''},'complaint':{_J:'005','srvMode':_L,'anonymousFlag':'0','replyMode':_a,'retvisitFlag':_a},'report':{_J:'006'},'tradewinds':{_J:'019'},'somesay':{_J:'091'},'faultrepair':{_D:_AW,_C:_n,_N:'111',_J:'001',_P:'21505'},'electronicInvoice':{_N:'105',_J:'0'},'rename':{_C:_A9,_D:'WEBA10076100',_J:'210',_N:'109',_p:_F,'gh_busiTypeCode':'211','gh_subusi':'21101',_O:'',_M:''},'pause':{_P:'',_C:_A3,_D:'WEBA10073600',_N:'107',_J:'203','jr_busi':'201',_O:'',_M:''},'capacityRecovery':{_C:_A3,_E:_Z,_M:'',_O:'',_D:'WEBA10073700','busiTypeCode_stop':'204','busiTypeCode_less':'202',_J:'202',_P:'',_N:'108',_AL:'5',_p:_F},'electricityPriceChange':{_C:_n,_J:'215',_P:'21502',_N:'113',_p:_F,_AL:'15',_D:'WEBA10073900WEB',_M:'',_O:''},'electricityPriceStrategyChange':{_C:'01008183',_J:'215',_P:'21506',_N:'160',_D:'WEBV00000517WEB',_M:'',_O:''},'eemandValueAdjustment':{_C:_n,_M:'',_O:'',_N:'112',_D:'WEBA10073800',_J:'215',_P:'21504',_p:_F,_AL:'5','getMonthServiceCode':_A9},'businessProgress':{_C:_n,_M:_a,_D:'WEB01'},'increase':{_E:_Z,_O:'',_M:'',_AX:_A3,_C:_i,_u:_i,_D:_AM,_A4:_F,_N:'106',_J:'111',_P:''},'fjincrea':{_N:'105',_J:'110',_P:'',_E:_Z,_D:_AM,_O:'',_M:'',_AX:_A3,_C:_i,_u:_i,_A4:_F},'persIncrea':{_N:'105',_J:'109',_u:_i,_P:'',_E:_Z,_D:_AM,_A4:_F},'fgdChange':{_C:_n,_M:_a,_I:_o,_D:_AW,_J:'215',_P:'21505',_N:'111',_p:_F},'createOrder':{_I:_L,_D:_v,_M:'BCP_000001','chargeMode':'02','conType':_a,'bizTypeId':'BT_ELEC'},'largePopulation':{_J:'383',_D:'WEBA10076800',_P:'',_M:'',_T:'',_c:'',_I:'0901',_N:'383',_C:'',_O:''},'biaoJiCode':{_C:'0104507',_E:'1704',_I:'1704'},'twoGuar':{_J:'402',_P:'40201',_D:'web_twoGuar'},'electTrend':{_C:_AY,_I:_L},'emergency':{_C:_AY,_D:'A10000000',_I:_L},'infoPublic':{_C:'2545454',_E:_w}}
+configuration={_K:{_U:_L,_X:'',_Y:'',_V:_u},_E:_Z,_R:'32101',_I:_L,_AJ:_L,'toPublish':_a,'siteId':'2012000000033700',_M:'',_O:'',_D:'',_C:{_v:_i,'uploadPic':'0101296','pauseSCode':'0101250','pauseTCode':'0101251','listconsumers':'0101093','messageList':'0101343','submit':'0101003','sbcMsg':'0101210','powercut':'0104514','BkAuth01':'f15','BkAuth02':'f18','BkAuth03':'f02','BkAuth04':'f17','BkAuth05':'f05','BkAuth06':'f16','BkAuth07':'f01','BkAuth08':'f03'},'electricityArchives':{'servicecode':'0104505',_E:_L},'subscriptionList':{_M:'APP_SGPMS_05_030',_O:'22',_I:_L,_D:'22',_R:'-1'},'userInformation':{_C:'01008183',_E:_Z},'userInform':{_C:_n,_E:_Z},'elesum':{_I:_L,_D:_w,_c:_F,_T:_F,_C:'0101143',_E:_x},_A2:{_I:_L,_D:'WEBA1007200'},_AS:{_E:_L,_R:'-1',_I:_o,_AJ:_o,_C:_A3,_D:'WEBA40050000',_K:{_U:_L,_X:'',_Y:'',_V:_u}},'doorAuth':{_E:_Z,_C:'f04'},'xinZ':{_N:'101',_AT:'101','fJ_busiTypeCode':'102',_AU:'03','fJ_custType':'02',_AV:_a,_P:'',_D:_AK,_v:_i,_E:_Z,_A4:_F},'onedo':{_C:_A9,_E:_Z,_D:_AK,'queryType':'03'},'xinHuTongDian':{_N:'110',_J:'211',_P:'21102',_D:'WEBA10071200',_I:_L,_E:_o,_C:_n},'company':{_N:'104',_D:_AK,_AV:'02',_A4:_F,_p:_F,_E:_Z,_v:_i},'charge':{_I:_o,_D:'WEBA10071300',_AJ:'0901',_N:'102',_AU:_a,_AT:'102'},'other':{_I:_o,_D:'WEBA10079700',_N:'129',_J:'999',_P:'21501',_C:_y,_M:'',_O:''},'vatchange':{'submit':'0101003',_J:'320',_P:'',_N:'115',_D:'WEBA10074000',_p:_F},'bill':{_f:_F,_D:_w,_T:_F,_C:_y},_m:{_I:_L,_D:_w,_T:_F,_f:_o,_C:_y,_E:_x},_h:{_I:_L,_f:'11',_D:_w,_c:_F,_T:_F,_C:_y,_E:_x},'mouthOut':{_I:_L,_f:'11',_D:_w,_c:_F,_T:_F,_C:_y,_E:_x},'meter':{_N:'114',_J:'304',_D:'WEBA10071000',_P:'',_C:_A9,_O:''},'complaint':{_J:'005','srvMode':_L,'anonymousFlag':'0','replyMode':_a,'retvisitFlag':_a},'report':{_J:'006'},'tradewinds':{_J:'019'},'somesay':{_J:'091'},'faultrepair':{_D:_AW,_C:_n,_N:'111',_J:'001',_P:'21505'},'electronicInvoice':{_N:'105',_J:'0'},'rename':{_C:_A9,_D:'WEBA10076100',_J:'210',_N:'109',_p:_F,'gh_busiTypeCode':'211','gh_subusi':'21101',_O:'',_M:''},'pause':{_P:'',_C:_A3,_D:'WEBA10073600',_N:'107',_J:'203','jr_busi':'201',_O:'',_M:''},'capacityRecovery':{_C:_A3,_E:_Z,_M:'',_O:'',_D:'WEBA10073700','busiTypeCode_stop':'204','busiTypeCode_less':'202',_J:'202',_P:'',_N:'108',_AL:'5',_p:_F},'electricityPriceChange':{_C:_n,_J:'215',_P:'21502',_N:'113',_p:_F,_AL:'15',_D:'WEBA10073900WEB',_M:'',_O:''},'electricityPriceStrategyChange':{_C:'01008183',_J:'215',_P:'21506',_N:'160',_D:'WEBV00000517WEB',_M:'',_O:''},'eemandValueAdjustment':{_C:_n,_M:'',_O:'',_N:'112',_D:'WEBA10073800',_J:'215',_P:'21504',_p:_F,_AL:'5','getMonthServiceCode':_A9},'businessProgress':{_C:_n,_M:_a,_D:'WEB01'},'increase':{_E:_Z,_O:'',_M:'',_AX:_A3,_C:_i,_v:_i,_D:_AM,_A4:_F,_N:'106',_J:'111',_P:''},'fjincrea':{_N:'105',_J:'110',_P:'',_E:_Z,_D:_AM,_O:'',_M:'',_AX:_A3,_C:_i,_v:_i,_A4:_F},'persIncrea':{_N:'105',_J:'109',_v:_i,_P:'',_E:_Z,_D:_AM,_A4:_F},'fgdChange':{_C:_n,_M:_a,_I:_o,_D:_AW,_J:'215',_P:'21505',_N:'111',_p:_F},'createOrder':{_I:_L,_D:_w,_M:'BCP_000001','chargeMode':'02','conType':_a,'bizTypeId':'BT_ELEC'},'largePopulation':{_J:'383',_D:'WEBA10076800',_P:'',_M:'',_T:'',_c:'',_I:'0901',_N:'383',_C:'',_O:''},'biaoJiCode':{_C:'0104507',_E:'1704',_I:'1704'},'twoGuar':{_J:'402',_P:'40201',_D:'web_twoGuar'},'electTrend':{_C:_AY,_I:_L},'emergency':{_C:_AY,_D:'A10000000',_I:_L},'infoPublic':{_C:'2545454',_E:_x}}
 appKey='3def6c365d284881bf1a9b2b502ee68c'
 appSecret='ab7357dae64944a197ace37398897f64'
 baseApi='https://www.95598.cn/api'
@@ -137,9 +137,9 @@ def catchFloat(data,key):
 		except:return 0
 	else:return 0
 class StateGridDataClient:
-	hass=_G;session=_G;keyCode=_G;publicKey=_G;need_login=_j;phone=_G;codeKey=_G;serialNo=_G;qrCodeSerial=_G;userInfo=_G;accountInfo=_G;powerUserList=_G;doorAccountDict={};cookie=[];timestamp=int(time.time()*1000);accessToken=_G;refreshToken=_G;token=_G;expirationDate=_G;refresh_interval=12;is_debug=_j
+	hass=_G;session=_G;keyCode=_G;publicKey=_G;need_login=_j;phone=_G;codeKey=_G;serialNo=_G;qrCodeSerial=_G;userInfo=_G;accountInfo=_G;powerUserList=_G;doorAccountDict={};cookie=[];timestamp=int(time.time()*1000);accessToken=_G;refreshToken=_G;token=_G;expirationDate=_G;refresh_interval=6;is_debug=_j
 	def __init__(A,hass,config=_G):
-		B=config;A.hass=hass;C=aiohttp.TCPConnector(ssl=_j);D=aiohttp.CookieJar(quote_cookie=_y);A.session=aiohttp.ClientSession(cookie_jar=D,connector=C)
+		B=config;A.hass=hass;C=aiohttp.TCPConnector(ssl=_j);D=aiohttp.CookieJar(quote_cookie=_q);A.session=aiohttp.ClientSession(cookie_jar=D,connector=C)
 		if B is not _G:
 			try:A.keyCode=B[_A5];A.publicKey=B[_AN];A.accessToken=B[_Aa];A.refreshToken=B[_Ab];A.token=B[_k];A.userInfo=B[_AA];A.powerUserList=B[_AO];A.doorAccountDict=B[_Ac];A.refresh_interval=B[_Ad];A.is_debug=B['is_debug']
 			except Exception as E:LOGGER.error(E)
@@ -160,7 +160,7 @@ class StateGridDataClient:
 		A=B[_H]
 		if 10015==A or 10108==A or 10009==A or 10207==A or 10005==A or 10010==A or 30010==A or 10002==A:
 			await C.__refresh_token()
-			if C.need_login is _y:return B
+			if C.need_login is _q:return B
 			else:return await C.__fetch(api,data)
 		else:return B
 	async def __fetch(B,api,data,header=_G):
@@ -191,7 +191,7 @@ class StateGridDataClient:
 		if B[_H]==_F:A.keyCode=B[_A][_A5];A.publicKey=B[_A][_AN];return{_B:0}
 		return{_B:1,_b:C}
 	async def __get_qr_code(B):
-		C={_K:{_X:'',_V:_t,_U:_L,_Y:''},_z:{'optType':_a,_O:e(28,10,1)}};A=await B.__fetch(get_qr_code_api,C);D=B.handle_request_result_message('get_qr_code_api',A)
+		C={_K:{_X:'',_V:_u,_U:_L,_Y:''},_z:{'optType':_a,_O:e(28,10,1)}};A=await B.__fetch(get_qr_code_api,C);D=B.handle_request_result_message('get_qr_code_api',A)
 		if A[_H]==1:
 			if A[_A]and A[_A][_Q]and A[_A][_Q][_A0]==_AD:B.qrCodeSerial=A[_A][_g][_Ag];E=A[_A][_g]['qrCode'];return{_B:0,_A:E}
 		return{_B:1,_b:D}
@@ -202,16 +202,16 @@ class StateGridDataClient:
 			else:return{_B:1,_b:'未使用网上国网 App 扫码或确认登录'}
 		return{_B:1,_b:E}
 	async def __get_qr_code_token(B):
-		C={_K:{_V:_t,_U:_L,'isEncrypt':_y},_k:B.token};A=await B.__fetch(get_qr_code_token_api,C);D=B.handle_request_result_message('get_qr_code_token_api',A)
+		C={_K:{_V:_u,_U:_L,'isEncrypt':_q},_k:B.token};A=await B.__fetch(get_qr_code_token_api,C);D=B.handle_request_result_message('get_qr_code_token_api',A)
 		if _Q in A and _A0 in A[_Q]and A[_Q][_A0]==_AD:B.userInfo=A[_g][_AA];return{_B:0}
 		return{_B:1,_b:D}
 	async def __send_code(B,phone):
-		C=phone;B.phone=C;D={_K:{_X:'',_V:_t,_U:_L,_Y:''},_z:{'sendType':'0',_A2:C,_Ah:'login','accountType':''},'Channels':'web'};A=await B.__fetch(send_code_api,D);E=B.handle_request_result_message('send_code_api',A)
+		C=phone;B.phone=C;D={_K:{_X:'',_V:_u,_U:_L,_Y:''},_z:{'sendType':'0',_A2:C,_Ah:'login','accountType':''},'Channels':'web'};A=await B.__fetch(send_code_api,D);E=B.handle_request_result_message('send_code_api',A)
 		if A[_H]==1:
 			if A[_A]and A[_A][_Q]and A[_A][_Q][_A0]==_AD:B.codeKey=A[_A][_g]['codeKey'];return{_B:0}
 		return{_B:1,_b:E}
 	async def __verfiy_code(A,code):
-		C={_K:{_X:'',_V:_t,_U:_L,_Y:''},_z:{_A2:A.phone,_Ah:'login',_H:code,'optSys':'ios','pushId':'00000','codeKey':A.codeKey},'Channels':'web'};B=await A.__fetch(code_login_api,C);D=A.handle_request_result_message('code_login_api',B)
+		C={_K:{_X:'',_V:_u,_U:_L,_Y:''},_z:{_A2:A.phone,_Ah:'login',_H:code,'optSys':'ios','pushId':'00000','codeKey':A.codeKey},'Channels':'web'};B=await A.__fetch(code_login_api,C);D=A.handle_request_result_message('code_login_api',B)
 		if _Q in B and _A0 in B[_Q]and B[_Q][_A0]==_AD:A.token=B[_g][_k];A.userInfo=B[_g][_AA][0];return{_B:0}
 		return{_B:1,_b:D}
 	async def __get_request_authorize(B):
@@ -231,19 +231,19 @@ class StateGridDataClient:
 		if _H in B and B[_H]==1 and _A in B and _g in B[_A]:C.powerUserList=B[_A][_g][_AO];return{_B:0}
 		return{_B:1,_b:E}
 	async def __get_door_balance(B,door_account):
-		A=door_account;E={_A:{_M:'',_O:'',_I:configuration[_A2][_I],_D:configuration[_A2][_D],_A6:B.userInfo[_S],_A7:B.userInfo.get(_AE,B.userInfo.get('nickname',_G)),_T:_F,_c:_F,_AP:B.userInfo[_S],_A8:[{'consNoSrc':A[_r],_AF:A.get(_W,A.get(_AG,_G)),'sceneType':A.get('consSortCode',A.get('elecTypeCode',_G)),_q:A[_q],_e:A[_e]}]},_C:'0101143',_E:configuration[_E],_R:A.get(_W,A.get(_AG,_G))};C=await B.__fetch_safe(get_door_balance_api,E);B.handle_request_result_message('get_door_balance_api',C)
+		A=door_account;E={_A:{_M:'',_O:'',_I:configuration[_A2][_I],_D:configuration[_A2][_D],_A6:B.userInfo[_S],_A7:B.userInfo.get(_AE,B.userInfo.get('nickname',_G)),_T:_F,_c:_F,_AP:B.userInfo[_S],_A8:[{'consNoSrc':A[_s],_AF:A.get(_W,A.get(_AG,_G)),'sceneType':A.get('consSortCode',A.get('elecTypeCode',_G)),_r:A[_r],_e:A[_e]}]},_C:'0101143',_E:configuration[_E],_R:A.get(_W,A.get(_AG,_G))};C=await B.__fetch_safe(get_door_balance_api,E);B.handle_request_result_message('get_door_balance_api',C)
 		if _H in C and C[_H]==1 and _A in C and _A8 in C[_A]:
 			D=C[_A][_A8]
 			if len(D)!=0:A[_A1]=D[0]
 	async def __get_door_bill(C,door_account,year):
-		E='dataInfo';D='mothEleList';B=door_account;F={_A:{_A6:C.userInfo[_S],_I:configuration[_I],_f:'11',_AQ:B[_Al],_D:'ALIPAY_01',_e:B[_e],_AF:B[_W],_c:_F,_T:_F,_O:'',_M:'',_A7:'',_Aj:B[_W],_AP:C.userInfo[_S],_q:B[_q],_Ak:year},_C:_x,_E:_w,_R:B[_W]};A=await C.__fetch_safe(get_door_bill_api,F);C.handle_request_result_message('get_door_bill_api',A)
+		E='dataInfo';D='mothEleList';B=door_account;F={_A:{_A6:C.userInfo[_S],_I:configuration[_I],_f:'11',_AQ:B[_Al],_D:'ALIPAY_01',_e:B[_e],_AF:B[_W],_c:_F,_T:_F,_O:'',_M:'',_A7:'',_Aj:B[_W],_AP:C.userInfo[_S],_r:B[_r],_Ak:year},_C:_y,_E:_x,_R:B[_W]};A=await C.__fetch_safe(get_door_bill_api,F);C.handle_request_result_message('get_door_bill_api',A)
 		if _H in A and A[_H]==1 and _A in A:
 			if E in A[_A]:B[_AH]=A[_A][E]
 			if D in A[_A]:
 				B[_AI]=A[_A][D]
-				if len(A[_A][D])!=0:B[_s]=A[_A][D][-1]
+				if len(A[_A][D])!=0:B[_t]=A[_A][D][-1]
 	async def __get_door_ladder(B,door_account,month):
-		F='ladder_flag';E=month;A=door_account;G=A[_r];H={_A:{_I:configuration[_m][_I],_D:configuration[_m][_D],_T:configuration[_m][_T],_f:configuration[_m][_f],_q:A[_r],_c:A[_W],_e:A[_e],'queryDate':E,_Aj:A[_W],_AQ:A[_Al],_AP:B.userInfo[_S],_O:'',_M:'',_A7:B.userInfo[_AE],_A6:B.userInfo[_S]},_C:configuration[_m][_C],_E:configuration[_m][_E],_R:A[_W]};C=await B.__fetch(get_door_ladder_api,H);I=B.handle_request_result_message('get_door_ladder_api',C)
+		F='ladder_flag';E=month;A=door_account;G=A[_s];H={_A:{_I:configuration[_m][_I],_D:configuration[_m][_D],_T:configuration[_m][_T],_f:configuration[_m][_f],_r:A[_s],_c:A[_W],_e:A[_e],'queryDate':E,_Aj:A[_W],_AQ:A[_Al],_AP:B.userInfo[_S],_O:'',_M:'',_A7:B.userInfo[_AE],_A6:B.userInfo[_S]},_C:configuration[_m][_C],_E:configuration[_m][_E],_R:A[_W]};C=await B.__fetch(get_door_ladder_api,H);I=B.handle_request_result_message('get_door_ladder_api',C)
 		if _H in C and C[_H]==1 and _A in C and _A8 in C[_A]:
 			D=C[_A][_A8]
 			if len(D)!=0:
@@ -252,9 +252,9 @@ class StateGridDataClient:
 				else:A[F]=0
 				B.doorAccountDict[G]['ladder']=D
 	async def __get_door_daily_bill(B,door_account,year,start_date,end_date):
-		D='sevenEleList';A=door_account;E={'params1':{_C:configuration[_C],_E:configuration[_E],_R:configuration[_R],_K:{_U:configuration[_K][_U],_X:configuration[_K][_X],_Y:configuration[_K][_Y],_V:configuration[_K][_V]},_z:{_S:B.userInfo[_S]},_k:B.token},'params3':{_A:{_A6:B.userInfo[_S],_q:A[_r],_AQ:_a,'endTime':end_date,_e:A[_e],_Ak:year,_AF:A.get(_W,A.get(_AG,_G)),_O:'',_M:'','startTime':start_date,_A7:B.userInfo[_AE],_D:configuration[_h][_D],_I:configuration[_h][_I],_f:configuration[_h][_f],_c:configuration[_h][_c],_T:configuration[_h][_T]},_C:configuration[_h][_C],_E:configuration[_h][_E],_R:A.get(_W,A.get(_AG,_G))},'params4':'010103'};C=await B.__fetch_safe(get_door_daily_bill_api,E);F=B.handle_request_result_message('get_door_daily_bill_api',C)
+		D='sevenEleList';A=door_account;E={'params1':{_C:configuration[_C],_E:configuration[_E],_R:configuration[_R],_K:{_U:configuration[_K][_U],_X:configuration[_K][_X],_Y:configuration[_K][_Y],_V:configuration[_K][_V]},_z:{_S:B.userInfo[_S]},_k:B.token},'params3':{_A:{_A6:B.userInfo[_S],_r:A[_s],_AQ:_a,'endTime':end_date,_e:A[_e],_Ak:year,_AF:A.get(_W,A.get(_AG,_G)),_O:'',_M:'','startTime':start_date,_A7:B.userInfo[_AE],_D:configuration[_h][_D],_I:configuration[_h][_I],_f:configuration[_h][_f],_c:configuration[_h][_c],_T:configuration[_h][_T]},_C:configuration[_h][_C],_E:configuration[_h][_E],_R:A.get(_W,A.get(_AG,_G))},'params4':'010103'};C=await B.__fetch_safe(get_door_daily_bill_api,E);F=B.handle_request_result_message('get_door_daily_bill_api',C)
 		if _H in C and C[_H]==1 and _A in C and D in C[_A]:A[_l]=C[_A][D]
-	async def __get_door_pay_record(A,door_account):B=door_account;D=B[_r];C={'params1':{_C:configuration[_C],_E:configuration[_E],_R:configuration[_R],_K:{_U:configuration[_K][_U],_X:configuration[_K][_X],_Y:configuration[_K][_Y],_V:configuration[_K][_V]},_z:{_S:A.userInfo[_S]},_k:A.token},'params3':{_A:{_A6:A.userInfo[_S],'bgnPayDate':'2023-04-24',_I:configuration[_I],_q:B[_r],'endPayDate':'2024-04-24',_D:'webALIPAY_01','number':100,_e:B[_e],'page':_F,_AF:B[_W],_c:_F,_T:_F,_O:'',_M:'',_A7:A.userInfo[_AE]},_C:'0101051',_E:_a,_R:B[_W]},'params4':'010104'};E=await A.__fetch(getJiaoFeiRecordApi,C)
+	async def __get_door_pay_record(A,door_account):B=door_account;D=B[_s];C={'params1':{_C:configuration[_C],_E:configuration[_E],_R:configuration[_R],_K:{_U:configuration[_K][_U],_X:configuration[_K][_X],_Y:configuration[_K][_Y],_V:configuration[_K][_V]},_z:{_S:A.userInfo[_S]},_k:A.token},'params3':{_A:{_A6:A.userInfo[_S],'bgnPayDate':'2023-04-24',_I:configuration[_I],_r:B[_s],'endPayDate':'2024-04-24',_D:'webALIPAY_01','number':100,_e:B[_e],'page':_F,_AF:B[_W],_c:_F,_T:_F,_O:'',_M:'',_A7:A.userInfo[_AE]},_C:'0101051',_E:_a,_R:B[_W]},'params4':'010104'};E=await A.__fetch(getJiaoFeiRecordApi,C)
 	async def get_qr_code(B):
 		A=await B.__get_request_key()
 		if _B in A and A[_B]!=0:return A
@@ -288,46 +288,51 @@ class StateGridDataClient:
 		if _B in B and B[_B]!=0:return
 		B=await A.__refresh_web_token()
 		if _B in B and B[_B]==0:A.need_login=_j;await A.save_data()
-		else:A.need_login=_y;LOGGER.error('国家电网刷新 Token 失败')
+		else:A.need_login=_q;LOGGER.error('国家电网刷新 Token 失败')
 	async def refresh_data(C,setup=_j):
-		j='last_month_ele_cost';i='monthEleNum';h='year_ele_cost';g='thisTPq';f='thisNPq';e='thisVPq';d='thisPPq';U=setup;T='ladder_level_num';S='ladder_level';R='last_month_ele_num';Q='year_ele_num';L='%Y%m%d';K='day';I='dayElePq';H='balance'
+		l='last_month_ele_cost';k='monthEleNum';j='year_ele_cost';i='thisTPq';h='thisNPq';g='thisVPq';f='thisPPq';e='refresh_time';U=setup;T='ladder_level_num';S='ladder_level';R='last_month_ele_num';Q='year_ele_num';L='%Y%m%d';K='day';I='dayElePq';H='balance'
-		if U is _y:await C.__get_door_number()
+		if U is _q:
-		if C.need_login is _y:LOGGER.error('国家电网需要重新登录！');return
+			V=await C.__get_door_number()
-		k=U or int(time.time()*1000)-C.timestamp>C.refresh_interval*3600*1000
+			if _B in V and V[_B]!=0:C.need_login=_q
-		if k is _j:return
+		if C.need_login is _q:
-		M=datetime.datetime.now();J=M-datetime.timedelta(days=1);l=f"{J.year}-{J.month:02d}-{J.day:02d}";N=J-datetime.timedelta(days=40);m=f"{N.year}-{N.month:02d}-{N.day:02d}"
+			if C.powerUserList is not _G:
+				for A in C.get_door_account_list():A[e]='刷新 Token 失败，需重新登录！'
+			LOGGER.error('国家电网需要重新登录！');return
+		m=U or int(time.time()*1000)-C.timestamp>C.refresh_interval*3600*1000
+		if m is _j:return
+		M=datetime.datetime.now();J=M-datetime.timedelta(days=1);n=f"{J.year}-{J.month:02d}-{J.day:02d}";N=J-datetime.timedelta(days=40);o=f"{N.year}-{N.month:02d}-{N.day:02d}"
 		for A in C.powerUserList:
-			n=A[_r];C.doorAccountDict[n]=A;await C.__get_door_balance(A)
+			p=A[_s];C.doorAccountDict[p]=A;await C.__get_door_balance(A)
 			if _A1 in A:
-				o=catchFloat(A[_A1],'estiAmt');V=catchFloat(A[_A1],'prepayBal');p=catchFloat(A[_A1],'sumMoney')
+				q=catchFloat(A[_A1],'estiAmt');W=catchFloat(A[_A1],'prepayBal');r=catchFloat(A[_A1],'sumMoney')
-				if V==0:A[H]=p
+				if W==0:A[H]=r
-				else:A[H]=V-o
+				else:A[H]=W-q
-				W=catchFloat(A[_A1],'historyOwe')
+				X=catchFloat(A[_A1],'historyOwe')
-				if W>0:A[H]=-W
+				if X>0:A[H]=-X
 			else:LOGGER.error('国家电网账户余额获取失败！')
 			if H not in A:A[H]=0
-			await C.__get_door_daily_bill(A,M.year,m,l)
+			await C.__get_door_daily_bill(A,M.year,o,n)
 			if _l not in A:LOGGER.error('国家电网无法获取日用电数据！');return
 			O=0
-			for X in range(10):
+			for Y in range(10):
-				D=A[_l][X]
+				D=A[_l][Y]
 				try:float(D[I]);break
 				except:O=O+1
-			for X in range(O):A[_l].pop(0)
+			for Y in range(O):A[_l].pop(0)
-			D=A[_l][0];E=datetime.datetime.strptime(D[K],L);A['daily_ele_num']=catchFloat(D,I);A['daily_p_ele_num']=catchFloat(D,d);A['daily_v_ele_num']=catchFloat(D,e);A['daily_n_ele_num']=catchFloat(D,f);A['daily_t_ele_num']=catchFloat(D,g);Y=0;Z=0;a=0;b=0;c=0
+			D=A[_l][0];E=datetime.datetime.strptime(D[K],L);A['daily_ele_num']=catchFloat(D,I);A['daily_p_ele_num']=catchFloat(D,f);A['daily_v_ele_num']=catchFloat(D,g);A['daily_n_ele_num']=catchFloat(D,h);A['daily_t_ele_num']=catchFloat(D,i);Z=0;a=0;b=0;c=0;d=0
 			for B in A[_l]:
 				G=datetime.datetime.strptime(B[K],L)
 				if G.month!=E.month:break
-				Y+=catchFloat(B,I);Z+=catchFloat(B,d);a+=catchFloat(B,e);b+=catchFloat(B,f);c+=catchFloat(B,g)
+				Z+=catchFloat(B,I);a+=catchFloat(B,f);b+=catchFloat(B,g);c+=catchFloat(B,h);d+=catchFloat(B,i)
-			A['month_ele_num']=normal_round(Y,2);A['month_p_ele_num']=normal_round(Z,2);A['month_v_ele_num']=normal_round(a,2);A['month_n_ele_num']=normal_round(b,2);A['month_t_ele_num']=normal_round(c,2);P=E-datetime.timedelta(days=E.day);q=f"{P.year}-{P.month:02d}"
+			A['month_ele_num']=normal_round(Z,2);A['month_p_ele_num']=normal_round(a,2);A['month_v_ele_num']=normal_round(b,2);A['month_n_ele_num']=normal_round(c,2);A['month_t_ele_num']=normal_round(d,2);P=E-datetime.timedelta(days=E.day);s=f"{P.year}-{P.month:02d}"
-			if _s not in A or A[_s][_AR]!=q:await C.__get_door_bill(A,P.year)
+			if _t not in A or A[_t][_AR]!=s:await C.__get_door_bill(A,P.year)
-			if _s not in A:LOGGER.error('国家电网无法获取年度用电数据！');return
+			if _t not in A:LOGGER.error('国家电网无法获取年度用电数据！');return
-			if _AH in A:A[Q]=catchFloat(A[_AH],'totalEleNum');A[h]=catchFloat(A[_AH],'totalEleCost')
+			if _AH in A:A[Q]=catchFloat(A[_AH],'totalEleNum');A[j]=catchFloat(A[_AH],'totalEleCost')
-			if Q not in A:A[Q]=0;A[h]=0
+			if Q not in A:A[Q]=0;A[j]=0
-			if _AI in A:A[R]=catchFloat(A[_s],i);A[j]=catchFloat(A[_s],'monthEleCost')
+			if _AI in A:A[R]=catchFloat(A[_t],k);A[l]=catchFloat(A[_t],'monthEleCost')
-			if R not in A:A[R]=0;A[j]=0
+			if R not in A:A[R]=0;A[l]=0
-			r=datetime.datetime.strptime(A[_s][_AR],'%Y%m')
+			t=datetime.datetime.strptime(A[_t][_AR],'%Y%m')
-			if r.month==12:
+			if t.month==12:
 				F=0
 				for B in A[_l]:
 					G=datetime.datetime.strptime(B[K],L)
@@ -335,16 +340,16 @@ class StateGridDataClient:
 					F+=catchFloat(B,I)
 			else:
 				F=0
-				for B in A[_AI]:F+=catchFloat(B,i)
+				for B in A[_AI]:F+=catchFloat(B,k)
-				s=len(A[_AI])
+				u=len(A[_AI])
 				for B in A[_l]:
 					G=datetime.datetime.strptime(B[K],L)
-					if G.month<=s:break
+					if G.month<=u:break
 					F+=catchFloat(B,I)
 			if F<=2760:A[S]='第一阶梯';A[T]=1
 			elif F<=4800:A[S]='第二阶梯';A[T]=2
 			else:A[S]='第三阶梯';A[T]=3
-			A['daily_lasted_date']=f"{E.year}-{E.month:02d}-{E.day:02d}";A['refresh_time']=datetime.datetime.strftime(M,'%Y-%m-%d %H:%M:%S')
+			A['daily_lasted_date']=f"{E.year}-{E.month:02d}-{E.day:02d}";A[e]=datetime.datetime.strftime(M,'%Y-%m-%d %H:%M:%S')
 		await C.save_data()
-	async def get_door_account_list(A):return list(A.doorAccountDict.values())
+	def get_door_account_list(A):return list(A.doorAccountDict.values())
 	def get_door_account(A):return A.doorAccountDict

custom_components/state_grid/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://hassbox.cn/",
   "iot_class": "cloud_polling",
-  "version": "0.0.8"
+  "version": "0.1.2"
 }

custom_components/state_grid/sensor.py

@@ -135,7 +135,7 @@ async def async_setup_entry(
     coordinator = StateGridCoordinator(hass)
     await coordinator.async_config_entry_first_refresh()
     data_client: StateGridDataClient = hass.data[DOMAIN]
-    door_account_list = await data_client.get_door_account_list()
+    door_account_list = data_client.get_door_account_list()
     for door_account in door_account_list:
         async_add_entities(
             [StateGridSensor(door_account, sensor_type, entry.entry_id, coordinator) for sensor_type in SENSOR_TYPES]