Commit 86978577 authored by ZZH's avatar ZZH

add water flow 2026-6-18 17:46

parent 7321a21d
...@@ -349,6 +349,15 @@ SCADA_FIELDS_MAP = { ...@@ -349,6 +349,15 @@ SCADA_FIELDS_MAP = {
"field": "kwhttl_p"}, "field": "kwhttl_p"},
"FCBF_10DP_TSCJ_WNGH2_ZYGGL_AI": {"sid": "ZXC_10DP_TSCJ_WNGH2", "FCBF_10DP_TSCJ_WNGH2_ZYGGL_AI": {"sid": "ZXC_10DP_TSCJ_WNGH2",
"field": "pttl"}, "field": "pttl"},
# 水表
# DN1400出厂水累计流量
"5f31a1d0-9d19-6287-3b35-3a0ca7259ce3": {"sid": "ZXC_SB_DN1400",
"field": "meter_value"},
# DN2000出厂水累计流量
"66a7964e-7bcf-57a4-77f5-3a0ca724ef58": {"sid": "ZXC_SB_DN2000",
"field": "meter_value"}
}, },
905: { 905: {
# 獭湖水厂 # 獭湖水厂
...@@ -453,6 +462,11 @@ SCADA_FIELDS_MAP = { ...@@ -453,6 +462,11 @@ SCADA_FIELDS_MAP = {
"field": "costtl"}, "field": "costtl"},
"ZNPD_THSC_d0523152727__P": {"sid": "TH_d0523152727", "field": "pttl"}, "ZNPD_THSC_d0523152727__P": {"sid": "TH_d0523152727", "field": "pttl"},
# 水表
# 出厂水累计流量
"02f21875-7cf5-d145-b8d8-3a0c137ae145": {"sid": "TH_SB_1",
"field": "meter_value"}
}, },
909: { 909: {
# 1#变压器电表 # 1#变压器电表
...@@ -559,6 +573,14 @@ SCADA_FIELDS_MAP = { ...@@ -559,6 +573,14 @@ SCADA_FIELDS_MAP = {
"NK_DB52_EP": {"sid": "NK_DB52", "field": "kwhttl_p"}, "NK_DB52_EP": {"sid": "NK_DB52", "field": "kwhttl_p"},
"NK_DB52_PF": {"sid": "NK_DB52", "field": "costtl"}, "NK_DB52_PF": {"sid": "NK_DB52", "field": "costtl"},
"NK_DB52_PZ": {"sid": "NK_DB52", "field": "pttl"}, "NK_DB52_PZ": {"sid": "NK_DB52", "field": "pttl"},
# 水表
# 送水泵房1#流量计累计流量
"8d11d6c4-ba07-4a2c-a37a-8cd89a712431": {"sid": "NK_SB_SSBF1",
"field": "meter_value"},
# 送水泵房2#流量计累计流量
"4119f05a-1233-40aa-b2fd-2c60bfda012d": {"sid": "NK_SB_SSBF2",
"field": "meter_value"}
}, },
911: { 911: {
# 荷坳水厂 # 荷坳水厂
...@@ -582,6 +604,11 @@ SCADA_FIELDS_MAP = { ...@@ -582,6 +604,11 @@ SCADA_FIELDS_MAP = {
"HA_SSBF_SSB3_GLYS": {"sid": "HA_SSB3", "field": "costtl"}, "HA_SSBF_SSB3_GLYS": {"sid": "HA_SSB3", "field": "costtl"},
"HA_SSBF_SSB3_YGGL": {"sid": "HA_SSB3", "field": "pttl"}, "HA_SSBF_SSB3_YGGL": {"sid": "HA_SSB3", "field": "pttl"},
# 水表
# 出厂水累计流量读数
"d243a49f-4c2b-b992-95ce-3a0bea8781ef": {"sid": "HA_SB_1",
"field": "meter_value"},
}, },
1501: { 1501: {
...@@ -818,6 +845,14 @@ SCADA_FIELDS_MAP = { ...@@ -818,6 +845,14 @@ SCADA_FIELDS_MAP = {
"DB_P19_ZXYGDD": {"sid": "MK_DB_P19", "field": "kwhttl_p"}, "DB_P19_ZXYGDD": {"sid": "MK_DB_P19", "field": "kwhttl_p"},
"DB_P19_GLYS": {"sid": "MK_DB_P19", "field": "costtl"}, "DB_P19_GLYS": {"sid": "MK_DB_P19", "field": "costtl"},
# 水表
# 木古出水累计流量
"66efe33d-589f-0a41-574b-3a0593d34e3f": {"sid": "MK_SB_GMCS",
"field": "meter_value"},
# 平湖出水累计流量
"cdf1f5ac-b590-9b69-f0f2-3a0593d1aa84": {"sid": "MK_SB_PHCS",
"field": "meter_value"}
}, },
908: { 908: {
...@@ -989,6 +1024,14 @@ SCADA_FIELDS_MAP = { ...@@ -989,6 +1024,14 @@ SCADA_FIELDS_MAP = {
"ZNPD_EGLSC_d0522150639__P": {"sid": "EGL_d0522150639", "ZNPD_EGLSC_d0522150639__P": {"sid": "EGL_d0522150639",
"field": "pttl"}, "field": "pttl"},
# 水表
# 供平湖出厂水累计流量
"b63f01a4-dfae-495b-b8a0-827e9931adb1": {"sid": "EGL_SB_PH",
"field": "meter_value"},
# 供良安田出厂水累计流量
"f2967293-982d-4092-b7af-18fa3f20b1f7": {"sid": "EGL_SB_LAT",
"field": "meter_value"}
}, },
903: { 903: {
...@@ -1083,6 +1126,14 @@ SCADA_FIELDS_MAP = { ...@@ -1083,6 +1126,14 @@ SCADA_FIELDS_MAP = {
"field": "costtl"}, "field": "costtl"},
"ZNPD_SHSC_d0426210030__P": {"sid": "SH_d0426210030", "field": "pttl"}, "ZNPD_SHSC_d0426210030__P": {"sid": "SH_d0426210030", "field": "pttl"},
# 水表
# 出厂水DN800累计流量
"4292ac6a-cf4d-fc0f-972e-3a0985efda44": {"sid": "SH_SB_DN800",
"field": "meter_value"},
# 出厂水DN1200累计流量
"42b30f4a-ba68-dc52-1d40-3a0985f0e40f": {"sid": "SH_SB_DN1200",
"field": "meter_value"}
}, },
901: { 901: {
# 塘岭水厂 # 塘岭水厂
...@@ -1121,6 +1172,11 @@ SCADA_FIELDS_MAP = { ...@@ -1121,6 +1172,11 @@ SCADA_FIELDS_MAP = {
"SSBF_DB1_SSB4_ZGLYS_AI": {"sid": "TL_DB1_SSB4", "field": "costtl"}, "SSBF_DB1_SSB4_ZGLYS_AI": {"sid": "TL_DB1_SSB4", "field": "costtl"},
"SSBF_DB1_SSB4_ZYGGL_AI": {"sid": "TL_DB1_SSB4", "field": "pttl"}, "SSBF_DB1_SSB4_ZYGGL_AI": {"sid": "TL_DB1_SSB4", "field": "pttl"},
# 水表
# 塘岭出厂水累计流量
"8b63a7d8-6746-2373-8439-3a0b3651b7a0": {"sid": "TL_SB_1",
"field": "meter_value"},
}, },
902: { 902: {
...@@ -1133,6 +1189,11 @@ SCADA_FIELDS_MAP = { ...@@ -1133,6 +1189,11 @@ SCADA_FIELDS_MAP = {
"630KVAJXZG_Ep": {"sid": "TX_630KVAJXZG", "field": "kwhttl_p"}, "630KVAJXZG_Ep": {"sid": "TX_630KVAJXZG", "field": "kwhttl_p"},
"630KVAJXZG_PSum": {"sid": "TX_630KVAJXZG", "field": "costtl"}, "630KVAJXZG_PSum": {"sid": "TX_630KVAJXZG", "field": "costtl"},
"630KVAJXZG_P": {"sid": "TX_630KVAJXZG", "field": "pttl"}, "630KVAJXZG_P": {"sid": "TX_630KVAJXZG", "field": "pttl"},
# 水表
# 出厂水累计流量
"189ddc12-1d12-349d-a2e0-3a0ea113eb97": {"sid": "TX_SB_1",
"field": "meter_value"},
}, },
904: { 904: {
...@@ -1216,6 +1277,11 @@ SCADA_FIELDS_MAP = { ...@@ -1216,6 +1277,11 @@ SCADA_FIELDS_MAP = {
"PD_P2_PE": {"sid": "KZ_PD_P2", "field": "kwhttl_p"}, "PD_P2_PE": {"sid": "KZ_PD_P2", "field": "kwhttl_p"},
"PD_P2_PF": {"sid": "KZ_PD_P2", "field": "costtl"}, "PD_P2_PF": {"sid": "KZ_PD_P2", "field": "costtl"},
"PD_P2_PT": {"sid": "KZ_PD_P2", "field": "pttl"}, "PD_P2_PT": {"sid": "KZ_PD_P2", "field": "pttl"},
# 水表
# 出厂水累计流量
"c3561e90-0144-2b12-90c9-3a0dc41ae323": {"sid": "KZ_SB_1",
"field": "meter_value"},
}, },
} }
...@@ -81,6 +81,8 @@ class Meter3rdForward: ...@@ -81,6 +81,8 @@ class Meter3rdForward:
return "pcc_ele" return "pcc_ele"
elif m_type == 136: elif m_type == 136:
return "load_ele" return "load_ele"
elif m_type == 101:
return "water"
return "" return ""
async def parse_and_forward(self, fid, raw_payload): async def parse_and_forward(self, fid, raw_payload):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment