Skip to content

A
amos-boot-biz
Commit feebf096 authored by litengwei's avatar litengwei
Browse files
Options

Merge remote-tracking branch 'origin/develop_dl' into develop_dl

parents 9648988e 2e76d6d6
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 80 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java
View file @ feebf096
......@@ -398,7 +398,7 @@ public class WaterResourceDto extends BaseDto {
@ExplicitConstraint(indexNum = 45, sourceClass = CommonExplicitConstraint.class, method = "getListByEquipmentCode")
private String levelDeviceName;
@ExcelProperty(value = "出口流量（L/s）", index = 44)
@ExcelIgnore
@ApiModelProperty(value = "出口流量（L/s）")
private Float outputFlowRate;
}
amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
View file @ feebf096
......@@ -536,82 +536,103 @@
<select id="selectPressureFlow" resultType="java.util.Map">
SELECT
temp.id,
temp.name,
IF(temp.nowPressure = '--', '--', TRUNCATE(ROUND(temp.nowPressure, 2),2)) AS nowPressure,
temp.area,
temp.minPressure AS `minValue`,
temp.maxPressure AS `maxValue`,
CASE
WHEN temp.nowPressure = '--' THEN
'--'
WHEN temp.maxPressure = '' THEN
'--'
WHEN temp.minPressure = '' THEN
'--'
WHEN (temp.nowPressure - temp.maxPressure) > 0 THEN
'压力高'
WHEN (temp.minPressure - temp.nowPressure) > 0 THEN
'压力低' ELSE '正常'
END AS status,
1 AS type
FROM
(
SELECT
wes.id,
wes.name,
concat_ws( '-', ws.full_name, ed.area ) area,
IFNULL( ( SELECT VALUE FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'FHS_PipePressureDetector_PipePressure' ), '--' ) AS nowPressure,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'maxPressure' AND field_value <![CDATA[<>]]> '' ), 1.5 ) AS maxPressure,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minPressure' AND field_value <![CDATA[<>]]> '' ), 0.5 ) AS minPressure
*
FROM
wl_equipment_specific wes
LEFT JOIN wl_equipment_detail ed ON wes.equipment_detail_id = ed.id
LEFT JOIN wl_warehouse_structure ws ON ws.id = wes.warehouse_structure_id
LEFT JOIN wl_equipment_specific_index ei ON wes.id = ei.equipment_specific_id
LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = wes.id
WHERE
wes.equipment_code LIKE concat( '92011000', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) temp
UNION
SELECT
temp.id,
temp.name,
IF(temp.nowFlow = '--', '--', TRUNCATE(ROUND(temp.nowFlow, 2),2)) AS nowFlow,
temp.area,
temp.minFlow AS `minValue`,
temp.maxFlow AS `maxValue`,
CASE
WHEN temp.nowFlow = '--' THEN
'--'
WHEN temp.maxFlow = '' THEN
'--'
WHEN temp.minFlow = '' THEN
'--'
WHEN (temp.nowFlow - IFNULL(temp.maxFlow, 0)) > 0 THEN
'流量高'
WHEN (IFNULL(temp.minFlow, 0) - temp.nowFlow) > 0 THEN
'流量低' ELSE '正常'
END AS status,
2 AS type
FROM
(
SELECT
wes.id,
wes.NAME,
concat_ws( '-', ws.full_name, ed.area ) area,
IFNULL( ( SELECT VALUE FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' ), '--' ) AS nowFlow,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'maxFlow' AND field_value <![CDATA[<>]]> '' ), 2.4 ) AS maxFlow,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minFlow' AND field_value <![CDATA[<>]]> '' ), 0.5 ) AS minFlow
FROM
wl_equipment_specific wes
LEFT JOIN wl_equipment_detail ed ON wes.equipment_detail_id = ed.id
LEFT JOIN wl_warehouse_structure ws ON ws.id = wes.warehouse_structure_id
LEFT JOIN wl_equipment_specific_index ei ON wes.id = ei.equipment_specific_id
LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = wes.id
WHERE
wes.equipment_code LIKE concat( '92010700', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) temp
(
SELECT
temp.id,
temp.NAME,
IF
(
temp.nowPressure = '--',
'--',
TRUNCATE ( ROUND( temp.nowPressure, 2 ), 2 )) AS nowPressure,
temp.area,
temp.minPressure AS `minValue`,
temp.maxPressure AS `maxValue`,
CASE
WHEN temp.nowPressure = '--' THEN
'--'
WHEN temp.maxPressure = '' THEN
'--'
WHEN temp.minPressure = '' THEN
'--'
WHEN ( temp.nowPressure - temp.maxPressure ) > 0 THEN
'压力高'
WHEN ( temp.minPressure - temp.nowPressure ) > 0 THEN
'压力低' ELSE '正常'
END AS STATUS,
1 AS type,
temp.updateTime
FROM
(
SELECT
wes.id,
wes.NAME,
concat_ws( '-', ws.full_name, ed.area ) area,
( SELECT update_date FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'FHS_PipePressureDetector_PipePressure' ) AS updateTime,
IFNULL( ( SELECT VALUE FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'FHS_PipePressureDetector_PipePressure' ), '--' ) AS nowPressure,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'maxPressure' AND field_value <![CDATA[<>]]> '' ), 1.5 ) AS maxPressure,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minPressure' AND field_value <![CDATA[<>]]> '' ), 0.5 ) AS minPressure
FROM
wl_equipment_specific wes
LEFT JOIN wl_equipment_detail ed ON wes.equipment_detail_id = ed.id
LEFT JOIN wl_warehouse_structure ws ON ws.id = wes.warehouse_structure_id
LEFT JOIN wl_equipment_specific_index ei ON wes.id = ei.equipment_specific_id
LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = wes.id
WHERE
wes.equipment_code LIKE concat( '92011000', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) temp UNION
SELECT
temp.id,
temp.NAME,
IF
(
temp.nowFlow = '--',
'--',
TRUNCATE ( ROUND( temp.nowFlow, 2 ), 2 )) AS nowFlow,
temp.area,
temp.minFlow AS `minValue`,
temp.maxFlow AS `maxValue`,
CASE
WHEN temp.nowFlow = '--' THEN
'--'
WHEN temp.maxFlow = '' THEN
'--'
WHEN temp.minFlow = '' THEN
'--'
WHEN (
temp.nowFlow - IFNULL( temp.maxFlow, 0 )) > 0 THEN
'流量高'
WHEN ( IFNULL( temp.minFlow, 0 ) - temp.nowFlow ) > 0 THEN
'流量低' ELSE '正常'
END AS STATUS,
2 AS type,
temp.updateTime
FROM
(
SELECT
wes.id,
wes.NAME,
concat_ws( '-', ws.full_name, ed.area ) area,
( SELECT update_date FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' ) AS updateTime,
IFNULL( ( SELECT VALUE FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' ), '--' ) AS nowFlow,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'maxFlow' AND field_value <![CDATA[<>]]> '' ), 2.4 ) AS maxFlow,
IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minFlow' AND field_value <![CDATA[<>]]> '' ), 0.5 ) AS minFlow
FROM
wl_equipment_specific wes
LEFT JOIN wl_equipment_detail ed ON wes.equipment_detail_id = ed.id
LEFT JOIN wl_warehouse_structure ws ON ws.id = wes.warehouse_structure_id
LEFT JOIN wl_equipment_specific_index ei ON wes.id = ei.equipment_specific_id
LEFT JOIN wl_form_instance_equip fi ON fi.instance_id = wes.id
WHERE
wes.equipment_code LIKE concat( '92010700', '%' ) AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) temp
) c
ORDER BY
updateTime DESC
</select>
<select id="selectAlarmAnalysis" resultType="java.util.Map">
SELECT
......@@ -1564,7 +1585,7 @@
</if>
AND wed.equipment_name is not null
</where>
ORDER BY CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC
ORDER BY CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC, wes.create_date DESC
</select>
<select id="getEquipStatistic" resultType="java.util.Map">
SELECT
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @ feebf096
......@@ -2851,6 +2851,7 @@
AND 30 >= DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE )
AND DATEDIFF( DATE_ADD( DATE_FORMAT( ed.production_date, '%Y-%m-%d' ), INTERVAL e.expiry_date YEAR ), CURRENT_DATE ) >= 0
</if>
ORDER BY dayNum DESC
</select>
<select id="selectZJEquipmentSpecificWWXByIds" resultType="java.util.Map">
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ feebf096
......@@ -140,7 +140,8 @@
biz_org_name,
design_org,
design_org_telephone,
lead_designer
lead_designer,
system_describe
)
VALUES(
#{id},
......@@ -171,7 +172,8 @@
#{bizOrgName},
#{designOrg},
#{designOrgTelephone},
#{leadDesigner}
#{leadDesigner},
#{systemDescribe}
)
</insert>
<insert id="insertFile">
......@@ -221,7 +223,8 @@
biz_org_name=#{bizOrgName},
design_org = #{designOrg},
lead_designer = #{leadDesigner},
design_org_telephone = #{designOrgTelephone}
design_org_telephone = #{designOrgTelephone},
system_describe = #{systemDescribe}
where id = #{id}
</update>
<delete id="deleteFilre">
......
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