修改物联报表接口

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

@@ -490,7 +490,8 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
                          @Param("indicator") List<String> indicator);
     Map<String, Object> selectWeekSummarize(@Param("systemId") String systemId,
                                             @Param("startDate") String startDate,
-                                            @Param("endDate") String endDate);
+                                            @Param("endDate") String endDate,
+                                            @Param("indicator") List<String> indicator);
 
     List<Map<String, Object>> selectWeekEquipEchart(@Param("systemCode") String systemCode,
                                                     @Param("startDate") String startDate,
@@ -508,14 +509,14 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     Map<String, Object> selectDaySummarize(@Param("systemId") String systemId,
                                             @Param("startDate") String startDate,
-                                            @Param("endDate") String endDate);
+                                            @Param("endDate") String endDate,
+                                           @Param("indicator") List<String> indicator);
 
     List<Map<String, Object>> selectDayEquipEchart(@Param("systemCode") String systemCode,
                                                     @Param("startDate") String startDate,
                                                     @Param("endDate") String endDate);
 
-    List<Map<String, Object>> selectDayEchart(@Param("systemCode") String systemCode,
-                                                   @Param("startDate") String startDate,
-                                                   @Param("endDate") String endDate,
+    List<Map<String, Object>> selectDayEchart(@Param("systemId") String systemId,
+                                                   @Param("date") String date,
                                               @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

@@ -1716,15 +1716,43 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     }
 
                     // 总结
-                    Map<String, Object> summarize = fireFightingSystemMapper.selectWeekSummarize(valueOf(system.get("id")), startDate, endDate);
-                    if (!ObjectUtils.isEmpty(summarize.get("contant"))) {
-                        systemData.put("summarize", String.valueOf(summarize.get("contant")));
-                    } else {
-                        systemData.put("summarize", "");
-                    }
+                    Map<String, Object> summarize = fireFightingSystemMapper.selectWeekSummarize(valueOf(system.get("id")), startDate, endDate, indicatorList);
+//                    if (!ObjectUtils.isEmpty(summarize.get("contant"))) {
+//                        systemData.put("summarize", String.valueOf(summarize.get("contant")));
+//                    } else {
+//                        systemData.put("summarize", "");
+//                    }
+                    systemData.put("summarize", ObjectUtils.isEmpty(summarize.get("name"))?0:summarize.get("name")
+                            +"设备总数"+(ObjectUtils.isEmpty(summarize.get("equipNum"))?0:summarize.get("equipNum"))
+                            +"台，正常设备"+(ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"))
+                            +"台，正常率"+(ObjectUtils.isEmpty(summarize.get("normalRate"))?0:summarize.get("normalRate"))
+                            +"%，故障设备"+(ObjectUtils.isEmpty(summarize.get("faultNum"))?0:summarize.get("faultNum"))
+                            +"台，故障率为"+(ObjectUtils.isEmpty(summarize.get("faultRate"))?0:summarize.get("faultRate"))
+                            +"%，七日告警设备为"+(ObjectUtils.isEmpty(summarize.get("exepctionNum"))?0:summarize.get("exepctionNum"))
+                            +"台，同比上周"+(ObjectUtils.isEmpty(summarize.get("status1"))?"增加":summarize.get("status1"))+(ObjectUtils.isEmpty(summarize.get("exepctionWOW"))?0:summarize.get("exepctionWOW"))
+                            +"%，七日告警总数为"+(ObjectUtils.isEmpty(summarize.get("alarmNum"))?0:summarize.get("alarmNum"))
+                            +"条，同比上周"+(ObjectUtils.isEmpty(summarize.get("status2"))?"增加":summarize.get("status2"))+(ObjectUtils.isEmpty(summarize.get("alarmWOW"))?0:summarize.get("alarmWOW"))
+                            +"%。"
+                    );
+
 
                     // echarts 图表
-                    List<Map<String, Object>> mapList = fireFightingSystemMapper.selectWeekEquipEchart(valueOf(system.get("code")), startDate, endDate, indicatorList);
+                    //List<Map<String, Object>> mapList = fireFightingSystemMapper.selectWeekEquipEchart(valueOf(system.get("code")), startDate, endDate, indicatorList);
+
+                    ArrayList<Map<String, Object>> mapList = new ArrayList<>();
+                    HashMap<String, Object> dayEchartsDate = new HashMap<>();
+                    dayEchartsDate.put("type","正常设备");
+                    dayEchartsDate.put("value",ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"));
+                    mapList.add(dayEchartsDate);
+                    HashMap<String, Object> dayEchartsDate1 = new HashMap<>();
+                    dayEchartsDate1.put("type","异常设备");
+                    if (!ObjectUtils.isEmpty(summarize.get("equipNum")) || !ObjectUtils.isEmpty(summarize.get("normalNum"))){
+                        dayEchartsDate1.put("value",Integer.parseInt(String.valueOf(summarize.get("equipNum")))
+                                -Integer.parseInt(String.valueOf(summarize.get("normalNum"))));
+                    }else {
+                        dayEchartsDate1.put("value",0);
+                    }
+                    mapList.add(dayEchartsDate1);
                     String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比");
                     systemData.put("pictureLeft", pieChart1);
 
@@ -1859,19 +1887,37 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     }
 
                     // 总结
-                    Map<String, Object> summarize = fireFightingSystemMapper.selectDaySummarize(valueOf(system.get("id")), startDate, endDate);
-                    if (!ObjectUtils.isEmpty(summarize.get("contant"))) {
-                        systemData.put("summarize", String.valueOf(summarize.get("contant")));
-                    } else {
-                        systemData.put("summarize", "");
-                    }
+                    Map<String, Object> summarize = fireFightingSystemMapper.selectDaySummarize(valueOf(system.get("id")), startDate, endDate, indicatorList);
+//                    if (!ObjectUtils.isEmpty(summarize.get("contant"))) {
+//                        systemData.put("summarize", String.valueOf(summarize.get("contant")));
+//                    } else {
+//                        systemData.put("summarize", "");
+//                    }
+                    systemData.put("summarize", ObjectUtils.isEmpty(summarize.get("name"))?0:summarize.get("name")+"设备总数"+(ObjectUtils.isEmpty(summarize.get("equipNum"))?0:summarize.get("equipNum"))
+                    +"台，今日告警设备为"+(ObjectUtils.isEmpty(summarize.get("dayNum"))?0:summarize.get("dayNum"))+"台，告警总数为"+(ObjectUtils.isEmpty(summarize.get("alarmNum"))?0:summarize.get("alarmNum"))+
+                            "条，正常设备"+(ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"))+"台，正常率"+(ObjectUtils.isEmpty(summarize.get("normalRate"))?0:summarize.get("normalRate"))+"%");
 
                     // 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>> dayEchart = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("code")), startDate, endDate, indicatorList);
+                   // List<Map<String, Object>> dayEcharts = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("id")), startDate, indicatorList);
+                    ArrayList<Map<String, Object>> dayEchart = new ArrayList<>();
+                    HashMap<String, Object> dayEchartsDate = new HashMap<>();
+                    dayEchartsDate.put("type","正常设备");
+                    dayEchartsDate.put("value",ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"));
+                    dayEchart.add(dayEchartsDate);
+                    HashMap<String, Object> dayEchartsDate1 = new HashMap<>();
+                    dayEchartsDate1.put("type","异常设备");
+                    if (!ObjectUtils.isEmpty(summarize.get("equipNum")) || !ObjectUtils.isEmpty(summarize.get("normalNum"))){
+                        dayEchartsDate1.put("value",Integer.parseInt(String.valueOf(summarize.get("equipNum")))
+                                -Integer.parseInt(String.valueOf(summarize.get("normalNum"))));
+                    }else {
+                        dayEchartsDate1.put("value",0);
+                    }
+
+                    dayEchart.add(dayEchartsDate1);
                     String pieChart2 = ChartsUtils.pieChart(dayEchart, "告警信息占比");
                     systemData.put("pictureRight", pieChart2);