日志优化

‘liusuyi’

2023-08-22 872ba4884f9929c9df6ebea52130bb27c1dd9fe8

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

@@ -17,6 +17,7 @@
import com.ard.utils.other.DateUtils;
import com.ard.utils.other.SpringTool;
import com.ard.utils.mqtt.MqttConsumer;
import com.ard.utils.uuid.IdUtils;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;

@@ -81,7 +82,6 @@
                        info.setLongitude(camera.getLongitude());
                        info.setLatitude(camera.getLatitude());
                        info.setAlarmType("移动侦测");
                        printLog(info);
                        //图片存入minio
                        url = savePicture(info);
                        info.setPicUrl(url);
@@ -112,7 +112,7 @@
                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);
@@ -123,7 +123,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);
@@ -143,7 +142,6 @@
                    case 4: //region 周界入侵
                        info.setAlarmType("周界入侵报警");
                        strVcaAlarm.struRuleInfo.uEventParam.setType(HCNetSDK.NET_VCA_INTRUSION.class);
                        printLog(info);
                        //图片存入minio
                        url = savePicture(info);
                        info.setPicUrl(url);
@@ -274,6 +272,7 @@
                break;
            case HCNetSDK.COMM_ALARM_ACS:
                //region 门禁主机报警处理

                ArdEquipExternal accessControlHost = new ArdEquipExternal();
                accessControlHost.setIp(sDeviceIP);
                accessControlHost.setPort(wLinkPort);
@@ -292,13 +291,12 @@
                    // log.debug("非事件报警数据上报(暂不解析)");
                    break;
                }
                log.debug("门禁主机报警上传");
                int dwMinor = strACSInfo.dwMinor;
                if (dwMinor != 80 && dwMinor != 104) {
                    //只解析真人检测失败和人脸抓拍失败的次类型事件
                    break;
                }
//                log.info("门禁主机报警上传");
//                log.info("【主类型】事件");
                String alarmType = "";
                switch (dwMinor) {
                    case 104:
@@ -308,13 +306,12 @@
                        alarmType = "人脸抓拍失败";
                        break;
                }
                log.debug("【主类型】事件"+alarmType);
                String alarmTime = DateUtils.convertDate(parseAlarmTime(strACSInfo.struTime), "yyyy-M-d H:m:s");

                //事件图片处理
                int dwPicDataLen = strACSInfo.dwPicDataLen;
                if (dwPicDataLen > 0) {
                    SimpleDateFormat sf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                    String newName = sf.format(new Date());
                    try {
                        //将字节写入文件
                        long offset = 0;
@@ -324,7 +321,7 @@
                        buffers.get(bytes);
                        InputStream input = new ByteArrayInputStream(bytes);
                        String bucketName = "pic";
                        String objectName = "alarm_" + newName + ".jpeg";
                        String objectName = "alarm/" + IdUtils.simpleUUID() + ".jpeg";
                        boolean uploadObject = MinioUtils.uploadObject(bucketName, objectName, input, "image/JPEG");
                        if (uploadObject) {
                            url = MinioClientSingleton.domainUrl + "/" + bucketName + "/" + objectName;
@@ -411,8 +408,7 @@
        cmd.setCameraId(Cameras.getId());
        cmd.setChannelNum(info.getCameraChannel());
        cmd.setBucketName("pic");
        String UUID = java.util.UUID.randomUUID().toString().replace("-", "");
        String filename = info.getCameraName() + "/" + info.getAlarmType() + "/" + UUID + ".jpg";
        String filename =  "alarm" + "/" + IdUtils.simpleUUID() + ".jpg";
        cmd.setObjectName(filename);
        String url = HikClientUtil.picCutCate(cmd);
        return url;
@@ -451,7 +447,7 @@
     * 通用光电报警推送mqtt
     */
    private void publishMqtt(CameraEventInfo info) {
        // printLog(info);
         printLog(info);
        MqttConsumer.publish(2, false, "camera", JSON.toJSONString(info));
    }