Skip to content

A
amos-boot-biz
Commit bc5e21b1 authored by tangwei's avatar tangwei
Browse files
Options

解决冲突

parents 47379af3 8a26b207
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 71 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @ bc5e21b1
...@@ -106,7 +106,22 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -106,7 +106,22 @@ public class SupervisionConfigureController extends AbstractBaseController {
bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null; bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
} }
Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize()); Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
return CommonResponseUtil.success(fireFightingSystemMapper.getFoamTankBySuper(page, bizOrgCode)); Page<Map<String, Object>> page1 = fireFightingSystemMapper.getFoamTankBySuper(page, bizOrgCode);
List<Map<String, Object>> res = page1.getRecords();
if (0 < res.size()) {
for (Map<String, Object> m : res) {
Map<String, Object> transResult = UnitTransformUtil.transformValues(String.valueOf(m.get("nowLevel")),
String.valueOf(m.get("unit")), String.valueOf(m.get("minLevel")), String.valueOf(m.get("maxLevel")));
m.put("nowLevel", transResult.get("nowValue"));
if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
m.put("levelStatus", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
} else {
m.put("levelStatus", "--");
}
m.put("levelAbs", transResult.get("abs"));
}
}
return CommonResponseUtil.success(page1);
} }
@PersonIdentify @PersonIdentify
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ bc5e21b1
...@@ -4757,44 +4757,19 @@ ...@@ -4757,44 +4757,19 @@
<select id="getFoamTankBySuper" resultType="java.util.Map"> <select id="getFoamTankBySuper" resultType="java.util.Map">
SELECT SELECT
a.`name`, a.`name`,
IFNULL(a.nowLevel, '--') AS nowLevel, IFNULL( a.nowLevel, '--' ) AS nowLevel,
a.id, a.id,
IFNULL(a.image, '') AS image, IFNULL( a.image, '' ) AS image,
( a.unit,
CASE a.minLevel AS minLevel,
a.maxLevel AS maxLevel,
WHEN a.nowLevel IS NULL THEN
'--'
WHEN a.nowLevel >= IFNULL( a.minLevel, 0 )
AND a.maxLevel IS NULL THEN
'100'
WHEN IFNULL( a.minLevel, 0 ) > a.nowLevel
AND a.maxLevel IS NULL THEN
'--' ELSE IFNULL((
FORMAT(
abs(
IFNULL(
a.nowLevel,
IFNULL( a.minLevel, 0 )) /
IF
(
IFNULL( a.maxLevel, 0 ) = 0,
1,
IFNULL( a.maxLevel, 0 ))) * 100,
2
)
),
0
)
END
) AS levelAbs,
( (
CASE CASE
WHEN a.nowLevel IS NULL WHEN a.nowLevel IS NULL
OR a.minLevel IS NULL THEN OR a.minLevel IS NULL THEN
'--' '--'
WHEN a.minLevel - a.nowLevel > 0 THEN WHEN a.minLevel - a.nowLevel > 0 THEN
'缺水' ELSE '正常' '缺水' ELSE '正常'
END END
) AS levelStatus, ) AS levelStatus,
...@@ -4806,6 +4781,7 @@ ...@@ -4806,6 +4781,7 @@
es.iot_code, es.iot_code,
es.id, es.id,
ec.image, ec.image,
ei.unit,
max( CASE WHEN ei.equipment_index_key = 'CAFS_FoamTank_FoamTankLevel' THEN ei.`value` END ) AS nowLevel, max( CASE WHEN ei.equipment_index_key = 'CAFS_FoamTank_FoamTankLevel' THEN ei.`value` END ) AS nowLevel,
max( CASE WHEN fi.field_name = 'minLevel' THEN fi.field_value END ) AS minLevel, max( CASE WHEN fi.field_name = 'minLevel' THEN fi.field_value END ) AS minLevel,
max( CASE WHEN fi.field_name = 'maxLevel' THEN fi.field_value END ) AS maxLevel max( CASE WHEN fi.field_name = 'maxLevel' THEN fi.field_value END ) AS maxLevel
...@@ -4825,44 +4801,19 @@ ...@@ -4825,44 +4801,19 @@
) a UNION ALL ) a UNION ALL
SELECT SELECT
a.`name`, a.`name`,
IFNULL(a.nowLevel, '--') as nowLevel, IFNULL( a.nowLevel, '--' ) AS nowLevel,
a.id, a.id,
IFNULL(a.image, '') AS image, IFNULL( a.image, '' ) AS image,
( 'M' AS unit,
CASE a.minLevel AS minLevel,
a.maxLevel AS maxLevel,
WHEN a.nowLevel IS NULL THEN
'--'
WHEN a.nowLevel >= IFNULL( a.minLevel, 0 )
AND a.maxLevel IS NULL THEN
'100'
WHEN IFNULL( a.minLevel, 0 ) > a.nowLevel
AND a.maxLevel IS NULL THEN
'--' ELSE IFNULL((
FORMAT(
abs(
IFNULL(
a.nowLevel,
IFNULL( a.minLevel, 0 )) /
IF
(
IFNULL( a.maxLevel, 0 ) = 0,
1,
IFNULL( a.maxLevel, 0 ))) * 100,
2
)
),
0
)
END
) AS levelAbs,
( (
CASE CASE
WHEN a.nowLevel IS NULL WHEN a.nowLevel IS NULL
OR a.minLevel IS NULL THEN OR a.minLevel IS NULL THEN
'--' '--'
WHEN a.minLevel - a.nowLevel > 0 THEN WHEN a.minLevel - a.nowLevel > 0 THEN
'缺水' ELSE '正常' '缺水' ELSE '正常'
END END
) AS levelStatus, ) AS levelStatus,
...@@ -4873,13 +4824,15 @@ ...@@ -4873,13 +4824,15 @@
r.`name`, r.`name`,
IFNULL( rp.min_water_level, 0 ) AS minLevel, IFNULL( rp.min_water_level, 0 ) AS minLevel,
IFNULL( rp.max_water_level, 0 ) AS maxLevel, IFNULL( rp.max_water_level, 0 ) AS maxLevel,
(select (
FORMAT(avg(IFNULL(ei.`value`,0)), 2) SELECT
from FORMAT( avg( IFNULL( ei.`value`, 0 ) ), 2 )
wl_equipment_specific_index ei FROM
where wl_equipment_specific_index ei
(ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel') WHERE
and FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS nowLevel, ( ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' OR ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel' )
AND FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id ) > 0
) AS nowLevel,
ec.image, ec.image,
r.resource_type AS type, r.resource_type AS type,
r.sequence_nbr AS id r.sequence_nbr AS id
...@@ -4890,11 +4843,13 @@ ...@@ -4890,11 +4843,13 @@
WHERE WHERE
r.resource_type = 'waterTank' r.resource_type = 'waterTank'
AND r.biz_org_code LIKE concat(#{bizOrgCode}, '%') AND r.biz_org_code LIKE concat(#{bizOrgCode}, '%')
AND r.is_delete = 1 AND r.is_delete = 1
GROUP BY GROUP BY
r.sequence_nbr r.sequence_nbr
) a ) a
ORDER BY levelStatus DESC ORDER BY
levelStatus DESC
</select> </select>
<select id="getPipeNetworkBySuper" resultType="java.util.Map"> <select id="getPipeNetworkBySuper" resultType="java.util.Map">
......
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