Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
f2c275b5
Commit
f2c275b5
authored
Oct 25, 2023
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改
parent
c052b9b1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
BigScreenAnalyseController.java
...dule/jxiop/biz/controller/BigScreenAnalyseController.java
+2
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java
View file @
f2c275b5
...
...
@@ -504,6 +504,7 @@ public class BigScreenAnalyseController extends BaseController {
String
warningName
=
equipmentHealthIndexMap
.
getOrDefault
(
item
.
get
(
"pointName"
),
"安全"
);
int
sort
=
4
;
item
.
put
(
"warningName"
,
warningName
);
item
.
put
(
"status"
,
warningName
);
if
(
"注意"
.
equals
(
warningName
))
{
sort
=
1
;
}
else
if
(
"警告"
.
equals
(
warningName
))
{
...
...
@@ -604,7 +605,6 @@ public class BigScreenAnalyseController extends BaseController {
pointNameList
.
forEach
(
item
->
{
String
equipmentHealthScore
=
equipmentHealthIndexMap
.
getOrDefault
(
item
.
get
(
"pointName"
),
"安全"
);
int
sort
=
4
;
item
.
put
(
"warningName"
,
equipmentHealthScore
);
if
(
"注意"
.
equals
(
equipmentHealthScore
))
{
sort
=
1
;
}
else
if
(
"警告"
.
equals
(
equipmentHealthScore
))
{
...
...
@@ -614,6 +614,7 @@ public class BigScreenAnalyseController extends BaseController {
}
item
.
put
(
"sort"
,
sort
);
item
.
put
(
"warningName"
,
equipmentHealthScore
);
item
.
put
(
"status"
,
equipmentHealthScore
);
});
pointNameList
.
sort
(
Comparator
.
comparing
(
o
->
o
.
get
(
"sort"
).
toString
()));
Page
<
Map
<
String
,
Object
>>
mapPage
=
new
Page
<>();
...
...
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