Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
car-reptiles
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
梁辉
car-reptiles
Commits
f058c2db
Commit
f058c2db
authored
Dec 04, 2020
by
梁辉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
找回分页查询检测报告列表
parent
3863eecd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
4 deletions
+49
-4
car-reptiles-system/src/main/java/me/zhengjie/modules/system/service/ReportService.java
+4
-4
car-reptiles-system/src/main/java/me/zhengjie/modules/system/util/CarReportUtil.java
+45
-0
No files found.
car-reptiles-system/src/main/java/me/zhengjie/modules/system/service/ReportService.java
View file @
f058c2db
...
...
@@ -188,7 +188,7 @@ public class ReportService {
ReportPdfVo
reportPdfVo
=
reportPdfMapper
.
selectOne
(
new
QueryWrapper
<
ReportPdfVo
>()
.
lambda
().
eq
(
ReportPdfVo:
:
getReportNum
,
detailsReqVo
.
getReportNum
()));
//如果已经下载保存过PDF了则删除旧的pdf
//如果已经下载保存过PDF了则删除旧的pdf
再去抓取新的pdf
if
(
reportPdfVo
!=
null
&&
StrUtil
.
isNotBlank
(
reportPdfVo
.
getPath
())){
FileUtil
.
del
(
reportPdfVo
.
getPath
());
}
...
...
@@ -233,12 +233,12 @@ public class ReportService {
AssertUtil
.
isNotNull
(
deptVo
,
"列表获取失败,未找到当前账号所属部门"
);
IPage
<
TestReportVo
>
page
=
new
Page
<>(
pageQueryVo
.
getCurrNo
(),
pageQueryVo
.
getSize
());
/*
try {
try
{
page
=
carReportUtil
.
reportPageList
(
deptVo
.
getEpAccount
(),
deptVo
.
getEpPassword
(),
pageQueryVo
);
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
}
*/
page
.
setTotal
(
1
).
setRecords
(
reportVoList
);
}
/*page.setTotal(1).setRecords(reportVoList);*/
return
page
;
}
...
...
car-reptiles-system/src/main/java/me/zhengjie/modules/system/util/CarReportUtil.java
View file @
f058c2db
...
...
@@ -478,4 +478,49 @@ public class CarReportUtil {
return
null
;
}
/**
* 获取检测报告
* @param username 环保系统登录账号
* @param password 环保系统登录密码
* @param reportPageQueryVo 分页条件vo
* @return
* @throws InterruptedException
*/
public
IPage
<
TestReportVo
>
reportPageList
(
String
username
,
String
password
,
ReportPageQueryVo
reportPageQueryVo
)
throws
InterruptedException
{
//登录环保检测系统
WebDriver
driver
=
loginEp
(
username
,
password
,
null
);
WebElement
inspecReportBtn
=
driver
.
findElement
(
new
By
.
ById
(
"mainMenuTree_3_a"
));
AssertUtil
.
isNotNull
(
inspecReportBtn
,
"抓取报告单菜单失败"
);
String
[]
reportA
=
inspecReportBtn
.
getAttribute
(
"onclick"
).
split
(
"/"
);
//抓取当前登录用户的站点名称
WebElement
stationSpan
=
driver
.
findElement
(
new
By
.
ById
(
"orgName"
));
AssertUtil
.
isNotBlank
(
stationSpan
.
getText
(),
"获取不到当前用户的站点名称"
);
Object
[]
cookies
=
driver
.
manage
().
getCookies
().
toArray
();
//获取所有站点信息
String
stationJsonStr
=
HttpUtil
.
createGet
(
getStationUrl
+
System
.
currentTimeMillis
())
.
header
(
"Cookie"
,
cookies
[
0
].
toString
()
+
";"
+
cookies
[
1
].
toString
()
+
";"
+
cookies
[
2
].
toString
()).
execute
().
body
();
AssertUtil
.
isNotBlank
(
stationJsonStr
,
"获取不到所有站点信息"
);
JSONArray
stationList
=
JSONUtil
.
parseArray
(
stationJsonStr
);
String
stationCode
=
""
;
for
(
Object
station:
stationList
){
JSONObject
stat
=
(
JSONObject
)
station
;
if
(
stat
.
getStr
(
"Name"
).
equals
(
stationSpan
.
getText
())){
stationCode
=
stat
.
getStr
(
"Code"
);
}
}
AssertUtil
.
isNotBlank
(
stationCode
,
"获取不到当前用户的站点编码"
);
IPage
<
TestReportVo
>
testReportVoIPage
=
postReportList
(
stationCode
,
cookies
,
reportPageQueryVo
);
testReportVoIPage
.
getRecords
().
forEach
(
testReportVo
->
{
testReportVo
.
setSiteName
(
stationSpan
.
getText
()
);
});
//获取
return
testReportVoIPage
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment