bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java

@@ -244,6 +244,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                         @RequestParam(value = "equipmentCode", required = false) String equipmentCode,
                                         @RequestParam(value = "indexTypeCode", required = false) String indexTypeCode,
                                         @RequestParam(value = "specificIndexKey", required = false) String specificIndexKey,
+                                        @RequestParam(value = "alarmLogId", required = false) String alarmLogId,
                                         CommonPageable commonPageable) {
         List<CommonRequest> queryRequests = new ArrayList<>();
         ReginParams reginParams = getSelectedOrgInfo();
@@ -272,6 +273,12 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request4.setName("alarmType");
         request4.setValue(StringUtil.isNotEmpty(alarmType) ? StringUtils.trimToNull(alarmType) : null);
         queryRequests.add(request4);
+
+        CommonRequest request5 = new CommonRequest();
+        request5.setName("alarmLogId");
+        request5.setValue(StringUtil.isNotEmpty(alarmLogId) ? StringUtils.trimToNull(alarmLogId) : null);
+        queryRequests.add(request5);
+
         CommonRequest request8 = new CommonRequest();
         request8.setName("systemCode");
         request8.setValue(StringUtil.isNotEmpty(systemCode) ? StringUtils.trimToNull(systemCode) : null);

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

@@ -260,6 +260,7 @@
     <select id="pageQuery" resultType="java.util.HashMap">
         SELECT
             `wlesal`.`equipment_specific_alarm_id` AS `id`,
+            `wlesal`.id as alarmLogId,
             `wles`.`code` AS `code`,
             `wlesal`.`equipment_specific_name` AS `specificName`,
             `wlesal`.`equipment_specific_index_key` AS `indexKey`,
@@ -352,8 +353,11 @@
         	<if test="param.bizOrgCode != null and param.bizOrgCode != ''">AND
                 wls.biz_org_code like  concat (#{param.bizOrgCode},'%')
             </if>
+            <if test="param.alarmLogId != null">AND
+                and wlesal.id = #{alarmLogId}
+            </if>
             <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
-                wlesal.location like concat(concat("%",#{param.warehouseStructureName}),"%")
+                and wlesal.location like concat(concat("%",#{param.warehouseStructureName}),"%")
             </if>
             <if test="param.equipCode != null and param.equipCode != ''">
                 AND wlesal.equipment_specific_code like concat(concat("%",#{param.equipCode}),"%")

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

@@ -2421,8 +2421,7 @@
         LEFT JOIN wl_equipment_specific es ON es.id = rp.level_device_id
         LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
         LEFT JOIN wl_equipment_specific_index ei ON ei.equipment_specific_id = rp.level_device_id
-        LEFT JOIN wl_equipment e ON e.id = ed.equipment_id
-        LEFT JOIN wl_equipment_category ec ON ec.id = e.category_id
+        LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
         LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
         WHERE
         r.resource_type IN ( 'pool', 'industryPool' )