Explorar o código

莹石云视频修改从字典中获取

gao.qiang hai 8 meses
pai
achega
74a741e096

+ 22 - 8
vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -727,11 +727,18 @@ public class GeoHazardMonitorTokenController {
                             CameraVos cameraVos = new CameraVos();
                             if (list.get(0).getAlarmType() == 2) {
                                 cameraVos.setCameraCode("huangkangyingshiyunxiangjibianma");
-                                if (list.get(0).getAlarmMile() == 516743) {
-                                    cameraVos.setCurrentStream("https://rtmp01open.ys7.com:9188/v3/openlive/K38316196_1_1.flv?expire=1745409016&id=704781554165264384&t=477265ab4d36debe072836e0b16755ba50303c3b8eb165a628bc9c0a0328afb5&ev=100");
-                                } else {
-                                    cameraVos.setCurrentStream("https://open.ys7.com/v3/openlive/K38316196_1_1.m3u8?expire=1751534158&id=730472262217506816&t=ced78480529e3591e83dda8045d54bada503eafdae547b43b789741cc3e67717&ev=100");
+                                List<SysDictData> dictDataList = dictTypeService.selectDictDataByType("alarm_url");
+                                if (ObjectUtils.isEmpty(dictDataList)){
+                                    List<SysDictData> dataList = dictDataList.stream().filter(vp -> vp.getDictLabel().equals(list.get(0).getAlarmMile())).collect(Collectors.toList());
+                                    if (ObjectUtils.isEmpty(dataList)){
+                                        cameraVos.setCurrentStream(dataList.get(0).getDictValue());
+                                    }
                                 }
+//                                if (list.get(0).getAlarmMile() == 516743) {
+//                                    cameraVos.setCurrentStream("https://rtmp01open.ys7.com:9188/v3/openlive/K38316196_1_1.flv?expire=1745409016&id=704781554165264384&t=477265ab4d36debe072836e0b16755ba50303c3b8eb165a628bc9c0a0328afb5&ev=100");
+//                                } else {
+//                                    cameraVos.setCurrentStream("https://open.ys7.com/v3/openlive/K38316196_1_1.m3u8?expire=1751534158&id=730472262217506816&t=ced78480529e3591e83dda8045d54bada503eafdae547b43b789741cc3e67717&ev=100");
+//                                }
                             } else {
                                 LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
                                 if (heartbeatVo.getLineDir() == 1) {
@@ -843,10 +850,17 @@ public class GeoHazardMonitorTokenController {
                             } else {
                                 if (i == 0) {
                                     if (list.get(0).getAlarmType() == 2) {
-                                        if (list.get(0).getAlarmMile() == 516743) {
-                                            alarmListVo.setCameraStream("https://rtmp01open.ys7.com:9188/v3/openlive/K38316196_1_1.flv?expire=1745409016&id=704781554165264384&t=477265ab4d36debe072836e0b16755ba50303c3b8eb165a628bc9c0a0328afb5&ev=100");
-                                        } else {
-                                            alarmListVo.setCameraStream("https://open.ys7.com/v3/openlive/K38316196_1_1.m3u8?expire=1751534158&id=730472262217506816&t=ced78480529e3591e83dda8045d54bada503eafdae547b43b789741cc3e67717&ev=100");
+//                                        if (list.get(0).getAlarmMile() == 516743) {
+//                                            alarmListVo.setCameraStream("https://rtmp01open.ys7.com:9188/v3/openlive/K38316196_1_1.flv?expire=1745409016&id=704781554165264384&t=477265ab4d36debe072836e0b16755ba50303c3b8eb165a628bc9c0a0328afb5&ev=100");
+//                                        } else {
+//                                            alarmListVo.setCameraStream("https://open.ys7.com/v3/openlive/K38316196_1_1.m3u8?expire=1751534158&id=730472262217506816&t=ced78480529e3591e83dda8045d54bada503eafdae547b43b789741cc3e67717&ev=100");
+//                                        }
+                                        List<SysDictData> dictDataList = dictTypeService.selectDictDataByType("alarm_url");
+                                        if (ObjectUtils.isEmpty(dictDataList)){
+                                            List<SysDictData> dataList = dictDataList.stream().filter(vp -> vp.getDictLabel().equals(list.get(0).getAlarmMile())).collect(Collectors.toList());
+                                            if (ObjectUtils.isEmpty(dataList)){
+                                                alarmListVo.setCameraStream(dataList.get(0).getDictValue());
+                                            }
                                         }
                                     } else {
                                         alarmListVo.setCameraStream("");