Skip to content

A
amos-boot-biz
Commit f4a9ecae authored by KeYong's avatar KeYong
Browse files
Options

修改bug

parent 2c86bdef
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 207 deletions
amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql
View file @ f4a9ecae
......@@ -7450,100 +7450,93 @@ WHERE
DROP VIEW IF EXISTS `v_fire_equip_alarm_fss_top5_3small`;
CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `v_fire_equip_alarm_fss_top5_3small` AS
SELECT
ifnull(`a`.`fightSysName`, NULL) AS `fightSysName`,
ifnull(`a`.`fightSysCode`, NULL) AS `fightSysCode`,
ifnull(`a`.`fightSysId`, NULL) AS `fightSysId`,
ifnull(`a`.`report_date`, NULL) AS `reportDate`,
a.equipName,
sum(`a`.`total`) AS `total`
FROM
(
SELECT
`rd`.`index_type` AS `indxKey`,
`rd`.`index_name` AS `index_name`,
`rd`.`equipment_specific_name` AS `equipName`,
count(
DISTINCT `rd`.`equipment_specific_id`
) AS `total`,
`rd`.`report_date` AS `report_date`,
`fs`.`name` AS `fightSysName`,
`fs`.`code` AS `fightSysCode`,
`fs`.`id` AS `fightSysId`,
rd.equipment_specific_id AS equipId
FROM
(
`wl_equipment_alarm_report_day` `rd`
LEFT JOIN `f_fire_fighting_system` `fs` ON (
(
0 <> find_in_set(
`fs`.`id`,
`rd`.`system_ids`
)
)
)
)
WHERE
(
(
(curdate() - INTERVAL 30 DAY) <= cast(`rd`.`report_date` AS date)
)
AND (
-- 此处需要更改为换流变的系统code
`fs`.`code` = '011023306003010000000129'
)
AND (
(
`rd`.`index_type` LIKE '%Fault'
)
OR (
`rd`.`index_type` LIKE '%FireAlarm'
)
OR (
`rd`.`index_type` LIKE '%Shield'
)
)
AND (`rd`.`value` = 'true')
)
GROUP BY
`rd`.`equipment_specific_id`,
`rd`.`report_date`
) `a`
GROUP BY a.equipId
ORDER BY total DESC
LIMIT 5;
ifnull( `a`.`fightSysName`, NULL ) AS `fightSysName`,
ifnull( `a`.`fightSysCode`, NULL ) AS `fightSysCode`,
ifnull( `a`.`fightSysId`, NULL ) AS `fightSysId`,
ifnull( `a`.`report_date`, NULL ) AS `reportDate`,
`a`.`equipName` AS `equipName`,
sum( `a`.`total` ) AS `total`
FROM
(
SELECT
`rd`.`index_type` AS `indxKey`,
`rd`.`index_name` AS `index_name`,
`we`.`name` AS `equipName`,
count( DISTINCT `rd`.`equipment_specific_id` ) AS `total`,
`rd`.`report_date` AS `report_date`,
`fs`.`name` AS `fightSysName`,
`fs`.`code` AS `fightSysCode`,
`fs`.`id` AS `fightSysId`,
`rd`.`equipment_id` AS `equipId`
FROM
((
`wl_equipment_alarm_report_day` `rd`
LEFT JOIN `f_fire_fighting_system` `fs` ON ((
0 <> find_in_set( `fs`.`id`, `rd`.`system_ids` ))))
LEFT JOIN `wl_equipment` `we` ON ((
`we`.`id` = `rd`.`equipment_id`
)))
WHERE
(((
curdate() - INTERVAL 30 DAY
) <= cast( `rd`.`report_date` AS date ))
AND ( `fs`.`code` = '011023306003010000000129' )
AND ((
`rd`.`index_type` LIKE '%Fault'
)
OR ( `rd`.`index_type` LIKE '%FireAlarm' )
OR ( `rd`.`index_type` LIKE '%Shield' )))
GROUP BY
`rd`.`equipment_specific_id`,
`rd`.`report_date`
) `a`
GROUP BY
`a`.`equipId`
ORDER BY
`total` DESC
LIMIT 5;
-- 换流变水喷雾系统3小设备状态统计视图
DROP VIEW IF EXISTS `v_fire_equip_alarm_fss_3small`;
CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `v_fire_equip_alarm_fss_3small` AS
SELECT
b.id AS `id`,
b.equipName,
( CASE WHEN b.totalNum > 0 THEN '异常' ELSE '正常' END ) `status`,
b.totalNum AS totalNum
FROM
(
SELECT
wesl.id AS `id`,
a.equipName,
count( wesl.id ) AS totalNum
`b`.`speId` AS `id`,
`b`.`equipName` AS `equipName`,(
CASE
WHEN ( `b`.`totalNum` > 0 ) THEN
'异常' ELSE '正常'
END
) AS `status`,
`b`.`totalNum` AS `totalNum`
FROM
(
SELECT
wes.`name` AS equipName,
wed.equipment_id AS equipmentId
`a`.`speId` AS `speId`,
`a`.`equipName` AS `equipName`,
count(wesl.equipment_specific_id) as totalNum
FROM
wl_equipment_specific wes
LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
WHERE
--此处需要更改为水喷雾系统id
FIND_IN_SET( '1619086103649', wes.system_id ) > 0
GROUP BY
wed.equipment_id
) a
LEFT JOIN wl_equipment_specific_alarm_log wesl ON wesl.equipment_id = a.equipmentId
GROUP BY
a.equipmentId
) b;
(
SELECT
`wes`.`id` AS `speId`,
`wed`.`equipment_name` AS `equipName`,
`wed`.`equipment_id` AS `equipmentId`
FROM
(
`wl_equipment_specific` `wes`
LEFT JOIN `wl_equipment_detail` `wed` ON ((
`wed`.`id` = `wes`.`equipment_detail_id`
)))
WHERE
( find_in_set( '1657264678908', `wes`.`system_id` ) > 0 )
GROUP BY
`wed`.`equipment_id`
) `a`
LEFT JOIN `wl_equipment_specific_alarm_log` `wesl` ON `wesl`.`equipment_specific_id` = `a`.`speId`
GROUP BY
`a`.`equipmentId`
) b
ORDER BY
`b`.`totalNum` DESC;
-- 换流变水喷雾系统4小设备状态统计视图
DROP VIEW IF EXISTS `v_fire_equip_status_fss`;
......@@ -7674,8 +7667,7 @@ FROM
`rd`.`index_type` LIKE '%Fault'
)
OR ( `rd`.`index_type` LIKE '%FireAlarm' )
OR ( `rd`.`index_type` LIKE '%Shield' ))
AND ( `rd`.`value` = 'true' ))
OR ( `rd`.`index_type` LIKE '%Shield' )))
GROUP BY
`rd`.`equipment_specific_id`,
`rd`.`report_date`,
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @ f4a9ecae
......@@ -255,129 +255,122 @@
</select>
<select id="pageAlarmsInfo" resultType="Map">
SELECT
d.*
FROM
(
SELECT
wlesal.id AS alarmId,
wlesal.org_code,
wlesal.equipment_specific_id AS fireEquipmentId,
wlesal.equipment_detail_id AS equipDetailId,
wlesal.equipment_specific_code AS fireEquipmentCode,
wlesal.equipment_specific_name AS fireEquipmentName,
concat(
wlesal.equipment_specific_name,
wlesal.equipment_specific_index_name
) AS alamContent,
IF (
wlesal.confirm_type <![CDATA[<>]]> '',
'已处理',
'未处理'
) handleStatus,
IF (
wlesal.clean_time IS NOT NULL,
'已消除',
'未消除'
) cleanStatus,
IF (
wlesal.clean_time IS NOT NULL,
'1',
'2'
) cleanStatusVal,
wlesal.confirm_type AS handleType,
wlesal.system_codes AS systemCodes,
wlesal.equipment_index_id AS fireEquipmentIndexId,
wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
we.img AS imgUrl,
CASE wlesal.equipment_specific_index_value
WHEN 'true' THEN
'是'
WHEN 'false' THEN
'否'
ELSE
wlesal.equipment_specific_index_value
END AS fireEquipmentPointValue,
wlesa.frequency AS frequency,
wlesal.status AS status,
wlesal.type AS type,
(select type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as alarmType,
wlesal.create_date AS createDate,
wlesal.build_id AS buildId,
wlesa.recovery_date AS recoveryDate,
wlesal.location 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,
wlesal.equipment_code AS equipmentCode
wlesal.id AS alarmId,
wlesal.org_code AS orgCode,
wlesal.equipment_specific_id AS fireEquipmentId,
wlesal.equipment_detail_id AS equipDetailId,
wlesal.equipment_specific_code AS fireEquipmentCode,
wlesal.equipment_specific_name AS fireEquipmentName,
concat(
wlesal.equipment_specific_name,
wlesal.equipment_specific_index_name
) AS alamContent,
IF (
wlesal.confirm_type <![CDATA[<>]]> '',
'已处理',
'未处理'
) handleStatus,
IF (
wlesal.clean_time IS NOT NULL,
'已消除',
'未消除'
) cleanStatus,
IF (
wlesal.clean_time IS NOT NULL,
'1',
'2'
) cleanStatusVal,
wlesal.confirm_type AS handleType,
wlesal.system_codes AS systemCodes,
wlesal.equipment_index_id AS fireEquipmentIndexId,
wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
we.img AS imgUrl,
CASE wlesal.equipment_specific_index_value
WHEN 'true' THEN
'是'
WHEN 'false' THEN
'否'
ELSE
wlesal.equipment_specific_index_value
END AS fireEquipmentPointValue,
wlesa.frequency AS frequency,
wlesal.status AS status,
wlesal.type AS `type`,
(select type_name from wl_signal_classify sc where sc.type_code = wlesal.type limit 1) as alarmType,
wlesal.create_date AS createDate,
wlesal.build_id AS buildId,
wlesa.recovery_date AS recoveryDate,
wlesal.location 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,
wlesal.equipment_code AS equipmentCode
FROM
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) d
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
<where>
<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
d.warehouseStructureName like
concat(concat("%",#{param.warehouseStructureName}),"%")
</if>
<if test="param.equipCode != null and param.equipCode != ''">AND d.fireEquipmentCode like
concat(concat("%",#{param.equipCode}),"%")
</if>
<choose>
<when test="param.confirmType != null and param.confirmType != '' and param.confirmType == 1">
AND d.handleType <![CDATA[<>]]> ''
</when>
<when test="param.confirmType != null and param.confirmType != '' and param.confirmType == 0">
AND d.handleType IS NULL
</when>
<when test="param.confirmType != null and param.confirmType != '' and param.confirmType == 2">
AND d.cleanStatus = '未消除'
</when>
<when test="param.confirmType != null and param.confirmType != '' and param.confirmType == 3">
AND d.cleanStatus = '已消除'
</when>
</choose>
<if test="param.beginDate!=null">AND d.createDate <![CDATA[>=]]> #{param.beginDate}</if>
<if test="param.endDate!=null">AND d.createDate <![CDATA[<=]]> #{param.endDate}</if>
<if test="param.alarmType != null and param.alarmType != ''">AND d.type = #{param.alarmType}</if>
<if test="param.systemCode != null and param.systemCode != ''">
AND find_in_set(#{param.systemCode},d.systemCodes)
</if>
<if test="param.buildId != null and param.buildId != ''">
and (d.buildId=#{param.buildId}
or find_in_set(d.fireEquipmentId,(SELECT s.point_in_scene FROM `wl_source_scene` s where s.source_id =
#{param.buildId})))
</if>
<if test="param.id!=null and param.id!=''">AND d.fireEquipmentId = #{param.id}</if>
<if test="param.status!=null and param.status!=3">AND d.status = #{param.status}</if>
<if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND
d.cleanStatus = '已消除'
</if>
<if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
d.cleanStatus = '未消除'
</if>
<if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
d.type != 'SHIELD'
</if>
<if test="param.isRemovedFire != null and param.isRemovedFire == 1">AND
d.type != 'FIREALARM'
</if>
<if test="param.equipmentCode != null and param.equipmentCode != ''">
AND d.equipmentCode like concat(concat("%",#{param.equipmentCode}),"%")
</if>
<if test="param.indexTypeCode != null and param.indexTypeCode != ''">
AND d.type = #{param.indexTypeCode}
</if>
<if test="param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''">
AND d.fireEquipmentSpecificIndexKey like concat(concat("%",#{param.fireEquipmentSpecificIndexKey}),"%")
</if>
<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
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}),"%")
</if>
<if test="param.confirmType != null and param.confirmType != '' and param.confirmType == 1">
AND wlesal.confirm_type <![CDATA[<>]]> ''
</if>
<if test="param.confirmType != null and param.confirmType != '' and param.confirmType == 0">
AND wlesal.confirm_type IS NULL
</if>
<if test="param.confirmType != null and param.confirmType != '' and param.confirmType == 2">
AND wlesal.clean_time IS NULL
</if>
<if test="param.confirmType != null and param.confirmType != '' and param.confirmType == 3">
AND wlesal.clean_time IS NOT NULL
</if>
<if test="param.beginDate!=null">AND wlesal.create_date <![CDATA[>=]]> #{param.beginDate}</if>
<if test="param.endDate!=null">AND wlesal.create_date <![CDATA[<=]]> #{param.endDate}</if>
<if test="param.alarmType != null and param.alarmType != ''">AND wlesal.type = #{param.alarmType}</if>
<if test="param.systemCode != null and param.systemCode != ''">
AND find_in_set(#{param.systemCode}, wlesal.system_codes)
</if>
<if test="param.buildId != null and param.buildId != ''">
and (wlesal.build_id=#{param.buildId}
or find_in_set(wlesal.equipment_specific_id, (SELECT s.point_in_scene FROM `wl_source_scene` s where s.source_id =
#{param.buildId})))
</if>
<if test="param.id!=null and param.id!=''">AND wlesal.equipment_specific_id = #{param.id}</if>
<if test="param.status!=null and param.status!=3">AND wlesal.status = #{param.status}</if>
<if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND
wlesal.clean_time IS NOT NULL
</if>
<if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
wlesal.clean_time IS NULL
</if>
<if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
wlesal.type != 'SHIELD'
</if>
<if test="param.isRemovedFire != null and param.isRemovedFire == 1">AND
wlesal.type != 'FIREALARM'
</if>
<if test="param.equipmentCode != null and param.equipmentCode != ''">
AND wlesal.equipment_code like concat(concat("%",#{param.equipmentCode}),"%")
</if>
<if test="param.indexTypeCode != null and param.indexTypeCode != ''">
AND wlesal.type = #{param.indexTypeCode}
</if>
<if test="param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''">
AND wlesal.equipment_specific_index_key like concat(concat("%",#{param.fireEquipmentSpecificIndexKey}),"%")
</if>
</where>
ORDER BY d.createDate DESC
ORDER BY wlesal.create_date DESC
</select>
<select id="getAlarmList" resultType="java.util.HashMap">
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