完善物联报表

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -480,7 +480,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> selectMonthPolyline(@Param("systemCode") String sysCode, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("indicator") List<String> indicator);
 
-    List<Map<String, Object>> selectWeekReportList(@Param("systemId") String systemId,@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("indicator") List<String> indicator);
+    List<Map<String, Object>> selectWeekReportList(@Param("systemId") String systemId,@Param("startDate") String startDate, @Param("endDate") String endDate);
 
     Integer selectAlarms(@Param("systemId") String systemId,
                          @Param("indexType") String indexType,
@@ -494,7 +494,8 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> selectWeekEquipEchart(@Param("systemCode") String systemCode,
                                                     @Param("startDate") String startDate,
-                                                    @Param("endDate") String endDate);
+                                                    @Param("endDate") String endDate,
+                                                    @Param("indicator") List<String> indicator);
 
     List<Map<String, Object>> selectWeekEchart(@Param("systemCode") String systemCode,
                                                     @Param("startDate") String startDate,
@@ -502,7 +503,8 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> selectWeekLinesEchart(@Param("systemCode") String systemCode,
                                                @Param("startDate") String startDate,
-                                               @Param("endDate") String endDate);
+                                               @Param("endDate") String endDate,
+                                                    @Param("indicator") List<String> indicator);
 
     Map<String, Object> selectDaySummarize(@Param("systemId") String systemId,
                                             @Param("startDate") String startDate,
@@ -514,5 +516,6 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     List<Map<String, Object>> selectDayEchart(@Param("systemCode") String systemCode,
                                                    @Param("startDate") String startDate,
-                                                   @Param("endDate") String endDate);
+                                                   @Param("endDate") String endDate,
+                                              @Param("indicator") List<String> indicator);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -1477,7 +1477,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                 map.put("station", "");
             }
 
-            map.put("time", startDate+"-"+endDate);
+            map.put("time", startDate.substring(0,7));
             // 单个系统数据
             for (Map<String, Object> sys : system) {
                 HashMap<String, Object> systemData = new HashMap<>();
@@ -1553,10 +1553,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     List<Map<String, Object>> selectMonthPolyline = fireFightingSystemMapper.selectMonthPolyline(String.valueOf(sys.get("code")), startDate, endDate,  indicatorList);
 
 
-                    String pieChart = ChartsUtils.pieChart(pieChartList, "设备告警统计");
+                    String pieChart = ChartsUtils.pieChart(pieChartList, "故障设备类型占比");
                     systemData.put("bing1", pieChart);
                     if (!CollectionUtils.isEmpty(pieChartListTwo)) {
-                        String pieChart1 = ChartsUtils.pieChart(pieChartListTwo, "告警类别统计");
+                        String pieChart1 = ChartsUtils.pieChart(pieChartListTwo, "告警信息占比");
                         systemData.put("bing2", pieChart1);
                     } else {
                         List<Map<String, Object>> data = new ArrayList<>();
@@ -1564,13 +1564,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                         dataMap.put("type", "火警");
                         dataMap.put("value", 0);
                         data.add(dataMap);
-                        String pieChart1 = ChartsUtils.pieChart(data, "告警类别统计");
+                        String pieChart1 = ChartsUtils.pieChart(data, "报警趋势");
                         systemData.put("bing2", pieChart1);
                     }
 
 
                     if (!CollectionUtils.isEmpty(selectMonthPolyline)) {
-                        String pieChart2 = ChartsUtils.manyLineChart(selectMonthPolyline, "月告警信息", "日期", "告警数量");
+                        String pieChart2 = ChartsUtils.manyLineChart(selectMonthPolyline, "报警趋势", "日期", "报警数量");
                         systemData.put("bing3", pieChart2);
                     } else {
                         systemData.put("bing3", "");
@@ -1651,7 +1651,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             } else {
                 map.put("station", "");
             }
-            map.put("time", startDate + "-" + endDate);
+            map.put("time", startDate + "至" + endDate);
             // 系统循环数据填充
             ArrayList<Map<String, Object>> dataList = new ArrayList<>();
             for (Map<String, Object> system : systemList) {
@@ -1667,7 +1667,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     String indicator = String.valueOf(collect.get(0).get("index"));
                     String[] split = indicator.split(",");
                     List<String> indicatorList = Arrays.asList(split);
-                    List<Map<String, Object>> weekReportList = fireFightingSystemMapper.selectWeekReportList(String.valueOf(system.get("id")), startDate, endDate, indicatorList);
+                    List<Map<String, Object>> weekReportList = fireFightingSystemMapper.selectWeekReportList(String.valueOf(system.get("id")), startDate, endDate);
                     ArrayList<Map<String, Object>> list = new ArrayList<>();
                     if (!CollectionUtils.isEmpty(weekReportList)) {
                         for (Map<String, Object> weekItem : weekReportList) {
@@ -1722,16 +1722,16 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     }
 
                     // echarts 图表
-                    List<Map<String, Object>> mapList = fireFightingSystemMapper.selectWeekEquipEchart(valueOf(system.get("code")), startDate, endDate);
-                    String pieChart1 = ChartsUtils.pieChart(mapList, "告警类别统计");
+                    List<Map<String, Object>> mapList = fireFightingSystemMapper.selectWeekEquipEchart(valueOf(system.get("code")), startDate, endDate, indicatorList);
+                    String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比");
                     systemData.put("pictureLeft", pieChart1);
 
                     List<Map<String, Object>> weekEchart = fireFightingSystemMapper.selectWeekEchart(valueOf(system.get("code")), startDate, endDate);
-                    String pieChart2 = ChartsUtils.pieChart(weekEchart, "设备告警统计");
+                    String pieChart2 = ChartsUtils.pieChart(weekEchart, "告警信息占比");
                     systemData.put("pictureCenter", pieChart2);
 
-                    List<Map<String, Object>> linesEchart = fireFightingSystemMapper.selectWeekLinesEchart(valueOf(system.get("code")), startDate, endDate);
-                    String lines = ChartsUtils.manyLineChart(linesEchart, "周告警信息", "日期", "告警数量");
+                    List<Map<String, Object>> linesEchart = fireFightingSystemMapper.selectWeekLinesEchart(valueOf(system.get("code")), startDate, endDate, indicatorList);
+                    String lines = ChartsUtils.manyLineChart(linesEchart, "报警趋势", "日期", "报警数量");
                     systemData.put("lines", lines);
 
                     systemData.put("sysData", list);
@@ -1794,7 +1794,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             } else {
                 map.put("station", "");
             }
-            map.put("time", startDate + "-" + endDate);
+            map.put("time", startDate);
             // 系统循环数据填充
             ArrayList<Map<String, Object>> dataList = new ArrayList<>();
             for (Map<String, Object> system : systemList) {
@@ -1810,7 +1810,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     String indicator = String.valueOf(collect.get(0).get("index"));
                     String[] split = indicator.split(",");
                     List<String> indicatorList = Arrays.asList(split);
-                    List<Map<String, Object>> weekReportList = fireFightingSystemMapper.selectWeekReportList(String.valueOf(system.get("id")), startDate, endDate, indicatorList);
+                    List<Map<String, Object>> weekReportList = fireFightingSystemMapper.selectWeekReportList(String.valueOf(system.get("id")), startDate, endDate);
                     ArrayList<Map<String, Object>> list = new ArrayList<>();
                     if (!CollectionUtils.isEmpty(weekReportList)) {
                         for (Map<String, Object> weekItem : weekReportList) {
@@ -1864,11 +1864,11 @@ 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, "设备类别类别统计");
+                    String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比");
                     systemData.put("pictureLeft", pieChart1);
 
-                    List<Map<String, Object>> weekEchart = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("code")), startDate, endDate);
-                    String pieChart2 = ChartsUtils.pieChart(weekEchart, "设备告警统计");
+                    List<Map<String, Object>> dayEchart = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("code")), startDate, endDate, indicatorList);
+                    String pieChart2 = ChartsUtils.pieChart(dayEchart, "告警信息占比");
                     systemData.put("pictureRight", pieChart2);
 
 

amos-boot-system-equip/src/main/resources/ftl/iotDayReport.ftl

@@ -1036,7 +1036,7 @@
                         <w:sz w:val="36"/>
                         <w:sz-cs w:val="36"/>
                     </w:rPr>
-                    <w:t>                                    </w:t>
+                    <w:t>                                                </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -2815,7 +2815,7 @@
                                 <w:sz w:val="24"/>
                                 <w:sz-cs w:val="24"/>
                             </w:rPr>
-                            <w:t>                                                                               </w:t>
+                            <w:t>                                                                                   </w:t>
                         </w:r>
                         <w:r>
                             <w:rPr>

amos-boot-system-equip/src/main/resources/ftl/iotMonthReport.ftl

@@ -2951,7 +2951,7 @@
                                 <w:sz w:val="24"/>
                                 <w:sz-cs w:val="24"/>
                             </w:rPr>
-                            <w:t>                                                                    </w:t>
+                            <w:t>                                                                                   </w:t>
                         </w:r>
                         <w:r>
                             <w:rPr>

amos-boot-system-equip/src/main/resources/ftl/iotWeekReport.ftl

@@ -2877,7 +2877,7 @@
                                 <w:sz w:val="24"/>
                                 <w:sz-cs w:val="24"/>
                             </w:rPr>
-                            <w:t>                                                                               </w:t>
+                            <w:t>                                                                                  </w:t>
                         </w:r>
                         <#--                        <w:r>-->
                         <#--                            <w:rPr>-->

amos-boot-system-equip/src/main/resources/json/systemIndex.json

@@ -8,7 +8,28 @@
   {
 
     "code": "92990000",
+    "index": "OilLeak,Open,Fault"
+
+  }
+,
+  {
+
+    "code": "92110000",
+    "index": "Alarm,Fault,Abnormal,State"
+
+  }
+,
+  {
+
+    "code": "92010000",
     "index": "FireAlarm,Fault,Shield"
 
   }
+,
+  {
+
+    "code": "92030000",
+    "index": "Alarm,Fault,Abnormal"
+
+  }
 ]
\ No newline at end of file