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
53910120
Commit
53910120
authored
Aug 09, 2022
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
2f5ba888
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
FireFightingSystemMapper.java
.../yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
+1
-1
FireFightingSystemServiceImpl.java
...uipmanage/service/impl/FireFightingSystemServiceImpl.java
+4
-4
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java
View file @
53910120
...
@@ -307,7 +307,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
...
@@ -307,7 +307,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
*
*
* @return
* @return
*/
*/
Map
<
String
,
Object
>
getFireSystemInfo
(
HashMap
<
String
,
Object
>
hashMap
);
List
<
Map
<
String
,
Object
>
>
getFireSystemInfo
(
HashMap
<
String
,
Object
>
hashMap
);
/**
/**
* 获取系统近一月告警设备top5
* 获取系统近一月告警设备top5
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @
53910120
...
@@ -1267,10 +1267,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
...
@@ -1267,10 +1267,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
@Override
public
Map
<
String
,
Object
>
getSystemStatus
(
HashMap
<
String
,
Object
>
hashMap
)
{
public
Map
<
String
,
Object
>
getSystemStatus
(
HashMap
<
String
,
Object
>
hashMap
)
{
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
fireFightingSystemMapper
.
getFireSystemInfo
(
hashMap
);
List
<
Map
<
String
,
Object
>
>
map
=
fireFightingSystemMapper
.
getFireSystemInfo
(
hashMap
);
if
(!
map
.
isEmpty
())
{
if
(!
map
.
isEmpty
())
{
ArrayList
<
Object
>
status
=
new
ArrayList
<>();
ArrayList
<
Object
>
status
=
new
ArrayList
<>();
status
.
add
(
map
.
get
(
"status"
));
status
.
add
(
map
.
get
(
0
).
get
(
"status"
));
resultMap
.
put
(
"values"
,
status
);
resultMap
.
put
(
"values"
,
status
);
resultMap
.
put
(
"labels"
,
status
);
resultMap
.
put
(
"labels"
,
status
);
}
}
...
@@ -1280,9 +1280,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
...
@@ -1280,9 +1280,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
@Override
public
Map
<
String
,
Object
>
getSystemName
(
HashMap
<
String
,
Object
>
hashMap
)
{
public
Map
<
String
,
Object
>
getSystemName
(
HashMap
<
String
,
Object
>
hashMap
)
{
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
fireFightingSystemMapper
.
getFireSystemInfo
(
hashMap
);
List
<
Map
<
String
,
Object
>
>
map
=
fireFightingSystemMapper
.
getFireSystemInfo
(
hashMap
);
if
(!
map
.
isEmpty
())
{
if
(!
map
.
isEmpty
())
{
resultMap
.
put
(
"name"
,
map
.
get
(
"name"
));
resultMap
.
put
(
"name"
,
map
.
get
(
0
).
get
(
"name"
));
}
}
return
resultMap
;
return
resultMap
;
}
}
...
...
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