Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into dev_bitmap

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

@@ -185,7 +185,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                 LocalDateTime createDate = (LocalDateTime) x.get("createDate");
                 x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
                 x.put("handleType", ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType"))));
-                x.put("fireEquipmentName", x.get("fireEquipmentName"));
+                // 冗余统一跑马灯显示字段取值
+                x.put("equipmentSpecificIndexName", x.get("fireEquipmentSpecificIndexName"));
             }
         }
         return resultPage;

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

@@ -199,16 +199,17 @@
         AS fireEquipmentPointValue,
         wlesal.type AS type,
         wlesal.create_date AS createDate,
-        wlesal.location AS warehouseStructureName,
+        CONCAT_WS(' ', wles.position,wled.area) AS warehouseStructureName, /*告警列表拼接详细地址*/
         (select
         group_concat(fet.`name`)
         from f_equipment_fire_equipment as fefe
         left join f_equipment as fet on fet.id = fefe.equipment_id
         where fefe.fire_equipment_id = wlesal.equipment_specific_id
-        ) as equipmentName
+        ) as equipmentName,
+        wlesal.equipment_specific_name as equipmentSpecificName,
+        wles.position
         FROM wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
-        left join wl_stock_detail as wsd on wsd.equipment_specific_id = wlesal.equipment_specific_id
         LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id
         LEFT JOIN wl_equipment we ON wled.equipment_id = we.id
         ) d