Skip to content

E
ems_collector
Commit 32594718 authored by wwr's avatar wwr
Browse files
Options

add pg water

parent 9c924a49
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 9 deletions
src/ems_water_grp/constants.py
View file @ 32594718
...@@ -1230,32 +1230,75 @@ WATER_SCADA_MAP = { ...@@ -1230,32 +1230,75 @@ WATER_SCADA_MAP = {
# DN2000出厂水累计流量 # DN2000出厂水累计流量
"66a7964e-7bcf-57a4-77f5-3a0ca724ef58": {"sid": "ZXC_SB_DN2000", "66a7964e-7bcf-57a4-77f5-3a0ca724ef58": {"sid": "ZXC_SB_DN2000",
"cid": 907}, "cid": 907},
# 炭滤池1#累计流量
"f4165b9e-0657-c5fb-6699-3a15cab4ca49": {"sid": "ZXC_SB_TLC1",
"cid": 907},
# 炭滤池2#累计流量
"d33520aa-e270-d614-ab08-3a15cab642e1": {"sid": "ZXC_SB_TLC2",
"cid": 907},
# 出厂水压力
"e732cbde-c6c9-42f7-809e-f78f55cbcb08": {"sid": "ZXC_PG_CSYL",
"cid": 907},
# 獭湖水厂 # 獭湖水厂
# 出厂水累计流量 # 出厂水累计流量
"02f21875-7cf5-d145-b8d8-3a0c137ae145": {"sid": "TH_SB_1", "cid": 905}, "02f21875-7cf5-d145-b8d8-3a0c137ae145": {"sid": "TH_SB_1", "cid": 905},
# 出厂水压力1
"e238bf0c-aefe-9c5b-dcc4-3a0c0e687699": {"sid": "TH_PG_CSYL1", "cid": 905},
# 出厂水压力2
"12f04d1b-656d-9832-86df-3a0e202a6333": {"sid": "TH_PG_CSYL2", "cid": 905},
# 南坑水厂 # 南坑水厂
# 送水泵房1#流量计累计流量 # 送水泵房1#流量计累计流量
"8d11d6c4-ba07-4a2c-a37a-8cd89a712431": {"sid": "NK_SB_SSBF1", "cid": 910}, "8d11d6c4-ba07-4a2c-a37a-8cd89a712431": {"sid": "NK_SB_SSBF1", "cid": 910},
# 送水泵房2#流量计累计流量 # 送水泵房2#流量计累计流量
"4119f05a-1233-40aa-b2fd-2c60bfda012d": {"sid": "NK_SB_SSBF2", "cid": 910}, "4119f05a-1233-40aa-b2fd-2c60bfda012d": {"sid": "NK_SB_SSBF2", "cid": 910},
# 加药间2#流量计累计流量
"0a23de33-f6db-4e3e-a83c-b18da4825a8c": {"sid": "NK_SB_JYJ2", "cid": 910},
# 加药间1#流量计累计流量
"61fe416d-918b-4740-8c75-a6d45a13a7dd": {"sid": "NK_SB_JYJ1", "cid": 910},
# 送水泵房出厂水压力
"a31323f9-3b72-4339-8bee-082694c282cc": {"sid": "NK_PG_BF_CSYL1",
"cid": 910},
# 荷坳水厂 # 荷坳水厂
# 出厂水累计流量读数 # 出厂水累计流量读数
"d243a49f-4c2b-b992-95ce-3a0bea8781ef": {"sid": "HA_SB_1", "cid": 911}, "d243a49f-4c2b-b992-95ce-3a0bea8781ef": {"sid": "HA_SB_1", "cid": 911},
# 出厂水压力
"2fc363a6-5841-46eb-e997-3a0fe4801a78": {"sid": "HA_PG_CSYL1", "cid": 911},
# 苗坑水厂 # 苗坑水厂
# 木古出水累计流量 # 木古出水累计流量
"66efe33d-589f-0a41-574b-3a0593d34e3f": {"sid": "MK_SB_GMCS", "cid": 1501}, "66efe33d-589f-0a41-574b-3a0593d34e3f": {"sid": "MK_SB_GMCS", "cid": 1501},
# 平湖出水累计流量 # 平湖出水累计流量
"cdf1f5ac-b590-9b69-f0f2-3a0593d1aa84": {"sid": "MK_SB_PHCS", "cid": 1501}, "cdf1f5ac-b590-9b69-f0f2-3a0593d1aa84": {"sid": "MK_SB_PHCS", "cid": 1501},
# 雁田水库进水累计流量
"cd872dee-69c0-ee82-fe69-3a15e4bd5c20": {"sid": "MK_SB_YTSK", "cid": 1501},
# 二期沉淀池格栅原水累计流量
"b281827b-54a4-dd0d-2ba1-3a0e823963cb": {"sid": "MK_SB_CDCGS",
"cid": 1501},
# 1#平湖方向出厂水压力
"a24e70fa-6ca2-7b47-257f-3a0593cd3265": {"sid": "MK_PG_PHCS1",
"cid": 1501},
# 2#木古方向出厂水压力
"fe85a261-8889-ae4a-44b7-3a0593cf9e42": {"sid": "MK_PG_PHCS2",
"cid": 1501},
# 鹅公岭水厂 # 鹅公岭水厂
# 供平湖出厂水累计流量 # 供平湖出厂水累计流量
"b63f01a4-dfae-495b-b8a0-827e9931adb1": {"sid": "EGL_SB_PH", "cid": 908}, "b63f01a4-dfae-495b-b8a0-827e9931adb1": {"sid": "EGL_SB_PH", "cid": 908},
# 供良安田出厂水累计流量 # 供良安田出厂水累计流量
"f2967293-982d-4092-b7af-18fa3f20b1f7": {"sid": "EGL_SB_LAT", "cid": 908}, "f2967293-982d-4092-b7af-18fa3f20b1f7": {"sid": "EGL_SB_LAT", "cid": 908},
# 1#-2#机组取水累计流量
"2d821370-3818-45bb-89b2-cf6340cc4a6e": {"sid": "EGL_SB_1_2", "cid": 908},
# 3#-4#机组取水累计流量
"1f34f40f-2ec1-4f87-ad68-7f58cfba1fce": {"sid": "EGL_SB_3_4", "cid": 908},
# 水库机组取水累计流量
"2d59a9ac-15e5-4bef-8071-4a46e4dc3913": {"sid": "EGL_SB_SKJZ", "cid": 908},
# 供平湖压力
"66ea9685-e2ae-8306-5524-3a07b9a053b3": {"sid": "EGL_PG_PH", "cid": 908},
# 良安田压力
"56c9681b-ef12-d4d2-45b6-3a07b9a5ea1d": {"sid": "EGL_PG_LAT", "cid": 908},
# 沙湖水厂 # 沙湖水厂
# 出厂水DN800累计流量 # 出厂水DN800累计流量
...@@ -1263,10 +1306,17 @@ WATER_SCADA_MAP = { ...@@ -1263,10 +1306,17 @@ WATER_SCADA_MAP = {
# 出厂水DN1200累计流量 # 出厂水DN1200累计流量
"42b30f4a-ba68-dc52-1d40-3a0985f0e40f": {"sid": "SH_SB_DN1200", "42b30f4a-ba68-dc52-1d40-3a0985f0e40f": {"sid": "SH_SB_DN1200",
"cid": 903}, "cid": 903},
# 出厂水DN800水压力
"50820ad0-9f78-4f86-4344-3a0b36750383": {"sid": "SH_PG_DN800", "cid": 903},
# 出厂水DN1200水压力
"71e64f26-d93d-dda7-cac6-3a0985e623cb": {"sid": "SH_PG_DN1200",
"cid": 903},
# 塘岭水厂 # 塘岭水厂
# 塘岭出厂水累计流量 # 塘岭出厂水累计流量
"8b63a7d8-6746-2373-8439-3a0b3651b7a0": {"sid": "TL_SB_1", "cid": 901}, "8b63a7d8-6746-2373-8439-3a0b3651b7a0": {"sid": "TL_SB_1", "cid": 901},
# 出厂水压力
"ca8d6865-7ac9-ce5d-34d1-3a09894bd0c5": {"sid": "TL_PG_1", "cid": 901},
# 田心水厂 # 田心水厂
# 出厂水累计流量 # 出厂水累计流量
...@@ -1275,4 +1325,23 @@ WATER_SCADA_MAP = { ...@@ -1275,4 +1325,23 @@ WATER_SCADA_MAP = {
# 坑梓水厂 # 坑梓水厂
# 出厂水累计流量 # 出厂水累计流量
"c3561e90-0144-2b12-90c9-3a0dc41ae323": {"sid": "KZ_SB_1", "cid": 904}, "c3561e90-0144-2b12-90c9-3a0dc41ae323": {"sid": "KZ_SB_1", "cid": 904},
# 坑梓出厂水压力
"5d2e4d05-2c1a-f309-8490-3a0dc41902ff": {"sid": "KZ_PG_1", "cid": 904},
} }
WATER_PG_MAP = [
"e238bf0c-aefe-9c5b-dcc4-3a0c0e687699",
"12f04d1b-656d-9832-86df-3a0e202a6333",
"e732cbde-c6c9-42f7-809e-f78f55cbcb08",
"a31323f9-3b72-4339-8bee-082694c282cc",
"2fc363a6-5841-46eb-e997-3a0fe4801a78",
"a24e70fa-6ca2-7b47-257f-3a0593cd3265",
"fe85a261-8889-ae4a-44b7-3a0593cf9e42",
"66ea9685-e2ae-8306-5524-3a07b9a053b3",
"56c9681b-ef12-d4d2-45b6-3a07b9a5ea1d",
"ca8d6865-7ac9-ce5d-34d1-3a09894bd0c5",
"50820ad0-9f78-4f86-4344-3a0b36750383",
"71e64f26-d93d-dda7-cac6-3a0985e623cb",
"5d2e4d05-2c1a-f309-8490-3a0dc41902ff",
]
src/ems_water_grp/fwd_water_meter.py
View file @ 32594718
...@@ -14,7 +14,7 @@ from utils.time_format import CST, YMD_Hms ...@@ -14,7 +14,7 @@ from utils.time_format import CST, YMD_Hms
from gmqtt import Client as MQTTClient from gmqtt import Client as MQTTClient
from apscheduler.schedulers.asyncio import AsyncIOScheduler from apscheduler.schedulers.asyncio import AsyncIOScheduler
from apscheduler.triggers.cron import CronTrigger from apscheduler.triggers.cron import CronTrigger
from ems_water_grp.constants import WATER_SCADA_MAP from ems_water_grp.constants import WATER_SCADA_MAP, WATER_PG_MAP
from utils.utils import admin_client_id, mqtt_pwd from utils.utils import admin_client_id, mqtt_pwd
from infra.http.httpx_util import HttpxClient from infra.http.httpx_util import HttpxClient
from infra.config.settings import SETTING from infra.config.settings import SETTING
...@@ -35,26 +35,36 @@ INFLUX_PAYLOAD = { ...@@ -35,26 +35,36 @@ INFLUX_PAYLOAD = {
"factoryId": 907, "factoryId": 907,
"ids": [ "ids": [
"5f31a1d0-9d19-6287-3b35-3a0ca7259ce3", "5f31a1d0-9d19-6287-3b35-3a0ca7259ce3",
"66a7964e-7bcf-57a4-77f5-3a0ca724ef58" "66a7964e-7bcf-57a4-77f5-3a0ca724ef58",
"f4165b9e-0657-c5fb-6699-3a15cab4ca49",
"d33520aa-e270-d614-ab08-3a15cab642e1",
"e732cbde-c6c9-42f7-809e-f78f55cbcb08"
] ]
}, },
{ {
"factoryId": 905, "factoryId": 905,
"ids": [ "ids": [
"02f21875-7cf5-d145-b8d8-3a0c137ae145" "02f21875-7cf5-d145-b8d8-3a0c137ae145",
"e238bf0c-aefe-9c5b-dcc4-3a0c0e687699",
"12f04d1b-656d-9832-86df-3a0e202a6333"
] ]
}, },
{ {
"factoryId": 910, "factoryId": 910,
"ids": [ "ids": [
"8d11d6c4-ba07-4a2c-a37a-8cd89a712431", "8d11d6c4-ba07-4a2c-a37a-8cd89a712431",
"4119f05a-1233-40aa-b2fd-2c60bfda012d" "4119f05a-1233-40aa-b2fd-2c60bfda012d",
"0a23de33-f6db-4e3e-a83c-b18da4825a8c",
"61fe416d-918b-4740-8c75-a6d45a13a7dd",
"a31323f9-3b72-4339-8bee-082694c282cc"
] ]
}, },
{ {
"factoryId": 911, "factoryId": 911,
"ids": [ "ids": [
"d243a49f-4c2b-b992-95ce-3a0bea8781ef" "d243a49f-4c2b-b992-95ce-3a0bea8781ef",
"2fc363a6-5841-46eb-e997-3a0fe4801a78"
] ]
}, },
{ {
...@@ -62,26 +72,42 @@ INFLUX_PAYLOAD = { ...@@ -62,26 +72,42 @@ INFLUX_PAYLOAD = {
"ids": [ "ids": [
"66efe33d-589f-0a41-574b-3a0593d34e3f", "66efe33d-589f-0a41-574b-3a0593d34e3f",
"cdf1f5ac-b590-9b69-f0f2-3a0593d1aa84" "cdf1f5ac-b590-9b69-f0f2-3a0593d1aa84"
"cd872dee-69c0-ee82-fe69-3a15e4bd5c20",
"b281827b-54a4-dd0d-2ba1-3a0e823963cb",
"a24e70fa-6ca2-7b47-257f-3a0593cd3265",
"fe85a261-8889-ae4a-44b7-3a0593cf9e42"
] ]
}, },
{ {
"factoryId": 908, "factoryId": 908,
"ids": [ "ids": [
"b63f01a4-dfae-495b-b8a0-827e9931adb1", "b63f01a4-dfae-495b-b8a0-827e9931adb1",
"f2967293-982d-4092-b7af-18fa3f20b1f7" "f2967293-982d-4092-b7af-18fa3f20b1f7",
"2d821370-3818-45bb-89b2-cf6340cc4a6e",
"1f34f40f-2ec1-4f87-ad68-7f58cfba1fce",
"2d59a9ac-15e5-4bef-8071-4a46e4dc3913",
"66ea9685-e2ae-8306-5524-3a07b9a053b3",
"56c9681b-ef12-d4d2-45b6-3a07b9a5ea1d"
] ]
}, },
{ {
"factoryId": 903, "factoryId": 903,
"ids": [ "ids": [
"4292ac6a-cf4d-fc0f-972e-3a0985efda44", "4292ac6a-cf4d-fc0f-972e-3a0985efda44",
"42b30f4a-ba68-dc52-1d40-3a0985f0e40f" "42b30f4a-ba68-dc52-1d40-3a0985f0e40f",
"9021a23f-5167-188c-1002-3a0985f1e5be",
"50820ad0-9f78-4f86-4344-3a0b36750383",
"71e64f26-d93d-dda7-cac6-3a0985e623cb"
] ]
}, },
{ {
"factoryId": 901, "factoryId": 901,
"ids": [ "ids": [
"8b63a7d8-6746-2373-8439-3a0b3651b7a0" "8b63a7d8-6746-2373-8439-3a0b3651b7a0",
"ca8d6865-7ac9-ce5d-34d1-3a09894bd0c5"
] ]
}, },
{ {
...@@ -93,7 +119,8 @@ INFLUX_PAYLOAD = { ...@@ -93,7 +119,8 @@ INFLUX_PAYLOAD = {
{ {
"factoryId": 904, "factoryId": 904,
"ids": [ "ids": [
"c3561e90-0144-2b12-90c9-3a0dc41ae323" "c3561e90-0144-2b12-90c9-3a0dc41ae323",
"5d2e4d05-2c1a-f309-8490-3a0dc41902ff"
] ]
} }
], ],
...@@ -105,6 +132,7 @@ INFLUX_PAYLOAD = { ...@@ -105,6 +132,7 @@ INFLUX_PAYLOAD = {
class FwdWaterMeterSrv: class FwdWaterMeterSrv:
username = "pot_emqx_super" username = "pot_emqx_super"
topic_prefix = "eems/td/water_sw" topic_prefix = "eems/td/water_sw"
topic_pg_prefix = "eems/td/water_pg_sw"
def __init__(self): def __init__(self):
self.http_client = HttpxClient() self.http_client = HttpxClient()
...@@ -147,6 +175,9 @@ class FwdWaterMeterSrv: ...@@ -147,6 +175,9 @@ class FwdWaterMeterSrv:
# 动态生成 Topic 并推送 # 动态生成 Topic 并推送
topic = f"{self.topic_prefix}/{sid}" topic = f"{self.topic_prefix}/{sid}"
if uid in WATER_PG_MAP:
topic = f"{self.topic_pg_prefix}/{sid}"
payload["data_topic"] = "water_pg_sw"
if self.mqtt_client: if self.mqtt_client:
self.mqtt_client.publish(topic, json.dumps(payload), qos=1) self.mqtt_client.publish(topic, json.dumps(payload), qos=1)
pub_cnt += 1 pub_cnt += 1
......
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