From e8d33efc4260a48e65e8fbc77afe5ba14a79f7f2 Mon Sep 17 00:00:00 2001
From: "MATRIX\\29620" <2962004889@qq.com>
Date: Mon, 20 Jan 2025 10:34:41 +0800
Subject: [PATCH] no message

---
 charging_pile_proxy/commands/__init__.py      |   5 +-
 .../__pycache__/__init__.cpython-311.pyc      | Bin 1201 -> 1354 bytes
 .../__pycache__/command_1F_20.cpython-311.pyc | Bin 0 -> 10600 bytes
 .../__pycache__/command_23_24.cpython-311.pyc | Bin 16845 -> 12074 bytes
 .../__pycache__/command_25.cpython-311.pyc    | Bin 9221 -> 9556 bytes
 charging_pile_proxy/commands/command_02.py    | 205 ++++++++++--------
 .../__pycache__/proxy_server.cpython-311.pyc  | Bin 18147 -> 23234 bytes
 charging_pile_proxy/core/proxy_server.py      |  91 +++++++-
 charging_pile_proxy/test.log                  |   1 +
 9 files changed, 197 insertions(+), 105 deletions(-)
 create mode 100644 charging_pile_proxy/commands/__pycache__/command_1F_20.cpython-311.pyc

diff --git a/charging_pile_proxy/commands/__init__.py b/charging_pile_proxy/commands/__init__.py
index 232848b..e7e222d 100644
--- a/charging_pile_proxy/commands/__init__.py
+++ b/charging_pile_proxy/commands/__init__.py
@@ -10,9 +10,10 @@ from commands.command_0A import Command0A
 from commands.command_25 import Command25
 from commands.command_30 import Command30
 from commands.command_19_1A import Command191A
+from commands.command_1F_20 import Command1F20
 from commands.command_21_22 import Command2122
 from commands.command_23_24 import Command2324
-#from commands.command_26_27 import Command2627
+from commands.command_26_27 import Command2627
 
 __all__ = ['Command02', 'Command03', 'CommandHeartbeat','Command07','Command08','Command09',
-           'Command0A','Command25','Command30','Command191A','Command2122','Command2324']
\ No newline at end of file
+           'Command0A','Command25','Command30','Command191A','Command2122','Command2324','Command1F20']
\ No newline at end of file
diff --git a/charging_pile_proxy/commands/__pycache__/__init__.cpython-311.pyc b/charging_pile_proxy/commands/__pycache__/__init__.cpython-311.pyc
index 1c28149f323a7237986588c9ea69cfc0c5587d75..900d997c4ad3e5328c9f96ef32c1ab225c350f48 100644
GIT binary patch
delta 210
zcmdnUd5Vj7IWI340}z~9)|=iokyn!O+(h-YYAGx!d^u9N(oxck3_v!2j!dp>lq@4d
zIzx)UBE~4W6v1EyO`(a87O)t)85vA2XOtIUyv6ODpPQSQmttgQWUk3Oc{-!9AV1LL
zA^{M=2PFJ7<u_krG+<;mbc;7KDB_#^fk}puA4rO`8OIx$6bXQtX7NVmMS_#Hm}9uq
mfSMSAxY%~{1ZEb-$ptK`GAxYT8H^to5M%>82o|XT)d2vl7%_AJ

delta 140
zcmX@bwULu|IWI340}yP|=uY>X$ScXXZKC>GzI28ZzD0~tQYrkw44MKHe=V52l2L?_
zXYyG_V;(-B>LPw1;ioCRS&+$qadI3p8zbLjK4vj?Bjb1@lOq1f^O<9~lz>VYfw)+5
bGb;-VqwEJZM(!xa4-5#hfgJ>k6o85VA%-4Y

diff --git a/charging_pile_proxy/commands/__pycache__/command_1F_20.cpython-311.pyc b/charging_pile_proxy/commands/__pycache__/command_1F_20.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..06aa9845a2eccaacdbe17caa8ea86d75a8501986
GIT binary patch
literal 10600
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
C^rh(l

literal 0
HcmV?d00001

diff --git a/charging_pile_proxy/commands/__pycache__/command_23_24.cpython-311.pyc b/charging_pile_proxy/commands/__pycache__/command_23_24.cpython-311.pyc
index dec89ff7cfd5f6813e69f238878cb0d2547a6ef9..3f7d13f6e8fc49aee937ab372dc3bae9ad22879e 100644
GIT binary patch
literal 12074
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
MG^MJ9YO>1z2eO9&Q~&?~

literal 16845
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
Rri+Wbp?XSD0M#Q_`EN2|s6YS!

diff --git a/charging_pile_proxy/commands/__pycache__/command_25.cpython-311.pyc b/charging_pile_proxy/commands/__pycache__/command_25.cpython-311.pyc
index 1d17fb44e8121a2787ddd509caa2464ffe5dd74e..5304155014b00f21331470cf67806a7f344271fa 100644
GIT binary patch
delta 2172
zcmZ`(ZA?>F7(S=%?dQGyq+FmM6iT551yn3w4gsB@OdOIdy5O*SD#8%-wnRs6(Jj-k
z>5O`o;G$btmMDo?vWYSLS*9jSOqM0Bc9D>5KbC0pmn`ZZ_QSpBGN2&4?Rn05p65O1
z-uHZ+ZcXnnUl#-;f@kNpvpqlM{%F35O;(_4C@&@q^rEY1@;N?(&2h}4<{x6F1$qy*
zP@7idt)C*9+lsD%b%UPQigZkC<}ql*M(n3mxrkP1^KFi6(ErBb7~>|2RaspmYq^}z
z5qm-}>xpw1hD#V^PBzE}lFb+!YT-#3nKQ3L&A;KBWEFjlTj|eg1J0&rwRv<O7topD
zqePNJ*Ks8{mwv2qDM}78W+-_OV<av`aVs%QaS;zF#q>i?)G_WMUKU|+4|9m6>ZK8`
zKymVkZ$)1pu`y-Ke5_7|WUXvmp0}czmTRQosyV?goAyFw+Wic*MKVtUx%4&fq0h0P
zEe2Y$M1w#>ixii#F3vI#*DOsUS$jo8%4vr_-&p}p<qBt=;;aW}LxxiYeKs=35eBDv
z$+?0^4byS0@~%2?>z7=@`fXB1d<&e0Rh`Y?G_L00CMD%&@V6``rQHhj?L~^WDKRY|
zwkjgnoyd>kISZQxp&}$5N(gb&lF}zEw8{3kXQ2&CD$Fm&CBe<6*SX_=OrB_nzTc8C
z%jR(_Z0W)PMtc#_Cxj7!=sW*w9mmJf3H4rd9EaM5T<{i(O)mP%_@$8t;(+pEKfT~`
zs)&kO`QS+z5p~8qXq3Z%LFJazgbKJegR6n-GPnk~K7(_>4H;Z3V`79=fullrrB*Ao
zAUiZl!wmbH8D?2aczTU5QCVc#;d8PHQCneC!>1mAWbFyvh>kcQS*4YcY}QZ}<Yx4(
zc%EMW?#VY7o{ZgoHg@ar_hU~#|KyF3;jDKfQml8N#}}vn2vgWcZ<)*JZ-U=3qpqwX
zb9gP(>!J3|;W}!t$ZjXRNy=ux7Cfc`@cATmwMj1et)&sKp?_H(nseX^I)!HS7F+4#
ztlUdBKfPnErw47fcQ=(Zm7=?)#^$x^yH(}QLG`^L2kl|&wxRxhABn^xzC*pyeo`kD
z!k`BiuQDJSC>x->VCl9YjK+|R_BrT&i+BBdXbfX?E{mW}6vFMRf8v~BQ%`gtdg7?m
zFkDPOvwHR{@^vs|EC}!vey30}FAV?j$k!V#ANwkNm5~*HiS4OpJ_d~dGh8Hgu(x*(
zBgqYvR@xgT&)FZS^foB~ToUOaXEmqk8|)pRSDiI*ssHY*?UA;#uEL;1qEdHsfOH=n
zjLn#1@rV@fj`tpkD%_gE4}27lLIev{{CRFV3ac0;-E8)xa`w9S0b&*aWlzx3>?%V9
zu25JK%`w`OojU0dN@vjmyjp_<d(vK%;sa?ukmLh@@U{#7vEZfPe9{wjP^a?3X+V28
zZ4amT>NH=S<f~`3D5r3|aD4Z8AT0(Ti4_mTiXU_-u_i6nJQ6oQ5I5h^ro@)C*fQEW
z?e>oDgbv=aiH?maPx)y3bbe@}e9C*jAXVFzENx5Yzmw$M)1HzE^OP+Wtea}M-<+y%
zPX^o5o?WBuv--&vu@ZX&Fh+jpa$ho3oATDBy>-*>;>$b6M^f%^+8v(!HRqzr-BEz<
zS$5f=N);G8ZR%86ldF?gKjgVi+vEw?O<WLV(^Sl$gTWpKdjUck$-vrOw9V6uN9cLa
zOOq0Nn5j<sg}2@w!(7fR%D}$K8E=)kSY#o)7_i`wdPa9RGC=yH(u@I?Ek3_KJ+!LO
z&q)wKX;<N&MXV+DGEmMI+g8eXn$vGOGDwE{qYYA=e&DaJY*XRfS+qL-t>`Z^-7flz
GzwuxEI04N7

delta 1912
zcmZ`(ZA?>F7(VCT-uB*>en4AV%B5T=9~J=_V<J=?R{WSDn_rnaV+40lM{t@;2^+ap
zvrV(P&AFW)HR86;#cAS9Iw8g-EK#;(`>`L?)wq!1_J=Az7I11}{NvtpD^e9tdY|`w
zpXWUv?|Dy}T61W%?TpoGMle2D@$s(v-XCliuq6*d9=<z9iT)#(4Nl?1nA14=5U-}=
z1_|5fO+yjj0b>c>Cm47;anLJ5CC;T^3xzu4Am&-dl&1;AOq@F7VmUhFByM0T=toA6
z9=l0C%ivx80)1$x)Hx6FJ~hir3K-*oEQDa)0^&Qw6|e&ILBHWWxrN_hgwDa28F4ek
zoU5D2PtqLHjIe-@6lE_kXHF6EKR<^QpR`3yk;mI1L=^frF2W@Yg;LE#0(456FO-2-
zu6q^WRWc9HV>#|1#8tCJkof}!QcbUj#qJtVYM)XT=t><ZFJvk8Fy}?4I2%BDX;v9P
zWFg~mqrTT7P@85|!sa#WD~3Q>Jg2e*l%;bi_+`Du7SNZmdibzrqW?;@I=cecmB9L2
zHPZ$ZK#}~Jjv!Qq)SXc=Vwq*Sa%Oz8DpEM(LyyHwOXzJW=wAICMb04xB6i!Nk|xFN
z(C$(Nqb-PtQE|UW#0`(UKHP`i;kTeZ9DIfLS%wbSU>_%ZcTPe3Vn{+7A~>s1t{=oG
z29}>?qa4JBteA&b$chaR8?#~oVpCRZoOvuFE0c&sqHQ_z=oGegm^BRjvS^%+JYbGy
z0JLg?j>ZA>WzLgt6eA528*~w75xZ`A-NH=W!rVvJNbJ;Tt>hdUjhDFDhI}r`W1Am<
z%W_6d`%T0Jm!*4Im*ws~3I{bSPmP-cL+PWZZ=Lxz{nfE_?BZl>XySbA){*z7hCfNi
z;*%#2hL^YA`sw@hr>CBo8hL9^=k^`%Mml@a@!^T#&+4a!Pi&p|aj05JpZpLYcACM(
zYGvZX!_~^oGhb|bW(hiC3t0MHt(`l1cPTZ>MtZ|~2?uG+HovOhJ;Sc;P<uLw!nSKx
z9^je>7_fPauWKLx^@QHHX|flJQ(1ph_U?K(07X&RzoP1=$LuY50ZrQfu)G0p<RF?h
z=jK+?YmSg`&xqVUdchHB8Fv+o`nD&^0N{7Yow1jlk8C7kf7_X{qnoy6oTRHg<!T>w
zwNpp#MNe1^ThNHbyxhi*xNDb7{LhjAJ{`|nN`J|7nI>1lfhOAqz0PZ#=upeq@qF~2
zyOGxCH)1pG%5Rd#Ec^6=x08-Yhg!>0wgB|7TBzC6ApK|1YcTAlt2{}2zO`x^J%)vY
zzkBQO#>%*Qwlv<Gl54KZ4Oiuc#HOUYBqcAoF1KElTQ9$!l-p8r+q4lC2ak81^(Ddy
zHL)TUY)<+^DSzlsx#IYmcz>cau|83rs$7(mn^JPqpwIU?C$Dv&5&NqM%&5b>9`U2T
zWrgcPd@>}gM}xo07jQ{CJ8=brbqqE!*bERfs1ozH(i8qL?xo}YyOwrFyve{z|0)jU
zbz#9fjk0j_U{Gn`D|{^FwVC7~KW5t9@iyu1RL3NEev!;o?V#@m0>U21IzrC{Zj>=k
wB@Fb(!Ty`{2k}5$yk{@z?e1Kv?xp9;8tcLwE|^Ah<87V4o2{;)uJV@u0Y^RBLI3~&

diff --git a/charging_pile_proxy/commands/command_02.py b/charging_pile_proxy/commands/command_02.py
index 0cd9b2f..7c2c85b 100644
--- a/charging_pile_proxy/commands/command_02.py
+++ b/charging_pile_proxy/commands/command_02.py
@@ -46,111 +46,122 @@ class Command02:
     def validate_frame(self, data):
         """验证帧格式"""
         try:
-            print(f"\n验证帧格式:")
-            print(f"数据内容: {data.hex()}")
+            print("\n开始验证帧格式:")
+            print(f"数据内容: {data.hex().upper()}")
             print(f"数据长度: {len(data)}字节")
 
-            # 1. 基本长度检查
+            # 1. 基本格式检查
             if len(data) < 14:
-                print("数据长度不足14字节，无效")
+                print("数据长度不足14字节")
                 return False
 
-            # 2. 检查帧起始标志
             if data[0:2] != b'JX':
-                print("帧起始标志不是'JX'，无效")
+                print("帧起始标志不是'JX'")
                 return False
 
-            # 3. 获取并检查数据域长度
+            # 2. 获取数据域长度
             data_len = struct.unpack("<H", data[12:14])[0]
-            print(f"数据域长度字段值: {data_len}")
+            expected_total_len = 14 + data_len + 1  # 头部(14) + 数据域 + 校验码(1)
 
-            # 4. 计算并检查总长度
-            expected_len = 16 + data_len  # 固定部分(14) + 数据域 + 校验码(1)
-            print(f"期望总长度: {expected_len}")
-            print(f"实际长度: {len(data)}")
+            # 如果数据长度不匹配，尝试修正数据
+            if len(data) != expected_total_len:
+                print(f"数据长度不匹配，尝试修正...")
+                if len(data) > expected_total_len:
+                    print(f"截断多余数据")
+                    data = data[:expected_total_len]
+                else:
+                    print("数据不完整")
+                    return False
 
-            if len(data) != expected_len:
-                print("数据总长度不匹配")
-                return False
+            # 3. 显示数据结构
+            print(f"\n数据结构分析:")
+            print(f"起始标识: {data[0:2].hex().upper()}")
+            print(f"命令字: {data[2]:02X}")
+            print(f"桩号: {data[3:11].hex().upper()}")
+            print(f"加密方式: {data[11]:02X}")
+            print(f"数据长度: {data_len}")
+            print(f"数据域: {data[14:14 + data_len].hex().upper()}")
+            print(f"校验码: {data[-1]:02X}")
 
-            # 5. 验证校验码
-            check_data = data[2:-1]  # 从命令字节到校验码前的数据
+            # 4. 校验码验证
+            check_data = data[2:-1]
             calculated_check = 0
             for b in check_data:
                 calculated_check ^= b
 
-            received_check = data[-1]
-            print(f"计算得到的校验码: {calculated_check:02X}")
-            print(f"接收到的校验码: {received_check:02X}")
-
-            if calculated_check != received_check:
-                print("校验码不匹配")
+            if calculated_check != data[-1]:
+                print(f"校验码不匹配: 计算值={calculated_check:02X}, 接收值={data[-1]:02X}")
                 return False
 
-            print("帧格式验证通过")
             return True
 
         except Exception as e:
-            print(f"帧格式验证出错: {str(e)}")
+            print(f"验证帧格式异常: {str(e)}")
             return False
 
+    def debug_print_fields(self, data):
+        """打印数据包的详细字段"""
+        print("\n===== 数据包解析 =====")
+        print("1. 固定头部:")
+        print(f"  起始标识 (2字节): {data[0:2].hex().upper()}")
+        print(f"  命令码 (1字节): {data[2]:02X}")
+        print(f"  桩号 (8字节): {data[3:11].hex().upper()}")
+        print(f"  加密方式 (1字节): {data[11]:02X}")
+        print(f"  数据域长度 (2字节): {struct.unpack('<H', data[12:14])[0]}")
+
+        data_len = struct.unpack("<H", data[12:14])[0]
+        print("\n2. 数据域:")
+        print(f"  时间标识 (6字节): {data[14:20].hex().upper()}")
+        print(f"  密钥版本 (2字节): {data[20:22].hex().upper()}")
+        print(f"  校验密文 (8字节): {data[22:30].hex().upper()}")
+
+        print(f"\n3. 校验码 (1字节): {data[-1]:02X}")
+
+        # 检查是否有多余字节
+        expected_len = 14 + data_len + 1
+        if len(data) > expected_len:
+            print(f"\n警告: 发现多余字节:")
+            print(f"多余字节内容: {data[expected_len:].hex().upper()}")
+
     def parse_01h(self, data):
         """解析01H命令数据"""
         try:
             print("\n开始解析01H命令...")
-
             if not self.validate_frame(data):
                 raise ValueError("帧格式验证失败")
 
+            # 提取基本信息
             command = data[2]
             pile_id = data[3:11]
             encrypt_mode = data[11]
-            data_len = struct.unpack("<H", data[12:14])[0]
-            data_field = data[14:14 + data_len]
+            data_field = data[14:-1]  # 从数据域开始到校验码之前
 
-            # 解析时间标识
+            # 解析数据域内容
             time_bytes = data_field[0:6]
             year = time_bytes[0] + 2000
             month, day, hour, minute, second = time_bytes[1:6]
             timestamp = f"{year:04d}-{month:02d}-{day:02d} {hour:02d}:{minute:02d}:{second:02d}"
 
-            # 解析密钥版本和校验密文
             key_version = struct.unpack("<H", data_field[6:8])[0]
             check_text = data_field[8:16]
 
-            # 解析桩号
-            pile_info = self.parse_pile_id(pile_id)
-
             result = {
                 "command": command,
                 "pile_id": pile_id,
-                "pile_info": pile_info,
                 "encrypt_mode": encrypt_mode,
                 "timestamp": timestamp,
                 "key_version": key_version,
                 "check_text": check_text
             }
 
-            print("\n解析结果:")
-            print(f"命令码: {command:02X}")
-            print(f"桩号信息: {pile_info}")
-            print(f"加密方式: {encrypt_mode:02X}")
-            print(f"时间标识: {timestamp}")
-            print(f"密钥版本: {key_version}")
-            print(f"校验密文: {check_text.hex()}")
-
             return result
-
         except Exception as e:
-            logging.error(f"解析01H命令失败: {str(e)}")
             print(f"解析失败: {str(e)}")
             return None
 
     def build_02h_response(self, pile_id, allow=True, reject_reason=0):
         """构建02H响应命令"""
         try:
-            print("\n构建02H响应...")
-
             frame = bytearray()
             frame.extend(b'JX')  # 帧起始标志
             frame.append(self.command)  # 命令
@@ -159,83 +170,83 @@ class Command02:
 
             data = bytearray()
 
-            # 时间标识
+            # 添加时间标识 (6字节)
             now = datetime.now()
             data.extend(struct.pack("<BBBBBB",
                                     now.year - 2000, now.month, now.day,
                                     now.hour, now.minute, now.second))
 
-            # 请求结果
+            # 添加请求结果和拒绝原因
             data.append(0x01 if allow else 0x02)
-
-            # 拒绝原因
             data.append(reject_reason)
 
             if allow:
-                # 二维码固定段
-                data.extend(self.qr_fixed.ljust(100, '\x00').encode())
+                # 添加二维码固定段 (100字节)
+                fixed_part = self.qr_fixed.encode()
+                data.extend(fixed_part.ljust(100, b'\x00'))
 
-                # 二维码枪号段数量
-                data.append(0x02)
+                # 添加二维码枪号段数量
+                data.append(0x02)  # 2个充电枪
 
-                # 二维码枪号段1和2
+                # 添加枪号段 (每个20字节)
                 pile_id_str = ''.join([f"{b:02X}" for b in pile_id])
                 gun1 = f"{pile_id_str}001"
                 gun2 = f"{pile_id_str}002"
+                data.extend(gun1.encode().ljust(20, b'\x00'))
+                data.extend(gun2.encode().ljust(20, b'\x00'))
 
-                data.extend(gun1.ljust(20, '\x00').encode())
-                data.extend(gun2.ljust(20, '\x00').encode())
-
-            # 数据域长度
+            # 添加数据域长度
             frame.extend(struct.pack("<H", len(data)))
 
-            # 数据域
+            # 添加数据域
             frame.extend(data)
 
-            # 计算校验码
+            # 计算并添加校验码
             check = 0
-            for b in frame[2:]:
+            for b in frame[2:]:  # 从命令字节开始异或
                 check ^= b
             frame.append(check)
 
-            print("响应数据构建成功:")
-            print(f"数据内容: {frame.hex()}")
-            print(f"数据长度: {len(frame)}字节")
-
             return bytes(frame)
 
         except Exception as e:
             logging.error(f"构建02H响应失败: {str(e)}")
-            print(f"构建响应失败: {str(e)}")
             return None
 
     def process_and_respond(self, received_data, sock):
         """处理收到的01H命令并回复02H"""
         try:
-            print("\n处理01H命令并生成响应...")
-
-            # 解析收到的01H命令
-            parsed = self.parse_01h(received_data)
-            if not parsed:
+            # 基础验证
+            if not self.validate_frame(received_data):
+                logging.error("01H命令帧格式验证失败")
                 return False
 
-            # 构建02H响应
-            allow = True  # 这里可以根据业务逻辑判断是否允许连接
-            reject_reason = 0
+            # 提取必要信息
+            pile_id = received_data[3:11]  # 桩号
+            time_bytes = received_data[14:20]  # 时间标识
+            key_version = struct.unpack("<H", received_data[20:22])[0]  # 密钥版本
 
-            response = self.build_02h_response(parsed["pile_id"], allow, reject_reason)
-            if not response:
-                return False
+            # 检查时间是否在合理范围内
+            cmd_time = datetime(2000 + time_bytes[0], time_bytes[1], time_bytes[2],
+                                time_bytes[3], time_bytes[4], time_bytes[5])
+            time_diff = abs((datetime.now() - cmd_time).total_seconds())
 
-            # 发送响应
-            if hasattr(sock, 'send'):
+            if time_diff > 600:  # 超过10分钟
+                logging.warning(f"时间差异过大: {time_diff}秒")
+                response = self.build_02h_response(pile_id, False, 6)  # 拒绝原因6-时差过大
+            else:
+                # 这里可以添加更多的验证逻辑
+                response = self.build_02h_response(pile_id, True, 0)
+
+            if response and hasattr(sock, 'send'):
                 sock.send(response)
+                logging.info(f"成功发送02H响应, 长度: {len(response)}字节")
+                return True
 
-            return True
+            return False
 
         except Exception as e:
-            logging.error(f"处理和响应失败: {str(e)}")
-            print(f"处理失败: {str(e)}")
+            logging.error(f"处理01H命令失败: {str(e)}")
             return False
 
 
@@ -243,29 +254,31 @@ def test_command():
     """测试函数"""
     print("开始测试01H/02H命令处理...")
 
-    # 配置日志
-    # logging.basicConfig(
-    #     filename='command_response_02h.log',
-    #     level=logging.INFO,
-    #     format='%(asctime)s - %(levelname)s - %(message)s',
-    #     encoding='utf-8'
-    # )
-
     # 创建响应处理器
     handler = Command02()
 
-    # 测试数据 - 使用实际收到的数据
-    test_data = bytes.fromhex("4A5801031767631136065701100019010909371501000000000000000000004D")
+    # 原始测试数据
+    hex_string = "4A5801031767631136065701100019010909371501000000000000000000004D"
+
+    # 解析数据长度字段以确定正确的数据包长度
+    expected_len = 14 + 16 + 1  # 头部(14字节) + 数据域(16字节) + 校验码(1字节)
+
+    # 确保只取需要的字节
+    test_data = bytes.fromhex(hex_string[:expected_len * 2])  # *2是因为hex字符串中一个字节用两个字符表示
 
     print("\n测试数据:")
-    print(f"十六进制: {test_data.hex()}")
-    print(f"长度: {len(test_data)}字节")
+    print(f"原始数据: {hex_string}")
+    print(f"处理后数据: {test_data.hex().upper()}")
+    print(f"数据长度: {len(test_data)}字节")
+
+    # 打印详细字段解析
+    handler.debug_print_fields(test_data)
 
     # 创建模拟socket
     class MockSocket:
         def send(self, data):
             print(f"\n模拟发送响应数据:")
-            print(f"数据内容: {data.hex()}")
+            print(f"数据内容: {data.hex().upper()}")
             print(f"数据长度: {len(data)}字节")
 
     mock_sock = MockSocket()
diff --git a/charging_pile_proxy/core/__pycache__/proxy_server.cpython-311.pyc b/charging_pile_proxy/core/__pycache__/proxy_server.cpython-311.pyc
index 95f007d5f29817bbce06dabf1ac1c91012f7f191..6d14b28442a1c09f86d05da709b3a5f43bcd8194 100644
GIT binary patch
delta 7239
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
NTSEWtC%9y|{{^|)i%0+f

delta 3515
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

diff --git a/charging_pile_proxy/core/proxy_server.py b/charging_pile_proxy/core/proxy_server.py
index 7e17c0f..017d244 100644
--- a/charging_pile_proxy/core/proxy_server.py
+++ b/charging_pile_proxy/core/proxy_server.py
@@ -1,6 +1,7 @@
 import socket
 import logging
 import threading
+import time
 from .utils import ProxyUtils
 from .mqtt_client import MQTTClient
 from commands.command_heartbeat import CommandHeartbeat
@@ -61,8 +62,61 @@ class ChargingPileProxyServer:
         # 存储心跳信息的字典
         self.heartbeat_info = {}
 
+        self.heartbeat_thread = threading.Thread(target=self.check_heartbeat_timeout)
+        self.heartbeat_thread.daemon = True
+        self.heartbeat_thread.start()
 
+    def check_heartbeat_timeout(self):
+        """心跳超时检测"""
+        while self.running:
+            try:
+                current_time = time.time()
+                disconnected_piles = []
 
+                for pile_id, last_heartbeat in self.heartbeat_info.items():
+                    time_diff = current_time - last_heartbeat
+
+                    # 如果超过60秒没收到心跳
+                    if time_diff > 60:
+                        msg = f"充电桩 {pile_id.hex().upper()} 心跳超时 {time_diff:.1f}秒"
+                        logging.warning(msg)
+                        print(msg)
+                        self.mqtt_client.publish_message(msg)
+                        disconnected_piles.append(pile_id)
+
+                # 从心跳信息中移除断开的充电桩
+                for pile_id in disconnected_piles:
+                    del self.heartbeat_info[pile_id]
+                    self.handle_pile_disconnect(pile_id)
+
+                # 每5秒检查一次
+                time.sleep(5)
+
+            except Exception as e:
+                logging.error(f"心跳检测错误: {str(e)}")
+                time.sleep(5)
+
+    def update_heartbeat(self, pile_id):
+        """更新心跳时间戳"""
+        try:
+            self.heartbeat_info[pile_id] = time.time()
+            logging.debug(f"更新充电桩 {pile_id.hex().upper()} 心跳时间")
+        except Exception as e:
+            logging.error(f"更新心跳时间戳失败: {str(e)}")
+
+    def handle_pile_disconnect(self, pile_id):
+        """处理充电桩断开连接"""
+        try:
+            msg = f"充电桩 {pile_id.hex().upper()} 断开连接"
+            logging.info(msg)
+            print(msg)
+            self.mqtt_client.publish_message(msg)
+
+            # 可以在这里添加充电桩断开后的清理逻辑
+            # 例如：中断正在进行的充电等
+
+        except Exception as e:
+            logging.error(f"处理充电桩断开连接失败: {str(e)}")
 
     def start(self):
         """启动代理服务器"""
@@ -139,16 +193,21 @@ class ChargingPileProxyServer:
 
                     # 根据命令字节处理不同命令
                     if command == 0x01:  # 01H命令
+                        logging.info(f"收到01H连接请求命令: {data.hex().upper()}")
                         if self.command_02_handler.process_and_respond(data, destination_socket):
-                            continue
-
+                            logging.info("01H命令处理完成")
+                            continue  # 跳过后续转发，避免重复转发
 
                     elif command == 0x03:  # 03H命令
-
+                        logging.info(f"收到03H登录命令: {data.hex().upper()}")
                         if self.command_03_handler.process_03h(data):
+                            logging.info("03H命令处理完成")
                             continue
 
                     elif command == 0x0C:  # 0CH桩心跳命令
+                        # 提取桩号并更新心跳
+                        pile_id = data[3:11]
+                        self.update_heartbeat(pile_id)
                         logging.info(f"收到0CH心跳命令: {data.hex().upper()}")
                         if self.heartbeat_handler.process_and_respond(data, destination_socket):
                             logging.info("0CH心跳命令处理完成")
@@ -160,16 +219,27 @@ class ChargingPileProxyServer:
                             logging.info("19H卡鉴权命令处理完成")
                             continue  # 跳过后续转发
 
+
+                    elif command == 0x1F:  # 1FH启动充电命令
+
+                        logging.info(f"收到1FH启动充电命令: {data.hex()}")
+
+                        if self.start_charge_handler.process_and_respond(data, destination_socket):
+                            logging.info("1FH命令处理完成")
+
+                            continue
+
+
                     elif command == 0x20:  # 20H启动充电回复
+
                         logging.info(f"收到20H启动充电回复: {data.hex()}")
+
                         self.start_charge_handler.parse_20h(data)
 
-
                     elif command == 0x21:  # 21H启动充电结果命令
-
                         logging.info(f"收到21H启动充电结果命令: {data.hex()}")
-
                         if self.charge_result_handler.process_and_respond(data, destination_socket):
+                            logging.info("21H命令处理完成")
                             continue  # 跳过后续转发
 
                     elif command == 0x23:  # 23H充电订单命令
@@ -179,6 +249,7 @@ class ChargingPileProxyServer:
                             continue
 
 
+
                     elif command == 0x25:  # 25H充电信息命令
 
                         logging.info(f"收到25H充电信息命令: {data.hex()}")
@@ -186,13 +257,19 @@ class ChargingPileProxyServer:
                         if self.charge_info_handler.process_25h(data):
                             logging.info("25H命令处理完成")
 
+                    elif command == 0x26:  # 26H停止充电命令
+                        logging.info(f"收到26H停止充电命令: {data.hex()}")
+                        if self.stop_charge_handler.build_26h_command(data, destination_socket):
+                            logging.info("26H命令处理完成")
+                            continue
+
                     elif command == 0x27:  # 27H停止充电回复
                         logging.info(f"收到27H停止充电回复: {data.hex()}")
                         self.stop_charge_handler.parse_27h(data)
 
                     elif command == 0x30:  # 30H BMS信息命令
                         logging.info(f"收到30H BMS信息命令: {data.hex().upper()}")
-                        if self.bms_handler.process_30h(data):
+                        if self.bms_handler.parse_30h_bms_status(data):
                             logging.info("30H BMS信息命令处理完成")
 
                     else:
diff --git a/charging_pile_proxy/test.log b/charging_pile_proxy/test.log
index 400bb1d..88c8f52 100644
--- a/charging_pile_proxy/test.log
+++ b/charging_pile_proxy/test.log
@@ -4,3 +4,4 @@
 2025-01-17 14:41:09,050 - ERROR - 代理服务器错误: [WinError 10013] 以一种访问权限不允许的方式做了一个访问套接字的尝试。
 2025-01-17 14:58:36,033 - ERROR - 代理服务器错误: [WinError 10013] 以一种访问权限不允许的方式做了一个访问套接字的尝试。
 2025-01-17 17:12:27,913 - ERROR - 代理服务器错误: [WinError 10013] 以一种访问权限不允许的方式做了一个访问套接字的尝试。
+2025-01-20 09:45:44,376 - INFO - 代理服务器已启动，监听地址: 0.0.0.0:52461