修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/quartz/AnalysisReportSchedulerJob.java

@@ -45,7 +45,7 @@ public class AnalysisReportSchedulerJob {
     /**
      * 每月第1天凌晨0-月报生成
      */
-    @Scheduled(cron="0 0 0 1 * ?")
+    @Scheduled(cron="${jobs.month.cron}")
     public void monthReport() throws ParseException {
         Date yestDay = DateUtils.dateAdd(new Date(),-1,false);
         Date beginDate = DateUtils.getFirstDayOfMonth(yestDay);

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

@@ -1589,7 +1589,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     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<>();
@@ -1753,8 +1753,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                                 listItem.put("trueNum", String.valueOf(0));
                             }
                             list.add(listItem);
-
-
                         }
                     } else {
                         HashMap<String, Object> listItem = new HashMap<>();
@@ -1808,11 +1806,11 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                         dayEchartsDate1.put("value",0);
                     }
                     mapList.add(dayEchartsDate1);
-                    String pieChart1 = ChartsUtils.pieChart(mapList, "故障设备类型占比");
+                    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, indicatorList);
@@ -1979,7 +1977,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                             "条，正常设备"+(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);
+                    List<Map<String, Object>> mapList = fireFightingSystemMapper.selectDayEquipEchart(valueOf(system.get("code")), startDate, endDate);
                     String pieChart1 = ChartsUtils.pieChart(alarmMapList, "故障设备类型占比");
 
                    // List<Map<String, Object>> dayEcharts = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("id")), startDate, indicatorList);

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -1323,7 +1323,7 @@
 			LEFT JOIN wl_equipment e ON e.id = ed.equipment_id
 
 		WHERE
-			e.is_iot = 1  and  es.biz_org_code = #{bizOrgCode}
+			e.is_iot = 1  and  es.biz_org_code like concat(#{bizOrgCode},'%')
          )AS total,
         (
         SELECT COUNT(DISTINCT(esa.iot_code))  FROM wl_equipment_specific_alarm esa

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -3852,7 +3852,7 @@
         FROM `f_fire_fighting_system` ffs
 				LEFT JOIN wl_equipment_category wec
 				on ffs.system_type = wec.id
-        WHERE biz_org_code = #{bizOrgCode}
+        WHERE biz_org_code like concat(#{bizOrgCode},'%')
         order by ffs.sort
     </select>
     <select id="selectAlarmList" resultType="java.util.Map">
@@ -4063,14 +4063,7 @@
 
             ) temp
             LEFT JOIN
-
-
-
-
             (
-
-
-
         SELECT temp.*,
         CASE
         WHEN wei.is_trend = 0 then "遥信"
@@ -4103,7 +4096,7 @@
 				wl_equipment_alarm_equip_day e
 			WHERE
 				e.system_id is not null
-        and e.system_id = #{systemId}
+        and  FIND_IN_SET( #{systemId},e.system_id)
           AND e.equipment_code = spec.equipment_code
           AND e.index_key = spec_index.equipment_index_key
           AND e.report_date >= DATE_FORMAT(#{startDate},'%y-%m-%d')
@@ -4123,7 +4116,7 @@
         )temp LEFT JOIN wl_equipment_index wei on temp.equipment_index_id = wei.id
 
         )temp1  on  temp.system_id = temp1.systemId and temp.code = temp1.code
-
+        group by type_code
        ORDER BY temp.name
     </select>
     <select id="selectAlarms" resultType="java.lang.Integer">