Merge remote-tracking branch 'origin/develop_dl_3.7.2.2' into develop_dl_3.7.2.2

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2264,10 +2264,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", "手动状态");
@@ -2287,9 +2287,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

@@ -2986,7 +2986,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
@@ -3023,7 +3024,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
@@ -3042,6 +3044,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
@@ -3059,7 +3062,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
@@ -3077,7 +3081,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