优化通用光电报警只获取小光电数据

‘liusuyi’

2023-08-11 1e89a0c2fc96040ba50d0fe4305ace22f3daa6cf

 src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java

@@ -56,7 +56,7 @@
        //log.debug("报警事件类型:lCommand:" + Integer.toHexString(lCommand));
        switch (lCommand) {
            case HCNetSDK.COMM_ALARM_V30:
                log.debug("移动侦测");
                //log.debug("移动侦测");
                ArdCameras ardCameras = new ArdCameras();
                ardCameras.setIp(sDeviceIP);
                ardCameras.setPort(wLinkPort);
@@ -75,6 +75,7 @@
                        info.setCameraName(camera.getName());
                        info.setCameraId(camera.getId());
                        info.setCameraIp(camera.getIp());
                        info.setCameraPort(camera.getPort());
                        info.setCameraType(camera.getGdtype());
                        info.setCameraChannel(Integer.valueOf(netDvrAlarminfoV30.byChannel[0]));
                        info.setLongitude(camera.getLongitude());
@@ -89,7 +90,7 @@
                }

            case HCNetSDK.COMM_ALARM_RULE:
                log.debug("行为分析信息报警信息上报");
                //log.debug("行为分析信息报警信息上报");
                //region 行为分析信息
                ardCameras = new ArdCameras();
                ardCameras.setIp(sDeviceIP);
@@ -112,6 +113,7 @@
                info.setCameraName(ardCamera.getName());
                info.setCameraId(ardCamera.getId());
                info.setCameraIp(ipaddr);
                info.setCameraPort(ardCamera.getPort());
                info.setCameraType(ardCamera.getGdtype());
                info.setCameraChannel(channel);
                info.setLongitude(ardCamera.getLongitude());
@@ -185,7 +187,7 @@
//                log.debug("GPS报警信息上报(暂不解析)");
//                break;
            case HCNetSDK.COMM_ALARMHOST_CID_ALARM:
                log.debug("报警主机CID报告报警上报");
                //log.debug("报警主机CID报告报警上报");
                //region 报警主机报警处理
                ArdEquipExternal ardEquipExternal = new ArdEquipExternal();
                ardEquipExternal.setIp(sDeviceIP);
@@ -401,7 +403,8 @@
     */
    private String savePicture(CameraEventInfo info) {
        CameraCmd cmd = new CameraCmd();
        ArdCameras Cameras = GlobalVariable.cameraMap.get(info.getCameraIp());
        String key=info.getCameraIp()+":"+info.getCameraPort();
        ArdCameras Cameras = GlobalVariable.cameraMap.get(key);
        if (Cameras == null) {
            return "";
        }