Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

vehicle-admin/src/main/java/com/ozs/web/controller/sdk/GeoHazardMonitorTokenController.java

@@ -641,14 +641,16 @@ public class GeoHazardMonitorTokenController {
                         alarmInfoVo.setAlarmContent(list.get(0).getContent());
                         alarmInfoVo.setAlarmType(list.get(0).getAlarmType());
                         alarmInfoVo.setAlarmLevel(list.get(0).getAlarmLevel());
-                        AlarmFilesVo[] files = new AlarmFilesVo[1];
                         LambdaQueryWrapper<MsgAlarmExt> ext = new LambdaQueryWrapper<>();
                         ext.eq(MsgAlarmExt::getAlarmId, list.get(0).getAlarmId());
-                        MsgAlarmExt one = msgAlarmExtService.getOne(ext);
-                        if (!ObjectUtils.isEmpty(one)) {
-                            files[0] = new AlarmFilesVo();
-                            files[0].setAlarmAttType(one.getAlarmAttType());
-                            files[0].setAlarmAttPath(one.getAlarmAttPath());
+                        List<MsgAlarmExt> list1 = msgAlarmExtService.list(ext);
+                        AlarmFilesVo[] files = new AlarmFilesVo[list1.size()];
+                        if (!ObjectUtils.isEmpty(list1)) {
+                            for (int i = 0; i < list1.size(); i++) {
+                                files[i] = new AlarmFilesVo();
+                                files[i].setAlarmAttType(list1.get(i).getAlarmAttType());
+                                files[i].setAlarmAttPath(list1.get(i).getAlarmAttPath());
+                            }
                             //返回结果
                             alarmInfoVo.setAlarmFiles(files);
                         }