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
f8fec243
Commit
f8fec243
authored
Feb 03, 2023
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
直流中心bug修改
parent
e42c19db
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
FireFightingSystemServiceImpl.java
...uipmanage/service/impl/FireFightingSystemServiceImpl.java
+1
-1
EquipmentSpecificAlarmMapper.xml
...rc/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
+2
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @
f8fec243
...
@@ -2139,7 +2139,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
...
@@ -2139,7 +2139,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
Map
<
String
,
Object
>
tempMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
tempMap
=
new
HashMap
<>();
tempMap
.
put
(
"name"
,
y
.
get
(
"name"
));
tempMap
.
put
(
"name"
,
y
.
get
(
"name"
));
tempMap
.
put
(
"code"
,
y
.
get
(
"code"
));
tempMap
.
put
(
"code"
,
y
.
get
(
"code"
));
tempMap
.
put
(
"total"
,
totalMap
.
get
(
y
.
get
(
"code"
)));
tempMap
.
put
(
"total"
,
Long
.
valueOf
(
totalMap
.
get
(
y
.
get
(
"code"
)).
toString
())-
Long
.
valueOf
(
alarmNumMap
.
get
(
y
.
get
(
"code"
)).
toString
(
)));
tempMap
.
put
(
"alarmNum"
,
alarmNumMap
.
get
(
y
.
get
(
"code"
)));
tempMap
.
put
(
"alarmNum"
,
alarmNumMap
.
get
(
y
.
get
(
"code"
)));
list
.
add
(
tempMap
);
list
.
add
(
tempMap
);
});
});
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @
f8fec243
...
@@ -1525,6 +1525,8 @@
...
@@ -1525,6 +1525,8 @@
idx_biz_station_info fs
idx_biz_station_info fs
LEFT JOIN wl_equipment_specific_alarm wesi ON wesi.station_code = fs.`code`
LEFT JOIN wl_equipment_specific_alarm wesi ON wesi.station_code = fs.`code`
AND wesi.`status` = 1
AND wesi.`status` = 1
WHERE
fs.`online` = 1
GROUP BY
GROUP BY
fs.id,
fs.id,
wesi.equipment_specific_id
wesi.equipment_specific_id
...
...
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