Merge branch 'develop' of http://git.ubainsyun.com/bing/ubains-module-test into develop

# Conflicts:
#	.idea/workspace.xml
#	预定系统/README.md
#	预定系统/base/Mqtt_Send.py
#	预定系统/安卓信息模块/安卓信息上报.py
#	预定系统/测试数据/MQTT上报数据.csv

.idea/workspace.xml

@@ -5,6 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1b298f03-b3a2-4f3f-9fa2-7f833ec35924" name="更改" comment="">
+      <change afterPath="$PROJECT_DIR$/预定系统/测试数据/MQTT心跳上报.csv" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/预定系统/base/Mqtt_Send.py" beforeDir="false" afterPath="$PROJECT_DIR$/预定系统/base/Mqtt_Send.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/预定系统/安卓信息模块/安卓信息上报.py" beforeDir="false" afterPath="$PROJECT_DIR$/预定系统/安卓信息模块/安卓信息上报.py" afterDir="false" />
@@ -135,7 +136,11 @@
       <workItem from="1729481397357" duration="2465000" />
       <workItem from="1729519480013" duration="13278000" />
       <workItem from="1729685636638" duration="4482000" />
+<<<<<<< HEAD
       <workItem from="1729690521898" duration="8355000" />
+=======
+      <workItem from="1729690521898" duration="1942000" />
+>>>>>>> 949209b52f0b2ea4a02345aefb25f4daee4ec4bd
     </task>
     <servers />
   </component>
@@ -153,6 +158,10 @@
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
+<<<<<<< HEAD
     <SUITE FILE_PATH="coverage/ubains_module_test$.coverage" NAME="毫米波雷达上报 覆盖结果" MODIFIED="1729761958173" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/预定系统/毫米波雷达模块" />
+=======
+    <SUITE FILE_PATH="coverage/ubains_module_test$.coverage" NAME="安卓信息上报 覆盖结果" MODIFIED="1729740841195" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/预定系统/安卓信息模块" />
+>>>>>>> 949209b52f0b2ea4a02345aefb25f4daee4ec4bd
   </component>
 </project>
\ No newline at end of file

预定系统/README.md

@@ -13,5 +13,9 @@
    - 了解清楚安卓信息的状态判断，后续将调试redis连接以及将键值对存入redis。
 4. 2024-10-24
    - 优化MQTT底层方法，通过判断topic的值来发送不同的消息体。
+<<<<<<< HEAD
    - 优化安卓信息上报.py脚本通过读配置文件中的topic，调用build_message时传入topic进行主题判断。后续方便进行MQTT主题与消息体的管理。
    - 补充毫米波雷达数据上报数据，毫米波设备的device_id需要与实际设备匹配才行。
+=======
+   - 优化安卓信息上报.py脚本通过读配置文件中的topic，调用build_message时传入topic进行主题判断。后续方便进行MQTT主题与消息体的管理。
+>>>>>>> 949209b52f0b2ea4a02345aefb25f4daee4ec4bd

预定系统/base/Mqtt_Send.py

@@ -5,6 +5,8 @@ from time import sleep
 from datetime import datetime
 import paho.mqtt.client as mqtt
 
+from 运维集控.项目测试.国信证券.用户管理.发送设备信息_ZXB import topic
+
 # 配置日志
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
@@ -127,7 +129,10 @@ class Mqtt:
         :param current_time: 当前时间
         :return: 消息字典
         """
+<<<<<<< HEAD:预定系统/base/Mqtt_Send.py
         #安卓信息设备上报
+=======
+>>>>>>> 949209b52f0b2ea4a02345aefb25f4daee4ec4bd:预定系统/base/Mqtt_Android.py
         if topic == "rebootResponseTopic":
             return {
                 "method": "/system/readSystemInfo",
@@ -184,13 +189,17 @@ class Mqtt:
                     }
                 })
             }
+<<<<<<< HEAD:预定系统/base/Mqtt_Send.py
         #安卓信息心跳上报
+=======
+>>>>>>> 949209b52f0b2ea4a02345aefb25f4daee4ec4bd:预定系统/base/Mqtt_Android.py
         elif topic == "/uams/android/broadcast":
             return json.dumps({
                 "type":"heartbeat",
                 "clientId" : config['clientId'],
                 "appId":"com.ubains.uniplatform",
                 "deviceId": config['deviceId']
+<<<<<<< HEAD:预定系统/base/Mqtt_Send.py
             })
 
         #毫米波雷达数据上报
@@ -213,6 +222,10 @@ class Mqtt:
                     "ip" : config['ip']
                 }
             })
+=======
+            })
+
+>>>>>>> 949209b52f0b2ea4a02345aefb25f4daee4ec4bd:预定系统/base/Mqtt_Android.py
 
     def send_and_receive_messages(self, topic, message, num_times=1, timeout=5, interval=0.2):
         """

预定系统/安卓信息模块/安卓信息上报.py

+<<<<<<< HEAD
 from 预定系统.base.Mqtt_Send import Mqtt
+=======
+from 预定系统.base.Mqtt_Android import Mqtt
+>>>>>>> 949209b52f0b2ea4a02345aefb25f4daee4ec4bd
 from datetime import datetime
 import logging
 import time
 
 if __name__ == "__main__":
     # 读取配置文件
+<<<<<<< HEAD
     configs = Mqtt.read_config_from_csv('../测试数据/MQTT安卓上报数据.csv')
+=======
+    configs = Mqtt.read_config_from_csv('../测试数据/MQTT心跳上报.csv')
+>>>>>>> 949209b52f0b2ea4a02345aefb25f4daee4ec4bd
 
     broker_address = "192.168.5.218"
     port = 1883
@@ -25,7 +33,11 @@ if __name__ == "__main__":
 
             # 遍历配置文件中的每一行数据
             for config in configs:
+<<<<<<< HEAD
                 # 构建消息内容-
+=======
+                # 构建消息内容
+>>>>>>> 949209b52f0b2ea4a02345aefb25f4daee4ec4bd
                 topic = config["topic"]
                 current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
                 message = Mqtt.build_message(config, current_time, topic)

预定系统/测试数据/MQTT上报数据.csv

+topic,clientId,appToken,companyNumber,cnum,conferenceId,macAddress,authCode
+rebootResponseTopic,48134e6047a19aaf,AND-8AJ-0021,CN-8AJ-UBAINS,22tcji1m49t45ro0r3zyaj0zqd1863yh,219,20:59:20:00:28:81,AND-8AJ-0021
+rebootResponseTopic,48134e6047a19aac,AND-8AJ-0022,CN-8AJ-UBAINS,9arvn9am36cjzlimxm4ojd9xzdzusaup,219,20:59:20:00:28:82,AND-8AJ-0022
+rebootResponseTopic,48134e6047a19aab,AND-8AJ-0023,CN-8AJ-UBAINS,v3ydnq9u34ocunzanac6l3q8atkvvic3,219,20:59:20:00:28:83,AND-8AJ-0023
+rebootResponseTopic,48134e6047a19aaz,AND-8AJ-0024,CN-8AJ-UBAINS,r8xvvvs4r7hhzhfi4i2zldoxoe4estss,219,20:59:20:00:28:84,AND-8AJ-0024
+rebootResponseTopic,48134e6047a19aax,AND-8AJ-0025,CN-8AJ-UBAINS,r8xvvvs4r7hhzhfi4i2zldoxoe4estss,219,20:59:20:00:28:85,AND-8AJ-0025
\ No newline at end of file

预定系统/测试数据/MQTT心跳上报.csv

+topic,clientId,deviceId
+/uams/android/broadcast,48134e6047a19aaf,aa44e258a4e1e571
+/uams/android/broadcast,48134e6047a19aac,aa44e258a4e1e572
+/uams/android/broadcast,48134e6047a19aab,aa44e258a4e1e573
+/uams/android/broadcast,48134e6047a19aaz,aa44e258a4e1e574
+/uams/android/broadcast,48134e6047a19aax,aa44e258a4e1e575
\ No newline at end of file