日志优化

‘liusuyi’

2023-08-22 fb20723e0aeeca6010776b2a5439f2a6f8ba9ca7

 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;

@@ -111,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);
@@ -271,6 +272,7 @@
                break;
            case HCNetSDK.COMM_ALARM_ACS:
                //region 门禁主机报警处理
                log.debug("门禁主机报警上传");
                ArdEquipExternal accessControlHost = new ArdEquipExternal();
                accessControlHost.setIp(sDeviceIP);
                accessControlHost.setPort(wLinkPort);
@@ -289,13 +291,12 @@
                    // log.debug("非事件报警数据上报(暂不解析)");
                    break;
                }

                int dwMinor = strACSInfo.dwMinor;
                if (dwMinor != 80 && dwMinor != 104) {
                    //只解析真人检测失败和人脸抓拍失败的次类型事件
                    break;
                }
//                log.info("门禁主机报警上传");
//                log.info("【主类型】事件");
                String alarmType = "";
                switch (dwMinor) {
                    case 104:
@@ -305,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;
@@ -321,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;
@@ -408,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;