feat:(策略验证)1.策略验证提交;2:Wx开头的关键字修改;
3:修复删除策略一行关键字名写错
This commit is contained in:
@@ -5,7 +5,7 @@ Resource ../../../03-Variable/BifangApiVariable.txt
|
||||
Resource ../../../03-Variable/PolicyObjectDefault.txt
|
||||
Resource ../../tsg_common/ManageObjectBody.robot
|
||||
*** Keywords ***
|
||||
WxObjectListOperation
|
||||
ObjectListOperation
|
||||
[Documentation]
|
||||
... 描述:入口,opAction参数可为'add','update','disable','enable'
|
||||
... 参数:returnData: 必传,是否返回请求数据。可选${0}(不返回)/${1}(返回)。
|
||||
@@ -14,10 +14,10 @@ WxObjectListOperation
|
||||
... 多个对象处理
|
||||
|
||||
[Arguments] ${returnData} ${objectList} ${opAction}
|
||||
Log To Console Call WxObjectListOperation
|
||||
Log To Console Call ObjectListOperation
|
||||
${objectListJson} Set Variable [
|
||||
FOR ${object} IN @{objectList}
|
||||
${json} WxObjectOrganize ${object} ${opAction}
|
||||
${json} ObjectOrganize ${object} ${opAction}
|
||||
${objectListJson} Set Variable ${objectListJson}${json},
|
||||
END
|
||||
${objectListJson}= Replace String Using Regexp ${objectListJson} ,$ ]
|
||||
@@ -28,7 +28,7 @@ WxObjectListOperation
|
||||
Log Object_Request_Body-${json}
|
||||
[Return] ${json}
|
||||
|
||||
WxObjectOperation
|
||||
ObjectOperation
|
||||
[Documentation]
|
||||
... 描述:入口,opAction参数可为'add','update','disable','enable'
|
||||
... 参数:returnData: 必传,是否返回请求数据。可选${0}(不返回)/${1}(返回)。
|
||||
@@ -37,8 +37,8 @@ WxObjectOperation
|
||||
... 单个策略处理
|
||||
|
||||
[Arguments] ${returnData} ${object} ${opAction}
|
||||
Log To Console Call WxPolicyOperation
|
||||
${json} WxObjectOrganize ${object} ${opAction}
|
||||
Log To Console Call ObjectOperation
|
||||
${json} ObjectOrganize ${object} ${opAction}
|
||||
# 转为json结构并返回
|
||||
${dict} Create Dictionary opAction=${opAction} returnData=${returnData} objectList=replace:objectList
|
||||
${bodyJson} json.Dumps ${dict} ensure_ascii=False
|
||||
@@ -47,14 +47,14 @@ WxObjectOperation
|
||||
Log Object_Request_Body-${json}
|
||||
[Return] ${json}
|
||||
|
||||
WxObjectOrganize
|
||||
ObjectOrganize
|
||||
[Documentation]
|
||||
... 描述:入口,opAction参数可为'add','update','disable','enable'
|
||||
... object: 必传,字典类型。字典内可选参数信息:
|
||||
... 其它参数默认值见../../03-Variable/PolicyObjectDefault.txt
|
||||
... 单个策略转换为json
|
||||
[Arguments] ${object} ${opAction}
|
||||
Log To Console Call WxObjectOrganize
|
||||
Log To Console Call ObjectOrganize
|
||||
${emptyList} Create List
|
||||
${returnDict} Create Dictionary
|
||||
# 断言必传参数
|
||||
@@ -144,11 +144,11 @@ ManageDeleteItemIds
|
||||
Append To List ${list1} ${var}
|
||||
END
|
||||
Set To Dictionary ${returnDict} deleteItemIds=${list1}
|
||||
WxGet-ObjectIds
|
||||
Get-ObjectIds
|
||||
[Documentation]
|
||||
... 获取结果中的对象ID
|
||||
[Arguments] ${value}
|
||||
Log Call WxGet-ObjectIds
|
||||
Log Call Get-ObjectIds
|
||||
${objectIds} Create List
|
||||
${objectIdsTemp} Set Variable ${EMPTY}
|
||||
${return} ${data} Run Keyword And Ignore Error Get From Dictionary ${value} data
|
||||
|
||||
Reference in New Issue
Block a user