Merge remote-tracking branch 'origin/develop_station' into develop_station

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/SystemTypeEnum.java

@@ -17,8 +17,8 @@ public enum SystemTypeEnum {
 	fireFoamMistSys("fireFoamMistSys", "细水雾涡扇炮系统"),
 	fireWaterSys("fireWaterSys", "消防给水系统"),
 	otherSys("otherSys", "其他系统"),
-	envMonitoringSys("envMonitoringSys", "环境监测系统");
-
+	envMonitoringSys("envMonitoringSys", "环境监测系统"),
+	fireSpraySys("fireSpraySys","换流变水喷雾系统");
 
     private String code;
 

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

@@ -208,4 +208,39 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      */
     Map<String,Object> fireFoamSysEquipmentNumber();
 
+
+    /**
+     * 换流变水喷雾系统Top5
+     * @return Map<String,Object>
+     *
+     */
+    Map<String,Object> fireSpraySysTop();
+
+    /**
+     * 换流变水喷雾系统设备状态
+     * @return Map<String,Object>
+     *
+     */
+    Map<String,Object> fireSpraySys3Status();
+
+    /**
+     * 换流变水喷雾系统今日设备状态
+     * @return Map<String,Object>
+     *
+     */
+    Map<String,Object> fireSpraySys4Status();
+
+    /**
+     * 换流变水喷雾系统风险趋势
+     * @return Map<String,Object>
+     *
+     */
+    Map<String,Object> fireSpraySysRisk();
+    /**
+     * 换流变水喷雾系统告警信息
+     * @return Map<String,Object>
+     *
+     */
+    Map<String,Object> fireSpraySys4Alarm();
+
 }

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

@@ -828,6 +828,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             this.putAll(data, fireFightingSystemMapper.fireWaterSysWaterPump());
             this.putAll(data, fireFightingSystemMapper.fireWaterSysHydrant());
             this.putAll(data, fireFightingSystemMapper.fireWaterSysPipeNetwork());
+        } else if(SystemTypeEnum.fireSpraySys.getCode().equals(systemCode)){
+            this.putAll(data,fireFightingSystemMapper.fireSpraySysTop());
+            this.putAll(data,fireFightingSystemMapper.fireSpraySys3Status());
+            this.putAll(data,fireFightingSystemMapper.fireSpraySys4Status());
+            this.putAll(data,fireFightingSystemMapper.fireSpraySysRisk());
+            this.putAll(data,fireFightingSystemMapper.fireSpraySys4Alarm());
         } else {
             data = fireFightingSystemMapper.otherSysIndexNumAndTotal();
         }

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

@@ -853,7 +853,27 @@
     <select id="getFireOnlSystem" resultType="Map">
     	select * from v_fire_onl_num
     </select>
-	
+
+    <select id="fireSpraySysTop" resultType="Map">
+        select * from v_fire_equip_alarm_60list_water_top
+    </select>
+
+    <select id="fireSpraySys3Status" resultType="Map">
+        select * from v_fire_equip_alarm_60list_water_status
+    </select>
+
+    <select id="fireSpraySys4Status" resultType="Map">
+        select * from v_fire_equip_alarm_60list_water_4status
+    </select>
+
+    <select id="fireSpraySysRisk" resultType="Map">
+        select * from v_fire_equip_alarm_60list_water_week
+    </select>
+
+    <select id="fireSpraySys4Alarm" resultType="Map">
+        select * from v_fire_equip_alarm_60list_water_stat
+    </select>
+
 	 <select id="getFireCafsSystem" resultType="Map">
     	select * from v_fire_cafs_num
     </select>