casper 5 months ago
parent
commit
41b344a16e

+ 6 - 3
sri-server-bg01/test/test-1000.py

@@ -5,16 +5,19 @@ import requests
 # url = 'http://127.0.0.1:9000/v1/token'
 url = 'http://10.10.60.237:9000/v1/token'
 data = {
-    'username': 'admin',  # 登录账户
-    'password': '123456',  # 登录密码
+    # 'username': 'admin',  # 登录账户
+    # 'password': '123456',  # 登录密码
 
     # 'username': 'test003',  # 登录账户
     # 'password': '123456',  # 登录密码
+
+    'username': 'test01',  # 登录账户
+    'password': '123456',  # 登录密码
 }
 response = requests.post(url=url, json=data)
 code = response.json().get('code')
 token = response.headers.get('authorization')
-# print(response.json())
+print(response.json())
 # """
 # {
 #   'code': 0,

+ 30 - 1
sri-server-bg02/lib/MessageListenerC001.py

@@ -12,6 +12,8 @@ import os
 # save_dir = r'C:\SRI-DINO.Server-py\logs'  # sri内网测试环境
 save_dir = r'C:\logs'  # sri内网测试环境
 
+class LocalClass(object):
+    last_log_key = str()
 
 def method_c001(client, userdata, message):
     """消息处理方法"""
@@ -67,7 +69,7 @@ def method_c001(client, userdata, message):
     'vehicleID': '0538'
     }
     """
-    # --- log ---
+    # --- print ---
     methods.debug_log(f"MessageListenerC001|19", f"#message.payload: {message.payload}")
     log_dict = json.loads(message.payload)
     # try:
@@ -76,6 +78,33 @@ def method_c001(client, userdata, message):
     # except Exception as e:
     #     pass
 
+    # --- save ---
+    file_name = methods.now_string('v001-%Y-%m-%d-%H.log')
+    log_file_path = os.path.join(save_dir, file_name)
+    log_dict = json.loads(message.payload)
+    log_list = [
+
+        f"timestamp: {methods.ts_to_string(int(log_dict.get('timestamp')) / 1000)}",  # 时间
+        f"userID: {log_dict.get('userID')}",  # 用户id
+        f"VehicleID: {log_dict.get('VehicleID')}",  # 车id
+
+    ]
+
+
+
+    # --- check ---
+    log_key = '-'.join(log_list[1:])
+    if LocalClass.last_log_key and LocalClass.last_log_key == log_key:
+        # methods.debug_log(f"MessageListener24", f"#86: {LocalClass.last_log_key == log_key}")
+        return
+
+    # --- update --
+    LocalClass.last_log_key = log_key
+
+    # --- save ---
+    methods.debug_log(f"MessageListener24", f"#log_list: {log_list}")
+    methods.write_text(log_file_path, ' | '.join(log_list) + '\n', 'a')
+
 
 def subscribe_c001():
     """"""

+ 3 - 3
sri-server-bg03/README-usage-win.bash

@@ -1,9 +1,9 @@
 ## USAGE
 
 # 收集离线安装包
-# pip download -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements-win.txt -d C:\temp\sri-server-bg03
-pip download -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements-win.txt -d D:\temp\sri-server-bg03
-pip download -r requirements-win.txt -d D:\temp\sri-server-bg03
+pip download -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements-win.txt -d C:\temp\sri-server-bg03
+# pip download -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements-win.txt -d D:\temp\sri-server-bg03
+# pip download -r requirements-win.txt -d D:\temp\sri-server-bg03
 # 离线安装
 pip install --no-index --find-links=C:\temp\sri-server-bg03 -r requirements-win.txt
 # 验证