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
4bb6e495
Commit
4bb6e495
authored
Sep 05, 2022
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:物联日报表,添加系统排序,解决bug
parent
f0ba2de8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
FireFightingSystemServiceImpl.java
...uipmanage/service/impl/FireFightingSystemServiceImpl.java
+2
-2
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+1
-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 @
4bb6e495
...
...
@@ -1902,7 +1902,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
// echarts 图表
List
<
Map
<
String
,
Object
>>
mapList
=
fireFightingSystemMapper
.
selectDayEquipEchart
(
valueOf
(
system
.
get
(
"code"
)),
startDate
,
endDate
);
String
pieChart1
=
ChartsUtils
.
pieChart
(
mapList
,
"故障设备类型占比"
);
systemData
.
put
(
"pictureLeft"
,
pieChart1
);
// List<Map<String, Object>> dayEcharts = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("id")), startDate, indicatorList);
ArrayList
<
Map
<
String
,
Object
>>
dayEchart
=
new
ArrayList
<>();
...
...
@@ -1921,7 +1920,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
dayEchart
.
add
(
dayEchartsDate1
);
String
pieChart2
=
ChartsUtils
.
pieChart
(
dayEchart
,
"告警信息占比"
);
systemData
.
put
(
"pictureRight"
,
pieChart2
);
systemData
.
put
(
"pictureRight"
,
pieChart1
);
systemData
.
put
(
"pictureLeft"
,
pieChart2
);
systemData
.
put
(
"sysData"
,
list
);
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
4bb6e495
...
...
@@ -3647,6 +3647,7 @@
LEFT JOIN wl_equipment_category wec
on ffs.system_type = wec.id
WHERE biz_org_code = #{bizOrgCode}
order by ffs.sort
</select>
<select
id=
"selectAlarmList"
resultType=
"java.util.Map"
>
select
...
...
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