| 
															
																@@ -223,7 +223,7 @@ public class MsgAlarmController extends BaseController { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																  
															 | 
															
															 | 
															
																  
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @GetMapping(value = "/videoHistoricalAlarm/{alarmId}") 
															 | 
															
															 | 
															
																     @GetMapping(value = "/videoHistoricalAlarm/{alarmId}") 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     @ApiOperation("视频服务历史报警信息") 
															 | 
															
															 | 
															
																     @ApiOperation("视频服务历史报警信息") 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    public AjaxResult videoHistoricalAlarm(@PathVariable Long alarmId) { 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    public AjaxResult videoHistoricalAlarm(@PathVariable String alarmId) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>(); 
															 | 
															
															 | 
															
																         QueryWrapper<MsgAlarm> wrapper = new QueryWrapper<>(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         wrapper.eq("alarm_id", alarmId); 
															 | 
															
															 | 
															
																         wrapper.eq("alarm_id", alarmId); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         wrapper.orderByDesc("alarm_time"); 
															 | 
															
															 | 
															
																         wrapper.orderByDesc("alarm_time"); 
															 |