日志优化

‘liusuyi’

2023-08-19 071117fdc0cdbca5746eef02771cdd15430b2d31

 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,12 +75,12 @@
                        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());
                        info.setLatitude(camera.getLatitude());
                        info.setAlarmType("移动侦测");
                        printLog(info);
                        //图片存入minio
                        url = savePicture(info);
                        info.setPicUrl(url);
@@ -89,7 +89,7 @@
                }

            case HCNetSDK.COMM_ALARM_RULE:
                log.debug("行为分析信息报警信息上报");
                //log.debug("行为分析信息报警信息上报");
                //region 行为分析信息
                ardCameras = new ArdCameras();
                ardCameras.setIp(sDeviceIP);
@@ -111,7 +111,8 @@
                info.setAlarmTime(sTime);
                info.setCameraName(ardCamera.getName());
                info.setCameraId(ardCamera.getId());
                info.setCameraIp(ipaddr);
                info.setCameraIp(ardCamera.getIp());
                info.setCameraPort(ardCamera.getPort());
                info.setCameraType(ardCamera.getGdtype());
                info.setCameraChannel(channel);
                info.setLongitude(ardCamera.getLongitude());
@@ -121,7 +122,6 @@
                    case 1: //region穿越警戒面 (越界侦测)
                        info.setAlarmType("越界侦测报警");
                        strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_TRAVERSE_PLANE.class);
                        printLog(info);
                        //图片存入minio
                        url = savePicture(info);
                        info.setPicUrl(url);
@@ -141,7 +141,6 @@
                    case 4: //region 周界入侵
                        info.setAlarmType("周界入侵报警");
                        strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_INTRUSION.class);
                        printLog(info);
                        //图片存入minio
                        url = savePicture(info);
                        info.setPicUrl(url);
@@ -185,7 +184,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);
@@ -272,6 +271,7 @@
                break;
            case HCNetSDK.COMM_ALARM_ACS:
                //region 门禁主机报警处理
                log.debug("门禁主机报警上传");
                ArdEquipExternal accessControlHost = new ArdEquipExternal();
                accessControlHost.setIp(sDeviceIP);
                accessControlHost.setPort(wLinkPort);
@@ -290,13 +290,14 @@
                    // log.debug("非事件报警数据上报(暂不解析)");
                    break;
                }

                int dwMinor = strACSInfo.dwMinor;
                if (dwMinor != 80 && dwMinor != 104) {
                    //只解析真人检测失败和人脸抓拍失败的次类型事件
                    break;
                }
//                log.info("门禁主机报警上传");
//                log.info("【主类型】事件");


                String alarmType = "";
                switch (dwMinor) {
                    case 104:
@@ -306,6 +307,7 @@
                        alarmType = "人脸抓拍失败";
                        break;
                }
                log.debug("【主类型】事件"+alarmType);
                String alarmTime = DateUtils.convertDate(parseAlarmTime(strACSInfo.struTime), "yyyy-M-d H:m:s");

                //事件图片处理
@@ -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 "";
        }
@@ -448,7 +451,7 @@
     * 通用光电报警推送mqtt
     */
    private void publishMqtt(CameraEventInfo info) {
        // printLog(info);
         printLog(info);
        MqttConsumer.publish(2, false, "camera", JSON.toJSONString(info));
    }