YiLin/cjgc_data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

截图未测试

Browse Source
This commit is contained in:
YiLin
2026-06-05 10:17:36 +08:00
parent 10db652cbc
commit 3b2063c007
8 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
actions.py
View File

@@ -241,54 +241,56 @@ class DeviceAutomation:
task_count = 0
max_tasks = 1 # 最大任务数量，防止无限循环
while task_count < max_tasks:
# 获取测量任务
logging.info(f"设备 {self.device_id} 获取测量任务 (第{task_count + 1}次)")
# task_data = apis.get_measurement_task()
# logging.info(f"设备 {self.device_id} 获取到的测量任务: {task_data}")
task_data = {
"id": 39,
"user_name": "czsczq115ykl",
"name": "czsczq115ykl",
"line_num": "L179451",
"line_name": "CDWZQ-2标-资阳沱江特大桥-23-35-山区",
"remaining": "0",
"status": 1
}
if not task_data:
logging.info(f"设备 {self.device_id} 未获取到状态为1的测量任务，等待后重试")
time.sleep(1) # 等待1秒后重试
break
# continue
# 设置全局变量
global_variable.GLOBAL_CURRENT_PROJECT_NAME = task_data.get('line_name', '')
global_variable.GLOBAL_LINE_NUM = task_data.get('line_num', '')
logging.info(f"设备 {self.device_id} 当前要处理的项目名称：{global_variable.GLOBAL_CURRENT_PROJECT_NAME}")
# 执行测量操作
# logging.info(f"设备 {self.device_id} 开始执行测量操作")
if not self.measure_tabbar_page.measure_tabbar_page_manager():
logging.error(f"设备 {self.device_id} 测量操作执行失败")
# # 返回到测量页面
# self.driver.back()
# self.check_and_click_confirm_popup_appium()
continue # 继续下一个任务
logging.info(f"设备 {self.device_id} 测量页面操作执行成功")
# 在测量操作完成后执行断面里程配置
logging.info(f"设备 {self.device_id} 开始执行断面里程配置")
if not self.section_mileage_config_page.section_mileage_config_page_manager():
logging.error(f"设备 {self.device_id} 断面里程配置执行失败")
continue # 继续下一个任务
# 任务完成后短暂等待
logging.info(f"设备 {self.device_id} 第{task_count}个任务完成")
task_count += 1
# while task_count < max_tasks:
# 获取测量任务
logging.info(f"设备 {self.device_id} 获取测量任务 (第{task_count + 1}次)")
# task_data = apis.get_measurement_task()
# logging.info(f"设备 {self.device_id} 获取到的测量任务: {task_data}")
task_data = {
"id": 39,
"user_name": "czsczq115ykl",
"name": "czsczq115ykl",
"line_num": "L179451",
"line_name": "CDWZQ-2标-资阳沱江特大桥-23-35-山区",
"remaining": "0",
"status": 1
}
if not task_data:
logging.info(f"设备 {self.device_id} 未获取到状态为1的测量任务，等待后重试")
time.sleep(1) # 等待1秒后重试
# break
# continue
# 设置全局变量
global_variable.GLOBAL_CURRENT_PROJECT_NAME = task_data.get('line_name', '')
global_variable.GLOBAL_LINE_NUM = task_data.get('line_num', '')
logging.info(f"设备 {self.device_id} 当前要处理的项目名称：{global_variable.GLOBAL_CURRENT_PROJECT_NAME}")
# 执行测量操作
# logging.info(f"设备 {self.device_id} 开始执行测量操作")
if not self.measure_tabbar_page.measure_tabbar_page_manager():
logging.error(f"设备 {self.device_id} 测量操作执行失败")
# # 返回到测量页面
# self.driver.back()
# self.check_and_click_confirm_popup_appium()
# continue # 继续下一个任务
logging.info(f"设备 {self.device_id} 测量页面操作执行成功")
# 在测量操作完成后执行断面里程配置
logging.info(f"设备 {self.device_id} 开始执行断面里程配置")
if not self.section_mileage_config_page.section_mileage_config_page_manager():
logging.error(f"设备 {self.device_id} 断面里程配置执行失败")
# continue # 继续下一个任务
# 任务完成后短暂等待
logging.info(f"设备 {self.device_id} 第{task_count}个任务完成")
task_count += 1
# +++++++++++++white+++++++++++++++++
logging.info(f"设备 {self.device_id} 已完成{task_count}个任务，结束打数据流程")
if task_count == 0:
logging.error(f"没有完成打数据的线路，结束任务")