Skip to content

A
amos-boot-biz
Commit 5bfcfc11 authored by 张森's avatar 张森
Browse files
Options

自动化需求开发 bug

parent 3cf5fb39
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 7 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @ 5bfcfc11
......@@ -2832,10 +2832,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
if (!ObjectUtils.isEmpty(equipmentIndexKey)) {
if (equipmentIndexKey.equals("FHS_PressurePump_Start")) {
item.put("indexValueName", "启动");
}
} else
if (equipmentIndexKey.equals("FHS_PressurePump_Stop")) {
item.put("indexValueName", "停止");
}
} else
if (equipmentIndexKey.equals("FHS_PressurePump_ManualAutomaticSignal") &&
item.getOrDefault("indexValue", "").toString().equals("true")) {
item.put("indexValueName", "手动状态");
......@@ -2855,9 +2855,15 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
if (!ObjectUtils.isEmpty(equipmentIndexKey)) {
if (equipmentIndexKey.equals("FHS_FirePump_Start")) {
item.put("indexValueName", "启动");
}
} else
if (equipmentIndexKey.equals("FHS_FirePump_Stop")) {
item.put("indexValueName", "停止");
} else
if (equipmentIndexKey.equals("FHS_FirePump_ManualAutomaticSignal") &&
item.getOrDefault("indexValue", "").toString().equals("true")) {
item.put("indexValueName", "手动状态");
} else {
item.put("indexValueName", "自动状态");
}
}
});
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @ 5bfcfc11
......@@ -3044,7 +3044,8 @@
COALESCE ( a.warehouse_structure_id, '' ) AS buildId,
COALESCE ( b.name, '' ) AS buildName,
esi.equipment_index_key as equipmentIndexKey,
esi.`value` as indexValue
esi.`value` as indexValue,
'92010800' as equipmentCode
FROM
wl_equipment_specific a
LEFT JOIN wl_warehouse_structure b ON a.warehouse_structure_id = b.id
......@@ -3081,7 +3082,8 @@
COALESCE ( a.warehouse_structure_id, '' ) AS buildId,
COALESCE ( b.NAME, '' ) AS buildName,
ifnull( esi.equipment_index_key, 'FHS_FirePump_Stop' ) AS equipmentIndexKey,
'true' AS indexValue
'true' AS indexValue,
'920106007' as equipmentCode
FROM
wl_equipment_specific a
LEFT JOIN wl_warehouse_structure b ON a.warehouse_structure_id = b.id
......@@ -3100,6 +3102,7 @@
wl_equipment_specific_index
WHERE
( equipment_index_key IN ( 'FHS_FirePump_Start', 'FHS_FirePump_Stop' ) AND `value` = 'true' )
OR ( equipment_index_key = 'FHS_FirePump_ManualAutomaticSignal' AND `value` IS NOT NULL AND `value` != '' )
) esi_with_rn
WHERE
esi_with_rn.rn = 1
......@@ -3117,7 +3120,8 @@
COALESCE ( a.warehouse_structure_id, '' ) AS buildId,
COALESCE ( b.name, '' ) AS buildName,
esi.equipment_index_key as equipmentIndexKey,
esi.`value` as indexValue
esi.`value` as indexValue,
'92010500' as equipmentCode
FROM
wl_equipment_specific a
LEFT JOIN wl_warehouse_structure b ON a.warehouse_structure_id = b.id
......@@ -3135,7 +3139,7 @@
FROM
wl_equipment_specific_index
WHERE
equipment_index_key = 'FHS_PressurePump_ManualAutomaticSignal' AND `value` IS NOT NULL AND `value` != ''
equipment_index_key = 'FHS_ControlCabinetManually' AND `value` IS NOT NULL AND `value` != ''
) esi_with_rn
WHERE
esi_with_rn.rn = 1
......
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