8750 8747 8746 8742 8741 8740

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

@@ -347,6 +347,7 @@
             wl_equipment_specific_alarm_log wlesal
             LEFT JOIN wl_equipment we ON wlesal.equipment_code = we.code
             LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id
+            LEFT JOIN wl_equipment_specific wls ON wls.id = wlesal.equipment_specific_id
         <where>
         	<if test="param.bizOrgCode != null and param.bizOrgCode != ''">AND
                 wls.biz_org_code like  concat (#{param.bizOrgCode},'%')

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

@@ -2540,15 +2540,16 @@
     <select id="getPressurePumpInfo" resultType="java.util.Map">
         SELECT
             ed.`name`,
-            ed.area,
+            CONCAT( ws.`name`, ed.area ) area,
             es.iot_code,
             es.id
         FROM
             wl_equipment_detail ed
                 LEFT JOIN wl_equipment_specific es ON es.equipment_detail_id = ed.id
+                LEFT JOIN wl_warehouse_structure ws ON ws.id = es.warehouse_structure_id
         WHERE
             ed.`code` LIKE '92010800%'
-          AND biz_org_code like concat(#{bizOrgCode}, '%')
+          AND es.biz_org_code like concat(#{bizOrgCode}, '%')
     </select>
 
     <select id="queryPressureNowStateBySpecificId" resultType="java.util.Map">
@@ -2558,9 +2559,7 @@
         FROM
             wl_equipment_specific_index i
         WHERE
-                i.equipment_index_key IN ( 'FHS_PressurePump_Start', 'FHS_PressurePump_Stop' )
-          AND i.equipment_specific_id = #{id,jdbcType=VARCHAR}
-          and i.`value` = 'true'
+            i.equipment_specific_id = #{id,jdbcType=VARCHAR}
         ORDER BY
             i.update_date DESC
             LIMIT 1