Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety-progress
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
耿迪迪
gassafety-progress
Commits
c6426f6e
Commit
c6426f6e
authored
Feb 28, 2022
by
wuqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2022-2-28 吴
parent
17e2926a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
PipeInterfaceController.java
...ong/web/controller/supervise/PipeInterfaceController.java
+3
-3
No files found.
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/PipeInterfaceController.java
View file @
c6426f6e
...
@@ -68,16 +68,16 @@ public class PipeInterfaceController {
...
@@ -68,16 +68,16 @@ public class PipeInterfaceController {
DeviceList
deviceList
=
new
DeviceList
();
DeviceList
deviceList
=
new
DeviceList
();
//调压箱数据循环
//调压箱数据循环
for
(
int
i
=
0
;
i
<
deviceData
.
size
();
i
++){
for
(
int
i
=
0
;
i
<
deviceData
.
size
();
i
++){
//临时存下级数据id
List
<
PressureFlow
>
pressList
=
new
ArrayList
<>();
for
(
int
s
=
0
;
s
<
pressureFlows1
.
size
();
s
++){
for
(
int
s
=
0
;
s
<
pressureFlows1
.
size
();
s
++){
//判断调压箱id与下级数据调压箱id是否相等
//判断调压箱id与下级数据调压箱id是否相等
if
(
pressureFlows1
.
get
(
s
).
getDeviceId
()==
deviceData
.
get
(
i
).
getDeviceId
()){
if
(
pressureFlows1
.
get
(
s
).
getDeviceId
()==
deviceData
.
get
(
i
).
getDeviceId
()){
//临时存下级数据id
List
<
PressureFlow
>
pressList
=
new
ArrayList
<>();
//下级数据添加进临时存储数据的数组中
//下级数据添加进临时存储数据的数组中
pressList
.
add
(
pressureFlows1
.
get
(
s
));
pressList
.
add
(
pressureFlows1
.
get
(
s
));
deviceData
.
get
(
i
).
setPressureFlows
(
pressList
);
}
}
}
}
deviceData
.
get
(
i
).
setPressureFlows
(
pressList
);
deviceData
.
get
(
i
).
setIconType
(
2
);
deviceData
.
get
(
i
).
setIconType
(
2
);
}
}
deviceList
.
setData
(
deviceData
);
deviceList
.
setData
(
deviceData
);
...
...
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