修复大屏相关接口

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -323,7 +323,7 @@
 	</select>
 	<select id="getImportantEventDetail" resultType="java.util.Map">
 		select tzs.contact_phone,tzs.rec_user_name,
-		tzs.type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
+		tzs.alert_stage   as type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
 		tzs.device_id,tzs.contact_user,tzs.alarm_type_code,tzs.sequence_nbr,date_format(tzs.call_time,"%Y-%m-%d %H:%i:%S") call_time,
 		tzs.rec_user_id,tzs.registration_code,tzs.emergency_call,tzs.type_code,tzs.equipment_id
 		,te.latitude ,te.region_code ,te.longitude,tzs.injured from (
@@ -357,7 +357,7 @@
 
 	<select id="getTodayEmergencyDetail" resultType="java.util.Map">
 		select tzs.contact_phone,tzs.rec_user_name,
-		tzs.type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
+		tzs.alert_stage   as type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
 		tzs.device_id,tzs.contact_user,tzs.alarm_type_code,tzs.sequence_nbr,date_format(tzs.call_time,"%Y-%m-%d %H:%i:%S") call_time,
 		tzs.rec_user_id,tzs.registration_code,tzs.emergency_call,tzs.type_code,tzs.equipment_id
 		,te.latitude ,te.region_code ,te.longitude,tzs.injured from (
@@ -396,7 +396,7 @@
 		union all
 
 		select tzs.contact_phone,tzs.rec_user_name,
-		tzs.type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
+		tzs.alert_stage   as type,tzs.emergency_person,tzs.alarm_type,tzs.alert_source,tzs.address,
 		tzs.device_id,tzs.contact_user,tzs.alarm_type_code,tzs.sequence_nbr,date_format(tzs.call_time,"%Y-%m-%d %H:%i:%S")  call_time,
 		tzs.rec_user_id,tzs.registration_code,tzs.emergency_call,tzs.type_code,tzs.equipment_id
 		,te.latitude ,te.region_code ,te.longitude,tzs.injured from (

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESElevatorServiceImpl.java

@@ -173,6 +173,7 @@ public class ESElevatorServiceImpl {
                             esElevatorDto.setHappenTime(al.getCallTime());
                             esElevatorDto.setAlertId(String.valueOf(al.getSequenceNbr()));
                             esElevatorDto.setAlarmTypeCode(al.getAlarmTypeCode());
+                            esElevatorDto.setType(al.getAlertStage());
                             list.add(esElevatorDto);
                             break;
                         }