修改应急卡片bug

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -515,4 +515,31 @@
             ALTER TABLE `wl_equipment_specific_alarm` ADD COLUMN `station_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '换流站编码';
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1672299479-1">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="wl_form_group_equip"/>
+        </preConditions>
+        <comment>新增特殊三类装备字段</comment>
+        <sql>
+            REPLACE INTO `wl_form_group_equip`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674825, 'CAFS泡沫罐', '92031900', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:43');
+            REPLACE INTO `wl_form_group_equip`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674826, '管网压力探测器', '92011000', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:44');
+            REPLACE INTO `wl_form_group_equip`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674827, '消防水池装置', '92010700', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:44');
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1672299479-2">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="wl_form_group_column_equip"/>
+        </preConditions>
+        <comment>新增特殊三类装备属性字段</comment>
+        <sql>
+            REPLACE INTO `wl_form_group_column_equip`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000350, 'minLevel', '最低报警液位(m)', 'inputNumber', 132828674825, 'eq', b'0', '92031900', 2581805, '2022-10-09 09:24:35');
+            REPLACE INTO `wl_form_group_column_equip`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000351, 'maxLevel', '最高报警液位(m)', 'inputNumber', 132828674825, 'eq', b'0', '92031900', 2581805, '2022-10-09 09:24:36');
+            REPLACE INTO `wl_form_group_column_equip`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000352, 'volume', '泡沫液罐容积(m³)', 'inputNumber', 132828674825, 'eq', b'0', '92031900', 2581805, '2022-10-09 09:24:37');
+            REPLACE INTO `wl_form_group_column_equip`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000353, 'minPressure', '最低报警压力(Mpa)', 'inputNumber', 132828674826, 'eq', b'0', '92011000', 2581805, '2022-10-09 09:24:38');
+            REPLACE INTO `wl_form_group_column_equip`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000354, 'maxPressure', '最高报警压力(Mpa)', 'inputNumber', 132828674826, 'eq', b'0', '92011000', 2581805, '2022-10-09 09:24:39');
+            REPLACE INTO `wl_form_group_column_equip`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000355, 'minFlow', '最低报警流量(L/S)', 'inputNumber', 132828674827, 'eq', b'0', '92010700', 2581805, '2022-10-09 09:24:39');
+            REPLACE INTO `wl_form_group_column_equip`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000356, 'maxFlow', '最高报警流量(L/S)', 'inputNumber', 132828674827, 'eq', b'0', '92010700', 2581805, '2022-10-09 09:24:40');
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -149,7 +149,7 @@
 				concat( wesi.equipment_index_name, '(否)' )
 		END) ELSE wesi.value_label END FROM  wl_equipment_specific_index wesi
 		LEFT JOIN wl_equipment_index  wei on wesi.equipment_index_id = wei.id
-		 WHERE wesi.equipment_specific_id = temp.id  AND wei.is_trend = 0
+		 WHERE wesi.equipment_specific_id = temp.id  AND wesi.is_alarm = 1
 	        ORDER BY wesi.update_date desc LIMIT 1),'--') AS status,
 	        '0' AS flow
         FROM(
@@ -391,7 +391,7 @@
         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_WaterFlow' ), '--' ) AS nowFlow,
+        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' ), 0 ) AS maxFlow,
         IFNULL( ( SELECT field_value FROM wl_form_instance_equip WHERE instance_id = wes.id AND field_name = 'minFlow' ), 0 ) AS minFlow
         FROM