Commit 8e1e230b authored by Wallen姚文辉's avatar Wallen姚文辉

修复多面板bug

parent e8e48e5a
...@@ -63,13 +63,20 @@ def getproject(): ...@@ -63,13 +63,20 @@ def getproject():
else: else:
return jsonify({"code": 402, "message": "未找到相关项目,请确认jira信息是否正确"}),402 return jsonify({"code": 402, "message": "未找到相关项目,请确认jira信息是否正确"}),402
@tool.route('/testport/iteration/<getproject>', methods=["GET"]) @tool.route('/testport/view/<getproject>', methods=["GET"])
def iteration(getproject): def getview(getproject):
headers=getheader(session.get("id"))
result=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+getproject,headers=headers).json().get("values")
return jsonify({"code": 200, "message": "请求成功", "data": result}),200
@tool.route('/testport/iteration/<view>', methods=["GET"])
def iteration(view):
headers=getheader(session.get("id")) headers=getheader(session.get("id"))
if not headers: if not headers:
return jsonify({"code": 502, "message": "请完善jira信息"}),502 return jsonify({"code": 502, "message": "请完善jira信息"}),502
id_=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+getproject,headers=headers).json().get("values")[0].get("id") # id_=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+getproject,headers=headers).json().get("values")[0].get("id")
result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(id_),headers=headers).json() result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+view,headers=headers).json()
res=[] res=[]
for each in result["sprints"]: for each in result["sprints"]:
res.append({"key":each["id"],"name":each["name"]}) res.append({"key":each["id"],"name":each["name"]})
...@@ -78,24 +85,29 @@ def iteration(getproject): ...@@ -78,24 +85,29 @@ def iteration(getproject):
else: else:
return jsonify({"code": 402, "message": "未找到相关项目,请确认jira信息是否正确"}),402 return jsonify({"code": 402, "message": "未找到相关项目,请确认jira信息是否正确"}),402
@tool.route('/testport/reportinfo', methods=["GET"]) @tool.route('/testport/reportinfo', methods=["GET"])
def reportinfo(): def reportinfo():
project=request.args.get("project") # project=request.args.get("project")
iteration=request.args.get("iteration") iteration=request.args.get("iteration")
id_=request.args.get("view")
print(id_)
headers=getheader(session.get("id")) headers=getheader(session.get("id"))
id_=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+project,headers=headers).json().get("values")[0].get("id") # id_=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+project,headers=headers).json().get("values")[0].get("id")
result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(id_),headers=headers).json() result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(id_),headers=headers).json()
all_=result.get("issues") all_=result.get("issues")
status={} status={}
# print(result)
for k,v in result["entityData"]["statuses"].items(): for k,v in result["entityData"]["statuses"].items():
status[k]=v["statusName"] status[k]=v["statusName"]
priority={} priority={}
for k,v in result["entityData"]["priorities"].items(): for k,v in result["entityData"]["priorities"].items():
priority[k]=v["priorityName"] priority[k]=v["priorityName"]
type_={} type_={}
for k,v in result["entityData"]["types"].items(): for k,v in result["entityData"]["types"].items():
type_[str(k)]=v["typeName"] type_[str(k)]=v["typeName"]
spList=[] spList=[]
sprint=None sprint=None
for i in result["sprints"]: for i in result["sprints"]:
...@@ -110,6 +122,7 @@ def reportinfo(): ...@@ -110,6 +122,7 @@ def reportinfo():
bug=list(filter(lambda x:type_[x["typeId"]]=="BUG",iterationitems)) bug=list(filter(lambda x:type_[x["typeId"]]=="BUG",iterationitems))
testcase=list(filter(lambda x:type_[x["typeId"]]=="测试用例",all_)) testcase=list(filter(lambda x:type_[x["typeId"]]=="测试用例",all_))
keylist=list(map(lambda x:x.get("key"),testcase)) keylist=list(map(lambda x:x.get("key"),testcase))
# print(iterationitems)
for i in story: for i in story:
i["case"]=[] i["case"]=[]
i["childrenTask"]=[i.get("key")] i["childrenTask"]=[i.get("key")]
...@@ -146,6 +159,8 @@ def reportinfo(): ...@@ -146,6 +159,8 @@ def reportinfo():
if each["label"]=="测试用例": if each["label"]=="测试用例":
soup=BeautifulSoup(each["html"],"html.parser") soup=BeautifulSoup(each["html"],"html.parser")
i["case"]=[i.next_element for i in soup.select('tr>td[align="left"]>span>a') if i.next_element in keylist] i["case"]=[i.next_element for i in soup.select('tr>td[align="left"]>span>a') if i.next_element in keylist]
# print(peoples)
for i in bug: for i in bug:
info=requests.request("get",jiraAddress+"/rest/api/latest/issue/"+i.get("key"),headers=headers).json() info=requests.request("get",jiraAddress+"/rest/api/latest/issue/"+i.get("key"),headers=headers).json()
m=requests.request("get",jiraAddress+"/secure/AjaxIssueEditAction!default.jspa?decorator=none&issueId="+str(i.get("id")),headers=headers).json() m=requests.request("get",jiraAddress+"/secure/AjaxIssueEditAction!default.jspa?decorator=none&issueId="+str(i.get("id")),headers=headers).json()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment