Commit 2cf9eb8e authored by KeYong's avatar KeYong

Merge branch 'develop_station' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station

parents 16e5c53c 03d53167
...@@ -166,95 +166,91 @@ ...@@ -166,95 +166,91 @@
</select> </select>
<select id="page" resultType="java.util.HashMap"> <select id="page" resultType="java.util.HashMap">
SELECT SELECT
d.* wlesal.id,
FROM wlesal.org_code,
( wlesal.equipment_specific_id AS fireEquipmentId,
SELECT wles.equipment_detail_id AS equipDetailId,
wlesal.id, wles.code AS fireEquipmentCode,
wlesal.org_code, wles.system_id AS systemId,
wlesal.equipment_specific_id AS fireEquipmentId, if(wles.code is null,wlesal.equipment_specific_name,concat(wlesal.equipment_specific_name,'(',wles.code,')')) as
wles.equipment_detail_id AS equipDetailId, fireEquipmentName,
wles.code AS fireEquipmentCode, concat(wlesal.equipment_specific_name,wlesal.equipment_specific_index_name) as alamContent,
wles.system_id AS systemId, if(wlesal.confirm_type is null,'未处理','已处理') handleStatus,
if(wles.code is null,wlesal.equipment_specific_name,concat(wlesal.equipment_specific_name,'(',wles.code,')')) as IF (
fireEquipmentName, wlesal.clean_time IS NOT NULL,
concat(wlesal.equipment_specific_name,wlesal.equipment_specific_index_name) as alamContent, '已消除',
if(confirm_type is null,'未处理','已处理') handleStatus, '未消除'
IF ( ) cleanStatus,
wlesal.clean_time IS NOT NULL, confirm_type as handleType,
'已消除', wlesal.equipment_index_id AS fireEquipmentIndexId,
'未消除' wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
) cleanStatus, wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
confirm_type as handleType, wles.warehouse_structure_id AS buildId,
wlesal.equipment_index_id AS fireEquipmentIndexId, we.img AS imgUrl,
wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey, CASE
wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName, wlesal.equipment_specific_index_value
wles.warehouse_structure_id AS buildId, WHEN 'true' THEN '是'
we.img AS imgUrl, WHEN 'false' THEN '否'
CASE ELSE wlesal.equipment_specific_index_value END
wlesal.equipment_specific_index_value AS fireEquipmentPointValue,
WHEN 'true' THEN '是' wlesal.type AS typeCode,
WHEN 'false' THEN '否' (select type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as type,
ELSE wlesal.equipment_specific_index_value END wlesal.create_date AS createDate,
AS fireEquipmentPointValue, CONCAT_WS(' ', wles.position,wled.area) AS warehouseStructureName, /*告警列表拼接详细地址*/
wlesal.type AS typeCode, (select
(select type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as type, group_concat(fet.`name`)
wlesal.create_date AS createDate, from f_equipment_fire_equipment as fefe
CONCAT_WS(' ', wles.position,wled.area) AS warehouseStructureName, /*告警列表拼接详细地址*/ left join f_equipment as fet on fet.id = fefe.equipment_id
(select where fefe.fire_equipment_id = wlesal.equipment_specific_id
group_concat(fet.`name`) ) as equipmentName,
from f_equipment_fire_equipment as fefe wlesal.equipment_specific_name as equipmentSpecificName,
left join f_equipment as fet on fet.id = fefe.equipment_id wles.position
where fefe.fire_equipment_id = wlesal.equipment_specific_id
) as equipmentName,
wlesal.equipment_specific_name as equipmentSpecificName,
wles.position
FROM wl_equipment_specific_alarm_log wlesal FROM wl_equipment_specific_alarm_log wlesal
LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id LEFT JOIN wl_equipment_specific wles ON wlesal.equipment_specific_id = wles.id
LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.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 LEFT JOIN wl_equipment we ON wled.equipment_id = we.id
) d
<where> <where>
<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''"> <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
d.warehouseStructureName like CONCAT_WS(' ', wles.position,wled.area) like
concat(concat("%",#{param.warehouseStructureName}),"%") concat(concat("%",#{param.warehouseStructureName}),"%")
</if> </if>
<if test="param.equipCode != null and param.equipCode != ''">AND d.fireEquipmentCode like <if test="param.equipCode != null and param.equipCode != ''">AND wles.code like
concat(concat("%",#{param.equipCode}),"%") concat(concat("%",#{param.equipCode}),"%")
</if> </if>
<if test="param.beginDate!=null">AND d.createDate <![CDATA[>=]]> #{param.beginDate}</if> <if test="param.beginDate!=null">AND wlesal.create_date <![CDATA[>=]]> #{param.beginDate}</if>
<if test="param.endDate!=null">AND d.createDate <![CDATA[<=]]> #{param.endDate}</if> <if test="param.endDate!=null">AND wlesal.create_date <![CDATA[<=]]> #{param.endDate}</if>
<if test="param.alarmType == 'BREAKDOWN'">AND d.typeCode = #{param.alarmType}</if> <if test="param.alarmType == 'BREAKDOWN'">AND wlesal.type = #{param.alarmType}</if>
<if test="param.alarmType == 'FIREALARM'">AND d.typeCode = #{param.alarmType}</if> <if test="param.alarmType == 'FIREALARM'">AND wlesal.type = #{param.alarmType}</if>
<if test="param.orgCode != null and param.orgCode != ''">AND d.org_code = #{param.orgCode}</if> <if test="param.orgCode != null and param.orgCode != ''">AND wlesal.org_code = #{param.orgCode}</if>
<if test="param.type != null and param.type != ''">AND d.typeCode = #{param.type}</if> <if test="param.type != null and param.type != ''">AND wlesal.type = #{param.type}</if>
<if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 1">AND <if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 1">AND
d.handleStatus = '已处理' wlesal.confirm_type IS NOT NULL
</if> </if>
<if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 2">AND <if test="param.handleStatus != null and param.handleStatus != '' and param.handleStatus == 2">AND
d.handleStatus = '未处理' wlesal.confirm_type IS NULL
</if> </if>
<if test="param.system != null and param.system != ''"> <if test="param.system != null and param.system != ''">
AND find_in_set(#{param.system},d.systemId) AND find_in_set(#{param.system},wles.system_id)
</if> </if>
<if test="param.buildIds!=null"> <if test="param.buildIds!=null">
AND d.buildId IN AND wlesal.build_id IN
<foreach item="item" collection="param.buildIds" separator="," <foreach item="item" collection="param.buildIds" separator=","
open="(" close=")" index="">#{item} open="(" close=")" index="">#{item}
</foreach> </foreach>
</if> </if>
<if test="param.id!=null and param.id!=''">AND d.fireEquipmentId = #{param.id}</if> <if test="param.id!=null and param.id!=''">AND wlesal.equipment_specific_id = #{param.id}</if>
<if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND
d.cleanStatus = '已消除' wlesal.clean_time IS NOT NULL
</if> </if>
<if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
d.cleanStatus = '未消除' wlesal.clean_time IS NULL
</if> </if>
<if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND <if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
d.typeCode != 'SHIELD' wlesal.type != 'SHIELD'
</if> </if>
</where> </where>
ORDER BY d.createDate DESC ORDER BY wlesal.create_date DESC
</select> </select>
<select id="pageAlarmsInfo" resultType="Map"> <select id="pageAlarmsInfo" resultType="Map">
SELECT SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment