Skip to content

U
ubains-module-test
提交 2a28b14e authored 作者: 陈泽健's avatar 陈泽健
浏览文件
操作

优化处理

上级 b0df168b
显示空白字符变更
内嵌 并排
正在显示 包含 47 行增加 和 52 行删除
预定系统/Base/Mqtt_Send.py
浏览文件 @ 2a28b14e
...@@ -395,7 +395,13 @@ class Mqtt: ...@@ -395,7 +395,13 @@ class Mqtt:
"startTime": config['startTime'], "startTime": config['startTime'],
"endTime": config['endTime'], "endTime": config['endTime'],
"companyNumber": config['companyNumber'], "companyNumber": config['companyNumber'],
"participantList": ["JiaoJiao", "JiaYu", "DuiFangZhengZaiZhangTouFa", "DuoTangMaLaBan", "DaLi", "500mlLingDu", "tt.", "wilbur", "q"], "participantList": ["JiaoJiao", "JiaYu", "DuiFangZhengZaiZhangTouFa", "DuoTangMaLaBan", "DaLi", "500mlLingDu", "tt.", "wilbur", "q", "Test40", "Test41", "Test42", "Test43", "Test44", "Test45", "Test46", "Test47", "Test48", "Test49",
"Test50", "Test51", "Test52", "Test53", "Test54", "Test55", "Test56", "Test57", "Test58", "Test59",
"Test60", "Test61", "Test62", "Test63", "Test64", "Test65", "Test66", "Test67", "Test68", "Test69",
"Test70", "Test71", "Test72", "Test73", "Test74", "Test75", "Test76", "Test77", "Test78", "Test79",
"Test80", "Test81", "Test82", "Test83", "Test84", "Test85", "Test86", "Test87", "Test88", "Test89",
"Test90"],
"signInBeforeMinutes": config['signInBeforeMinutes'], "signInBeforeMinutes": config['signInBeforeMinutes'],
"signEndTime": config['signEndTime'], "signEndTime": config['signEndTime'],
"enableSignOut": config['enableSignOut'], "enableSignOut": config['enableSignOut'],
......
预定系统/cases/展厅巡检/02预定系统巡检/展厅会议预约巡检.py
浏览文件 @ 2a28b14e
...@@ -104,55 +104,6 @@ class Exhibition_hall_inspection_000x: ...@@ -104,55 +104,6 @@ class Exhibition_hall_inspection_000x:
safe_click((By.XPATH, f"//div[normalize-space()='{current_time}']"), wd) safe_click((By.XPATH, f"//div[normalize-space()='{current_time}']"), wd)
sleep(1) sleep(1)
# # 将字符串转换为时间对象1
# start_time = datetime.strptime(book_start_time, time_format)
# end_time = datetime.strptime(book_end_time, time_format)
#
# # 如果需要将时间差转换为分钟数
# time_diff_minutes = (end_time - start_time).total_seconds() / 60
# # INFO(f"时间差为：time_diff_minutes")
#
# # 判断如果开始时间与结束时间相等，则不重复点击
# if book_start_time == book_end_time:
# INFO(f"开始时间与结束时间相等，选择时间块：{book_start_time}")
# # 根据开始时间选择对应时间块，时间格式为：**:**
# safe_click((By.XPATH, f"(//div[normalize-space()='{book_start_time}'])[1]"), wd)
# elif book_start_time != book_end_time:
# INFO(f"开始时间与结束时间不相等，选择时间块：{book_start_time}，{book_end_time}")
# # 根据开始时间选择对应时间块，时间格式为：**:**
# safe_click((By.XPATH, f"(//div[normalize-space()='{book_start_time}'])[1]"), wd)
# # 根据结束时间选择对应时间块，时间格式为：**:**
# safe_click((By.XPATH, f"(//div[normalize-space()='{book_end_time}'])[1]"), wd)
# sleep(2)
#
# # 判断时间差是否大于最大预约时长1小时，即60分钟
# if time_diff_minutes > 60:
# INFO(f"时间差大于最大预约时长1小时，选择【超出预约时长】")
# notify_text = get_notify_text(wd, (By.XPATH, "//p[contains(@class,'el-message__content')]"), "Message_Manage", "Message_Book", f"{name}_超出预约时长")
# INFO(f"提示信息为：{notify_text}")
# sleep(2)
#
# # 不选时间点击【下一步】查看提示信息
# INFO("不选时间点击【下一步】查看提示信息")
# safe_click((By.XPATH, "//div[contains(text(),'下一步')]"),wd)
# sleep(1)
# notify_text = get_notify_text(wd, (By.XPATH, "//p[contains(@class,'el-message__content')]"), "Message_Manage", "Message_Book", f"{name}请选择会议时间提示信息")
# INFO(f"提示信息为：{notify_text}")
# sleep(1)
#
# # 重新选择时间，将字符串转换为时间对象
# time_obj = datetime.strptime(book_end_time, time_format)
# time_obj_minus_5_minutes = time_obj - timedelta(minutes=30)
#
# # 将时间对象转换回字符串
# book_end_time = time_obj_minus_5_minutes.strftime(time_format)
# INFO(f"重新选择结束时间为：{book_end_time}")
# # 根据开始时间选择对应时间块，时间格式为：**:**
# safe_click((By.XPATH, f"(//div[normalize-space()='{book_start_time}'])[1]"), wd)
# # 根据结束时间选择对应时间块，时间格式为：**:**
# safe_click((By.XPATH, f"(//div[normalize-space()='{book_end_time}'])[1]"), wd)
# sleep(2)
# 在会议预定第二步界面进行数据填入 # 在会议预定第二步界面进行数据填入
STEP(4, "会议第二步数据填写") STEP(4, "会议第二步数据填写")
# 点击【下一步】进入会议预定第二步界面 # 点击【下一步】进入会议预定第二步界面
...@@ -222,6 +173,8 @@ class Exhibition_hall_inspection_000x: ...@@ -222,6 +173,8 @@ class Exhibition_hall_inspection_000x:
INFO("进入安卓信息界面，查看门口屏设备列表，请查看设备列表状态显示是否正常") INFO("进入安卓信息界面，查看门口屏设备列表，请查看设备列表状态显示是否正常")
sleep(5) sleep(5)
SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Android", "门口屏设备列表") SELENIUM_LOG_SCREEN(wd, "75%", "Exhibit_Inspect", "Android", "门口屏设备列表")
# 点击【应用截屏】按钮
safe_click((By.XPATH,"(//span[contains(text(),'应用截屏')])[1]"),wd) safe_click((By.XPATH,"(//span[contains(text(),'应用截屏')])[1]"),wd)
sleep(30) sleep(30)
INFO("查看门口屏截屏显示，请查看门口屏截屏功能是否正常") INFO("查看门口屏截屏显示，请查看门口屏截屏功能是否正常")
......
预定系统/测试数据/MQTT模块/富创项目/富创项目_会议预约推送.csv
浏览文件 @ 2a28b14e
topic,action,thirdPartyMeetingId,thirdPartyRoomId,conferenceName,messageName,startTime,endTime,companyNumber,signInBeforeMinutes,signEndTime,enableSignOut,signOutMinutesAfterSignIn,signOutAfterEndMinutes topic,action,thirdPartyMeetingId,thirdPartyRoomId,conferenceName,messageName,startTime,endTime,companyNumber,signInBeforeMinutes,signEndTime,enableSignOut,signOutMinutesAfterSignIn,signOutAfterEndMinutes
/meeting/message/sync,add,7565416702283099017,1,表处办公室1号会议室,富创预约,2025-03-18 11:45:00.0,2025-03-18 11:57:00.0,CN-JHP-UBAINS,3,1,1,2,1 /meeting/message/sync,add,7565416702283092001,1,表处办公室1号会议室,人脸测试3,2025-03-20 01:00:00.0,2025-03-20 02:00.0,CN-JHP-UBAINS,30,5,1,10,5
\ No newline at end of file /meeting/message/sync,add,7565416702283092001,1,表处办公室1号会议室,人脸测试3,2025-03-20 03:00:00.0,2025-03-20 04:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092002,1,表处办公室1号会议室,人脸测试2,2025-03-20 05:00:00.0,2025-03-20 06:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092003,1,表处办公室1号会议室,人脸测试4,2025-03-20 07:00:00.0,2025-03-20 08:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092004,1,表处办公室1号会议室,人脸测试5,2025-03-20 09:00:00.0,2025-03-20 10:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092005,1,表处办公室1号会议室,人脸测试6,2025-03-20 11:00:00.0,2025-03-20 12:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092006,1,表处办公室1号会议室,人脸测试7,2025-03-20 13:00:00.0,2025-03-20 14:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092007,1,表处办公室1号会议室,人脸测试8,2025-03-20 15:00:00.0,2025-03-20 16:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092008,1,表处办公室1号会议室,人脸测试9,2025-03-20 17:00:00.0,2025-03-20 18:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092009,1,表处办公室1号会议室,人脸测试10,2025-03-20 19:00:00.0,2025-03-20 20:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092010,1,表处办公室1号会议室,人脸测试11,2025-03-20 21:00:00.0,2025-03-20 22:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092011,1,表处办公室1号会议室,人脸测试12,2025-03-20 23:00:00.0,2025-03-21 00:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092012,1,表处办公室1号会议室,人脸测试13,2025-03-21 01:00:00.0,2025-03-21 02:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092013,1,表处办公室1号会议室,人脸测试14,2025-03-21 03:00:00.0,2025-03-21 04:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092014,1,表处办公室1号会议室,人脸测试15,2025-03-21 05:00:00.0,2025-03-21 06:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092015,1,表处办公室1号会议室,人脸测试16,2025-03-21 07:00:00.0,2025-03-21 08:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092016,1,表处办公室1号会议室,人脸测试17,2025-03-21 09:00:00.0,2025-03-21 10:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092017,1,表处办公室1号会议室,人脸测试18,2025-03-21 11:00:00.0,2025-03-21 12:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092018,1,表处办公室1号会议室,人脸测试19,2025-03-21 13:00:00.0,2025-03-21 14:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092019,1,表处办公室1号会议室,人脸测试20,2025-03-21 15:00:00.0,2025-03-21 16:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092020,1,表处办公室1号会议室,人脸测试21,2025-03-21 17:00:00.0,2025-03-21 18:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092021,1,表处办公室1号会议室,人脸测试22,2025-03-21 19:00:00.0,2025-03-21 20:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092022,1,表处办公室1号会议室,人脸测试23,2025-03-21 21:00:00.0,2025-03-21 22:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092023,1,表处办公室1号会议室,人脸测试24,2025-03-21 23:00:00.0,2025-03-22 00:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092024,1,表处办公室1号会议室,人脸测试25,2025-03-22 01:00:00.0,2025-03-22 02:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092025,1,表处办公室1号会议室,人脸测试26,2025-03-22 03:00:00.0,2025-03-22 04:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092026,1,表处办公室1号会议室,人脸测试27,2025-03-22 05:00:00.0,2025-03-22 06:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092027,1,表处办公室1号会议室,人脸测试28,2025-03-22 07:00:00.0,2025-03-22 08:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092028,1,表处办公室1号会议室,人脸测试29,2025-03-22 09:00:00.0,2025-03-22 10:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092029,1,表处办公室1号会议室,人脸测试30,2025-03-22 11:00:00.0,2025-03-22 12:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092030,1,表处办公室1号会议室,人脸测试31,2025-03-22 13:00:00.0,2025-03-22 14:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092031,1,表处办公室1号会议室,人脸测试32,2025-03-22 15:00:00.0,2025-03-22 16:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092032,1,表处办公室1号会议室,人脸测试33,2025-03-22 17:00:00.0,2025-03-22 18:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092033,1,表处办公室1号会议室,人脸测试34,2025-03-22 19:00:00.0,2025-03-22 20:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092034,1,表处办公室1号会议室,人脸测试35,2025-03-22 21:00:00.0,2025-03-22 22:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092035,1,表处办公室1号会议室,人脸测试36,2025-03-22 23:00:00.0,2025-03-23 00:00.0,CN-JHP-UBAINS,30,5,1,10,5
/meeting/message/sync,add,7565416702283092036,1,表处办公室1号会议室,人脸测试37,2025-03-23 01:00:00.0,2025-03-23 02:00.0,CN-JHP-UBAINS,30,5,1,10,5
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论