From 4e62811f1625e8650fb928b94d657b36157cefb8 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:06:27 +0800
Subject: [PATCH] init

---
 hik_push/__pycache__/main.cpython-312.pyc     | Bin 2075 -> 1807 bytes
 .../__pycache__/user_map.cpython-312.pyc      | Bin 0 -> 436 bytes
 hik_push/read_event.py                        |  28 +++++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 hik_push/mapping/__pycache__/user_map.cpython-312.pyc

diff --git a/hik_push/__pycache__/main.cpython-312.pyc b/hik_push/__pycache__/main.cpython-312.pyc
index 3e339fee198f711ed5b4a5c22e78bd15209cd797..7c7c55b26b43a9233098a636a5ed8cc6177ff52f 100644
GIT binary patch
delta 448
zcmbO&(9g$rnwOW00SK-MZBBj1G?7n&=>@|?jTWXBhKXAgT{%}Xf+QIjQdm=YQn*q%
z(^yitTUb^@1R0_PQ+Qe!qJ&a~Q+TsA7#NB;m>5!pV6u!1m5h~)ntYo*7$-1Ip2}i0
zS%-yFtBTtrH76%uAw0h*CuJo=ktEQp&mi-PM1aICmZJRpk|Jp!Q)u!xmR{2orcB0Q
zhPBM)jGD}Tx0rK_({HgCmnJ8t78h$W-Qq}0Nr^8>EY2<x1?tdbD&hbcBr|zEtF*2n
zkSPwt#UREDh93<K4_HL5v&dd#k)4yZLgfmJ{tX_%36>YQWiPPEPX5N)DGPE+krapk
zJB7WdG%r4}prA+<C?q?14x6+9Nb(j(e0*+VW?p=}rpV;uY)XvElV7pvxHG4xLfn0e
zr69k!qzGgySSLt*USe))d_35%2n&93*yQG?l;)(`73l#LgF?EvcXATD+2lR!8j^A|
gR6Z~;G0JVw{{*5wGcz!We_#T#CjVuZVgWe>0M03IA^-pY

delta 679
zcmY*V&1(}u6o0cjn`}N!H%Z-WY~9o#T_^-Ep0uYP#7Zw7gkF|4J1No42eS#1P^ce!
zNI|h-4i@|iBr2Ak#6O{zfEU?w4|<FCqCGj2wm}Exy*Kaoe!utTy-vT)q>oamIPkL@
zJ0uU~VOp22py6_$l6XyWV*wt1EbYWcNR$A$i2z1tA#Bc(#G{4t$3M<Z&Z-rXbW<c&
z!)`jjGoI#N3Scu!a&G4FG5}R2AlVBPK@atiHTOd(ZdfS9YxP4D1=8()w9;*REyoRU
zt?rTP`AE~wGPf`IJ>hz=4hY^rXNGUX2(gz~--$Me?>k#0jQZVbmB(COY14YMV<9@v
znZDqdG{<e2IBRB$UbM(Fnkdk@`3}FI!ZD5w%E9`#WPYzVPL#&D^vA~>e4f$JDXLU?
zI6D%L_;l=xT%4yup`W-zJg;RwXi?972Xv85<eXx1L}xMlO527yx(^@ZC&-dEsLJ!~
z02fe+9pPfU%%5WIzR4!oP_@0a!Ri<nSXS9xSmb$nRha1?qO{wzopzgwwOnJLm10JK
zp=#R=r{1(}E6<LVC3KxdBP;iCyXAMLUk&9g(xIl%5#6SAL25b;V%zlpE~o0PM$7Gb
zWR>3F#bSm20qaL@n))++V0}foi6o(={ky+_yAv6t{4_C%v-gpeg0WwoaKQLf5x61n
O%K|sp&xnD=xPJj=K9iCF

diff --git a/hik_push/mapping/__pycache__/user_map.cpython-312.pyc b/hik_push/mapping/__pycache__/user_map.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..734a98b4a10eb5532533d6ac6e88655a09c809d5
GIT binary patch
literal 436
zcmX@j%ge<81b3A;r^YcdFgylvV1N(G_^bkCOlL^P2~!y6@J2CIGHNnu@>cN}S{msY
znpx->>KPiL@QhJ-CMY~p6rLFh&m4tkfx@#y<{25F@C;FSC~h%Aaf^|OpC;oij?&`P
zqWIjzf|U%PK|cTG<YE=$lAm0fo0?Zr91~EPoRL_R8&H&=m6{CXXJlr_7nBxfAQ(Wc
z1(|v2F)(xV3Mzkb*yQG?l;)(`6|n)01cop}u{n_Vz|6?V_<@B<l<fl>gQ)lo5i$Je
Pqr3nQQzJ(a3s5fr>t<@9

literal 0
HcmV?d00001

diff --git a/hik_push/read_event.py b/hik_push/read_event.py
index 8194fda..d9c7ab7 100644
--- a/hik_push/read_event.py
+++ b/hik_push/read_event.py
@@ -88,18 +88,26 @@ async def read_event():
                 event_type = event['eventType']
                 event_type_str = mapping.get(event_type, "未知事件类型")
                 event['eventType'] = event_type_str
-                # ip address
-                ip_address = event["data"]["ipAddress"]
-                # 根据 ip_address 获取对应设备名称
-                device_name = device_map.get(ip_address, "未知设备")
-                event['deviceName'] = device_name
-                # print(event['data'][event['data']['eventType']])
-                # TODO: 根据 ip_address 获取对应 userid
-                user_ids = user_map.get(ip_address, [])
-                event['userIds'] = user_ids
+                if "data" in event:
+                    # 如果存在 data 属性
+                    # ip_address
+                    ip_address = event["data"]["ipAddress"]
+
+                    # 根据 ip_address 获取对应设备名称
+                    device_name = device_map.get(ip_address, "未知设备")
+                    event['data']['deviceName'] = device_name
+
+                    # 根据 ip_address 获取对应 userid 数组
+                    user_ids = user_map.get(ip_address, [])
+                    event['data']['userIds'] = user_ids
+                    # 替换分析结果字段
+                    if "eventType" in event['data']:
+                        detection_field_name = event['data']['eventType']
+                        if detection_field_name in event['data']:
+                            event['data']["_detectionResult"] = event['data'].pop(detection_field_name)
                 # TODO: 请求推送 api
                 #
-                print(event, device_name)
+                print(event)
 
         except Exception as e:
             print("error: ", e)