优化脚本

air_case/b2_herp3_bs/o2运维管理_消息通知模板_消息类型_编辑消息类型.air/o2运维管理_消息通知模板_消息类型_编辑消息类型.py

@@ -35,13 +35,13 @@ def test1():
     token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
     # print( token,projectCode,uxid,corpId,info)
     pro_path = commonFuc().get_pro_path()
-    sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\n7运维管理_消息通知模板_消息类型_获取消息模板ID.air')
-    using(pro_path + r'\\air_case\\b2_herp3_bs\\n7运维管理_消息通知模板_消息类型_获取消息模板ID.air')
-    from n7运维管理_消息通知模板_消息类型_获取消息模板ID import test1
+    sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\o2运维管理_消息通知模板_消息类型_获取消息类型ID.air')
+    using(pro_path + r'\\air_case\\b2_herp3_bs\\o2运维管理_消息通知模板_消息类型_获取消息类型ID.air')
+    from o2运维管理_消息通知模板_消息类型_获取消息类型ID import test1
     id1= test1()
     print(id1)
     #o2运维管理_消息通知模板_消息类型_编辑消息类型
-    url=commonFuc().get_api_url()+commonFuc().get_business_data(module, "message_template_updateById_url")
+    url=commonFuc().get_api_url()+commonFuc().get_business_data(module, "message_template_saveType_url")
 
     # 获取请求头信息
     headers = commonFuc().get_business_data(module, "json_headers2",

air_case/b2_herp3_bs/o2运维管理_消息通知模板_消息类型_获取消息类型ID.air/o2运维管理_消息通知模板_消息类型_获取消息类型ID.py

+# -*- encoding=utf8 -*-
+import sys
+
+from airtest.core.helper import using
+
+from common.db.sql.sql_del_branch_info import delData
+from common.db.sql.sql_del_kind_goodsinfo import delKindGoodsinfo
+from common.db.sql.sql_del_notices_info import delByNoticeName
+from common.fileUtls import FileUtils
+from common.timeUtils import timeUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,herp-web,o2运维管理_消息通知模板_消息类型_获取消息类型ID,id2263,id2263-166,sit,on
+内网:o2运维管理_消息通知模板_消息类型_获取消息类型ID
+"""
+
+from common.common_func import commonFuc
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+module = "b2_herp3_bs"
+def test1():
+    """
+     场景:o2运维管理_消息通知模板_消息类型_获取消息类型ID
+     用例名称：o2运维管理_消息通知模板_消息类型_获取消息类型ID
+     输入：无
+     输出："rtn_msg": {"code": 0, "msg": null,    "data": 1}
+    """
+    #内网登录
+    username = commonFuc().get_business_data(module, "username")
+    #     # print('医院名称',username)
+    password = commonFuc().get_business_data(module, "password")
+    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # 获取token和projectCode
+    token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
+    # print( token,projectCode,uxid,corpId,info)
+    # pro_path = commonFuc().get_pro_path()
+    # sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\m2运维管理_PDA授权_列表查询获取id.air')
+    # using(pro_path + r'\\air_case\\b2_herp3_bs\\m2运维管理_PDA授权_列表查询获取id.air')
+    # from m2运维管理_PDA授权_列表查询获取id import test1
+    # id1, lastModified, createTime = test1()
+    # print(id1, lastModified, createTime)
+    #o2运维管理_消息通知模板_消息类型_获取消息类型ID
+    url=commonFuc().get_api_url()+commonFuc().get_business_data(module, "tree_h0347_url")
+
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                         commonFuc().get_business_data(module, "X-APP-CODE"))
+    # branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
+    # str = commonFuc().get_business_data(module, 'data7')
+    # list2 = list(str.split(","))
+    # print(list2)
+    # #获取日期
+    # date1=timeUtils().get_time_hms(2)
+    # date2=timeUtils().get_time_hms(2)
+    # for i in list2:
+        # #请求体
+    # request_body = commonFuc().get_business_data(module, "payload57_2")
+    # # # 发送请求
+    result = commonFuc().http_get(url,headers)
+    print('resultaaaaaaaaaaaaaaaaaaaaaaaaaaa', result)
+    #断言
+    # checkDict=commonFuc().get_business_data(module,'checkDict10')
+    # commonFuc().check_result(checkDict,result)
+    code=commonFuc().analysis_json('code',result)
+    data=commonFuc().analysis_json('data',result)
+    print('data',data)
+    data1=commonFuc().analysis_json('data',data)
+    # print(pageSize)
+    if code==0 and len(data)>=1:
+        for i in data:
+            children = commonFuc().analysis_json('children', i)
+            print(type(children))
+            print('children', children)
+            for j in children:
+                name = commonFuc().analysis_json('name', j)
+                if name == 'test1':
+                    id1 = commonFuc().analysis_json('id', j)
+                    print('name', name)
+                    print('id1', id1)
+                    return id1
+
+        commonFuc().check_text_exist(0, result)
+    else:
+        commonFuc().check_text_exist('error', result)
+
+test1()

air_case/b2_herp3_bs/o3科室管理_科室产品分配_科室目录查询_查询全部.air/o3科室管理_科室产品分配_科室目录查询_查询全部.py

@@ -12,7 +12,7 @@ from common.timeUtils import timeUtils
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,herp-web,o3科室管理_科室产品分配_科室目录查询_查询全部,id2263,id2263-166,sit,on
+case_tag:api,herp-web,o3科室管理_科室产品分配_科室目录查询_查询全部,id2263,id2263-167,sit,on
 内网:o3科室管理_科室产品分配_科室目录查询_查询全部
 """
 

common/db/sql/sql_del_branch_info.py

@@ -56,7 +56,7 @@ class delData(object):
                                      charset="utf8")
         cursor = connection.cursor()
         # 删除产品信息修改数据
-        sql = " delete from sys_message_type where create_user='UID-050151' and template_type_name='test1';"
+        sql = " delete from sys_message_type where create_user='UID-050151' and template_type_name='test2';"
         print(sql)
         cursor.execute(sql)
         cursor.execute("commit;")

data/b2_herp3_bs/data

@@ -67,7 +67,7 @@
 "message_template_updateById_url": "/api/platformService/sys/message/template/updateById"
 "message_template_deleteById_url": "/api/platformService/sys/message/template/deleteById/"
 "branchDept_url": "/api/platformService/sys/org/v2/list/branchDept"
-
+"tree_h0347_url": "/api/platformService/sys/message/template/tree/h0347"
 
 data1: '条码,high_info,check_detail,高值打码,out_stock,goods_change_baseInfo,center_out_stock_pkg,mcms_centre_out_stock,pkg_info,mcms_dept_out_stock,barcode_common,mcms_centre_in_stock,goods_change_price,mcms_dept_in_stock,check_detail_pkg,center_out_stock_high,center_out_stock_high,high_consume,shelf_code,barcode_common_pkg,check_detail_high,balance_bill,barcode_rfid,bottle_info,验收单明细打印,产品信息变更,中心库出库单低值,医院中心库出库单,包信息,医院科室出库单,高值纸质条码打印,医院中心库入库单,产品调价,医院科室入库单,低值验收单,中心库出库单高值,高值耗材使用登记表,货位码,单元包纸质条码打印,高值验收单,结算单打印,高值RFID条码打印,单瓶码打印'
 data2: 'code,医院标识,code1,code1,erpCode,JDE编码修改,GOODS_CHANGE_STATUS,产品信息变更状态,GOODS_CHARGE_COST,是否计入成本,GOODS_KIND_TYPE,产品分类类型,MFRS_KIND,企业职能,miCode,医保编码修改,NOTICE_RANGE_KIND,公告通知范围,PUR_MODE,耗材类型,YWMS,业务模式,CORP_TYPE,主体类别,PROGRAM_TYPE,程序端,GRAIN,参数粒度,ENV,发布环境,PROJECT_GROUP,系统分组,RETURN_REASON_TYPE,退货原因,NEWCPFL,新产品分类,ZZLX,企业证照类型,68FL,68器械分类,18FL,18器械分类,GOODS_START_STOP,产品启停,YYDJ,医院等级,GOODS_TEMP,产品临采,GLJB,耗材管理级别,GOODS_PURCHASE,产品是否采购,HIS_CODE_CHANGE,HIS编码修改,MI_CODE_CHANGE,医保型号修改,MI_GOODS_GG_CHANGE,医保产品规格,MI_GOODS_XH_CHANGE,医保型号修改,GOODS_CHARGE,产品是否计费,GOODS_BAR_CODE,产品管理模式,GOODS_PUR_MODE,耗材类型,GOODS_CHANGE_PRICE,产品调价类型,GOODS_BAR_CODE_STRATEGY,UDI管理策略,FOCUS_CONTROL_TYPE,重点管控分类,MANUAL_PICK_REASON,手工出库原因,RFID_LABEL_CHANGE,RFID标签管理,ALLOT_PICK_REASON,调拨出库原因,MAGRE_PICK_REASON,移库出库原因'
@@ -356,7 +356,7 @@ json_headers2: {
 "payload57": {"corpId":"h0347","pid":"EXPIRATION_WARNING","projectCode":"herp","templateTypeCode":"test1","templateTypeName":"test1"}
 "payload57_1": {"corpId":"h0347","projectCode":"herp","templateName":"test1","channelType":"7","title":"test1","content":"test1","url":"","tbStatus":1,"messageType":"test1"}
 "payload57_2": {"orderBy":"","pageNum":1,"pageSize":50,"predicate":"","queryObject":{"corpId":"h0347","projectCode":"herp","messageType":"test1"}}
-"payload57_3": {"corpId":"h0347","projectCode":"herp","templateName":"test2","channelType":7,"id":"%s","title":"test2","content":"test2","url":"","tbStatus":1,"messageType":"test1"}
+"payload57_3": {"corpId":"h0347","id":"%s","pid":"EXPIRATION_WARNING","projectCode":"herp","templateTypeCode":"test1","templateTypeName":"test2"}
 "payload57_4": {"corpId":"h0347","projectCode":"herp","templateName":"test2","channelType":7,"id":"%s","title":"test2","content":"test2","url":"","tbStatus":0,"messageType":"test1"}
 "payload57_5": {"corpId":"h0347","projectCode":"herp","templateName":"test2","channelType":7,"id":"%s","title":"test2","content":"test2","url":"","tbStatus":1,"messageType":"test1"}
 "payload58": {"corpId":"h0347","orgName":"","kind":1}

report/summary.html

@@ -55,9 +55,9 @@
 
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0分1秒</td>
-            <td class="details-col-elapsed">100.0%</td>
+            <td class='details-col-elapsed'>0</td>
+            <td class='details-col-elapsed'>0分3秒</td>
+            <td class="details-col-elapsed">0.0%</td>
         </tr>
     </table>
 
@@ -72,9 +72,9 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/o3科室管理_科室产品分配_科室目录查询_查询全部/log.html' target='_blank'>o3科室管理_科室产品分配_科室目录查询_查询全部</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">1.454</td>
+            <td class="details-col-elapsed"><a href='../log/o2运维管理_消息通知模板_消息类型_编辑消息类型/log.html' target='_blank'>o2运维管理_消息通知模板_消息类型_编辑消息类型</a></td>
+            <td class="fail">失败</td>
+            <td class="details-col-elapsed">3.528</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>