提交

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/hik/HikIsapiService.java

@@ -145,8 +145,7 @@ public class HikIsapiService {
             device.getTimeout(), headers);
     }
 
-    @Autowired
-    private IotVideoAlarmService  iotVideoAlarmService;
+    private final IotVideoAlarmService iotVideoAlarmService;
     /**
      * 处理告警回调
      */
@@ -178,45 +177,7 @@ public class HikIsapiService {
             throw new RuntimeException("JSON解析失败", e);
         }
     }
-    
-    /**
-     * 转换告警事件
-     */
-//    private AlarmEventDTO convertToDTO(IsapiAlarmEvent alarmEvent) {
-//        AlarmEventDTO dto = new AlarmEventDTO();
-//
-//        if (alarmEvent.getParams() != null) {
-//            dto.setEventId(alarmEvent.getParams().getEventID());
-//            dto.setDeviceId(alarmEvent.getParams().getDeviceID());
-//            dto.setDeviceName(alarmEvent.getParams().getDeviceName());
-//            dto.setChannelId(alarmEvent.getParams().getChannelID());
-//            dto.setChannelName(alarmEvent.getParams().getChannelName());
-//            dto.setEventType(alarmEvent.getParams().getEventType());
-//            dto.setEventDescription(alarmEvent.getParams().getEventDescription());
-//            dto.setEventTime(alarmEvent.getParams().getDateTime());
-//            dto.setEventState(alarmEvent.getParams().getEventState());
-//        }
-//
-//        if (alarmEvent.getParams() != null &&
-//            alarmEvent.getParams().getData() != null &&
-//            alarmEvent.getParams().getData().getAlarmEvent() != null &&
-//            alarmEvent.getParams().getData().getAlarmEvent().getEventList() != null &&
-//            alarmEvent.getParams().getData().getAlarmEvent().getEventList().getEvent() != null &&
-//            !alarmEvent.getParams().getData().getAlarmEvent().getEventList().getEvent().isEmpty()) {
-//
-//            IsapiAlarmEvent.EventData.AlarmEvent.EventList.Event event =
-//                alarmEvent.getParams().getData().getAlarmEvent().getEventList().getEvent().get(0);
-//
-//            dto.setConfidenceLevel(event.getConfidenceLevel());
-//            dto.setRegionCoordinates(event.getRegionCoordinates());
-//            dto.setTargetCoordinates(event.getTargetCoordinates());
-//            dto.setImageUrl(event.getImageURL());
-//            dto.setVideoUrl(event.getVideoURL());
-//        }
-//
-//        return dto;
-//    }
-    
+
     private HikvisionProperties.IsapiConfig.DeviceConfig getDeviceConfig(String deviceId) {
         return properties.getIsapi().getDevices().stream()
             .filter(d -> d.getId().equals(deviceId))