From 99758c1a6075cc3734e22b0766eb291ac6edc79e Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Sat, 9 Aug 2025 20:58:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=B7=E5=BA=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=BA=E5=83=8F=E5=BA=93=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 18 +- .../org/dromara/sis/sdk/hik/HCNetSDK.java | 45 ++++- .../java/org/dromara/sis/sdk/hik/HikApi.java | 20 --- .../dromara/sis/sdk/hik/HikApiService.java | 124 +++++++++++++- .../sis/sdk/hik/calback/HikAlarmCallBack.java | 2 +- .../sdk/hik/model/upload/FaceAppendData.java | 72 ++++++++ .../sdk/hik/model/upload/SimpleMemory.java | 11 ++ .../sdk/hik/model/upload/UploadStatus.java | 18 ++ .../sis/sdk/hik/service/FaceService.java | 4 + .../sdk/hik/service/FdLibUploadService.java | 155 ++++++++++++++++++ .../sis/sdk/hik/service/SdkBaseServer.java | 5 +- 11 files changed, 444 insertions(+), 30 deletions(-) delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApi.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/FaceAppendData.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/SimpleMemory.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/UploadStatus.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/FaceService.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/FdLibUploadService.java diff --git a/pom.xml b/pom.xml index fd5c0f8f..e599e58c 100644 --- a/pom.xml +++ b/pom.xml @@ -91,8 +91,22 @@ dev - by.missmoc.top:8848 - by.missmoc.top:4560 + 10.20.1.60:8848 + 10.20.1.60:4560 + DEFAULT_GROUP + DEFAULT_GROUP + nacos + nacos + + + + + test + + + test + 192.168.24.101:8848 + 192.168.24.101:4560 DEFAULT_GROUP DEFAULT_GROUP nacos diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HCNetSDK.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HCNetSDK.java index d3cff30a..418d5d75 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HCNetSDK.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HCNetSDK.java @@ -3,7 +3,6 @@ package org.dromara.sis.sdk.hik; import com.sun.jna.*; import com.sun.jna.examples.win32.W32API; import com.sun.jna.examples.win32.W32API.HWND; -import com.sun.jna.ptr.ByteByReference; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.ShortByReference; @@ -9711,6 +9710,10 @@ DVR实现巡航数据结构 boolean NET_DVR_StopGetFile(int lFileHandle); + int NET_DVR_StartDownload(int lUserID, int dwDownloadType, NET_DVR_DOWNLOAD_FILEVOLUME_PARAM lpInBuffer, int dwInBufferSize, String sFileName); + + boolean NET_DVR_StopDownload(int lDownloadHandle); + int NET_DVR_GetDownloadPos(int lFileHandle); int NET_DVR_GetPlayBackPos(int lPlayHandle); @@ -10682,6 +10685,46 @@ DVR实现巡航数据结构 public byte byWorkMode ;//云台锁定控制：0- 解锁，1- 锁定 public byte[] byRes = new byte[123]; } + + + /** + * sdk 下载图片回调 + */ + interface DownloadCallBack extends Callback { + public void invoke(int lHandle, NET_DOWNLOAD_CB_INFO pCBInfo, Pointer pUserData); + } + + class NET_DOWNLOAD_CB_INFO extends SDK_Structure { + public int dwType; + public Pointer pData; + public int dwDataLen; + public Pointer pFileInfo; + public int dwFileInfoLen; + public byte[] byRes = new byte[120]; + } + + class NET_DVR_DOWNLOAD_FILEVOLUME_PARAM extends SDK_Structure { + private static final int MAX_URL_LEN = 240; + // 结构体大小 + public int dwSize; + // 文件上传路径 + public byte[] sUrl = new byte[MAX_URL_LEN]; + // 保留，置为0 + public byte[] byRes = new byte[248]; + public DownloadCallBack fnDownloadDataCB; + public Pointer pUserData; + } + + class NET_DVR_UPLOAD_FILEVOLUME_PRARAM extends SDK_Structure { + private static final int NET_SDK_MAX_FILE_NAME = 100; + public int dwSize; + public byte byFileType; + public byte byFileVolnumeID; + public byte[] byRes1 = new byte[2]; + public int dwFileSize; + public byte[] szFileName = new byte[NET_SDK_MAX_FILE_NAME]; + public byte[] byRes = new byte[300]; + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApi.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApi.java deleted file mode 100644 index 574da875..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApi.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.dromara.sis.sdk.hik; - -public interface HikApi { - - - Boolean login(String ip, short port, String user, String psw); - - - void getAcsStatus(String deviceIp); - - - Boolean controlGateway(String deviceIp, Integer floorNum, Integer cmd); - - /** - * 设备登出 - * - * @param deviceIp 设备ip - */ - Boolean loginOut(String deviceIp); -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApiService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApiService.java index 1e33a7eb..fc94a909 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApiService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HikApiService.java @@ -1,12 +1,16 @@ package org.dromara.sis.sdk.hik; +import cn.hutool.core.util.IdUtil; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.Base64Utils; import org.dromara.sis.sdk.hik.model.DeviceInfo; -import org.dromara.sis.sdk.hik.service.CamearService; -import org.dromara.sis.sdk.hik.service.DoorService; -import org.dromara.sis.sdk.hik.service.LoginService; -import org.dromara.sis.sdk.hik.service.SdkBaseServer; +import org.dromara.sis.sdk.hik.model.upload.FaceAppendData; +import org.dromara.sis.sdk.hik.model.upload.UploadStatus; +import org.dromara.sis.sdk.hik.service.*; +import java.io.FileInputStream; +import java.util.Arrays; +import java.util.List; import java.util.concurrent.ConcurrentHashMap; /** @@ -151,4 +155,116 @@ public class HikApiService { Integer lHandel = CACHE.get(deviceIp); return CamearService.getDeviceChannelInfo(lHandel); } + + // 允许上传的文件类型 + private static final List ALLOW_PIC_TYPES = Arrays.asList("jpg"); + + /** + * 人像比对文件上传 + * + * @param deviceIp 设备ip + * @param file 上传文件 + * @return 返回上传文件名称 + */ + public static String fdLibUpload(String deviceIp, byte[] file, int libId, FaceAppendData data) { + long startTime = System.currentTimeMillis(); + // 文件名称 + String fileNamePrefix = IdUtil.fastSimpleUUID(); + int luserId = CACHE.get(deviceIp); + if (luserId == -1) { + log.error("海康设备[{}]未登录，上传文件失败.", deviceIp); + return null; + } + int uploadId = -1; + // 获取文件类型 + String type = Base64Utils.getType(file); + log.info("获取上传的文件类型,type: {}", type); + if (type == null) { + log.error("上传文件获取类型失败."); + return null; + } + if (!ALLOW_PIC_TYPES.contains(type)) { + log.error("不允许的上传文件类型, type: {}", type); + return null; + } + // 生成文件名称 + String fileName = fileNamePrefix + "." + type; + // 上传状态 + int statusCode = -1; + // 已发送的数据 + int fileLen = file.length; + log.info("开始文件上传，fileName={}， len={}", fileName, fileLen); + try { + // 1 发起上传 + uploadId = FdLibUploadService.uploadFile(luserId, libId); + log.info("开始发起hik上传操作，uploadId={}", uploadId); + if (uploadId == -1) { + log.info("发起上传失败,errCode: {}", FdLibUploadService.getErrorCode()); + return null; + } + // 2 发送图片的二进制数据 + byte fileType = getFileType(type); + FdLibUploadService.uploadSend(uploadId, file, fileType, data); + // 3 循环查询, 上传进度 总共查询300次 每次等待20ms + int num = 200; // 循环次数 + int sleepTime = 40; // 每次循环休眠时间 + int allowQueryErrorNum = 5; // 最多允许接口调用异常 + int errorNum = 0; // 错误次数 + for (int i = 0; i < num; i++) { + UploadStatus uploadState = FdLibUploadService.getUploadState(uploadId); + log.info("循环获取文件上传进度, uploadState= {}", uploadState); + if (uploadState.getStatusCode() == -1) { + int errorCode = FdLibUploadService.getErrorCode(); + log.info("文件进度查询失败, errorCode:{}", errorCode); + errorNum += 1; + if (errorNum == allowQueryErrorNum) { + log.info("sdk 接口错误次数达到设置上限，退出文件上传"); + throw new RuntimeException("sdk接口错误次数达到设置上限，退出文件上传， maxErrorNum=" + allowQueryErrorNum); + } + } else { + // 上传成功 + if (uploadState.getStatusCode() == 1) { + statusCode = 1; + break; + } + // 上传中 + else if (uploadState.getStatusCode() == 2) { + Thread.sleep(sleepTime); + } + // 上传失败 + else if (uploadState.getStatusCode() == 3) { + throw new RuntimeException("文件上传失败, 返回码：3"); + } + // 其他异常 + else { + throw new RuntimeException("文件上传失败, 返回码：" + uploadState); + } + } + } + if (statusCode == -1) { + log.info("图片上传失败,取消上传."); + return null; + } + // 4 获取上传图片的路径 + String uploadResult = FdLibUploadService.getUploadResult(uploadId); + log.info("文件上传完成， result= {}, 耗时={}ms", uploadResult, System.currentTimeMillis() - startTime); + return uploadResult; + } catch (Exception e) { + if (uploadId != -1) { + FdLibUploadService.uploadClose(uploadId); + } + e.printStackTrace(); + } + return null; + } + + private static byte getFileType(String type) { + return switch (type) { + case "jpg" -> 1; + case "png" -> 3; + case "bmp" -> 2; + case "gif" -> 5; + default -> throw new RuntimeException("不允许上传的图片类型:" + type); + }; + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java index 13f27e41..4724034e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java @@ -35,7 +35,7 @@ public class HikAlarmCallBack implements HCNetSDK.FMSGCallBack_V31 { Pointer pFaceSnapInfo = strFaceSnapInfo.getPointer(); pFaceSnapInfo.write(0, pAlarmInfo.getByteArray(0, strFaceSnapInfo.size()), 0, strFaceSnapInfo.size()); strFaceSnapInfo.read(); - handleFaceSnap(strFaceSnapInfo, pAlarmer); +// handleFaceSnap(strFaceSnapInfo, pAlarmer); break; } // 异常行为检测 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/FaceAppendData.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/FaceAppendData.java new file mode 100644 index 00000000..c07c3eee --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/FaceAppendData.java @@ -0,0 +1,72 @@ +package org.dromara.sis.sdk.hik.model.upload; + +import jakarta.xml.bind.annotation.*; +import lombok.Data; + +/** + * 上传图片的附件信息 + * + * @author lxj + */ +@Data +@XmlRootElement(name = "FaceAppendData") +@XmlAccessorType(XmlAccessType.FIELD) +public class FaceAppendData { + + @XmlAttribute + private String version = "2.0"; + + @XmlAttribute + private String xmlns = "http://www.isapi.org/ver20/XMLSchema"; + + /** + * 出生日期,例如:2014-12-12T00:00:00Z + */ + @XmlElement + private String bornTime; + + @XmlElement + private String name; + + /** + * male, female + */ + @XmlElement + private String sex; + + /** + * 省份,代码索引具体请参考"全国各省份城市列表 + */ + @XmlElement + private String province; + + /** + * ,城市,代码索引具体请参考"全国各省份城市列表 + */ + @XmlElement + private String city; + + /** + * 证件类型: ID-身份证, passportID-护照, other-其他 + */ + @XmlElement + private String certificateType; + + /** + * 证件号 + */ + @XmlElement + private String certificateNumber; + + /** + * 电话号码 + */ + @XmlElement + private String phoneNumber; + + /** + * 自定人员id + */ + @XmlElement + private String customHumanID; +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/SimpleMemory.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/SimpleMemory.java new file mode 100644 index 00000000..4779fd37 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/SimpleMemory.java @@ -0,0 +1,11 @@ +package org.dromara.sis.sdk.hik.model.upload; + +import com.sun.jna.Memory; + +public class SimpleMemory extends Memory { + + + public SimpleMemory(long size) { + super(size); + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/UploadStatus.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/UploadStatus.java new file mode 100644 index 00000000..96c7e68e --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/model/upload/UploadStatus.java @@ -0,0 +1,18 @@ +package org.dromara.sis.sdk.hik.model.upload; + +import lombok.Data; + +@Data +public class UploadStatus { + + /** + * 上传状态码 + */ + private Integer statusCode; + + /** + * 上传进度 + */ + private Integer process; + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/FaceService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/FaceService.java new file mode 100644 index 00000000..56f59e08 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/FaceService.java @@ -0,0 +1,4 @@ +package org.dromara.sis.sdk.hik.service; + +public class FaceService extends SdkBaseServer{ +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/FdLibUploadService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/FdLibUploadService.java new file mode 100644 index 00000000..1565ad68 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/FdLibUploadService.java @@ -0,0 +1,155 @@ +package org.dromara.sis.sdk.hik.service; + +import cn.hutool.core.util.StrUtil; +import com.sun.jna.Pointer; +import com.sun.jna.ptr.IntByReference; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.Base64Utils; +import org.dromara.sis.sdk.hik.HCNetSDK; +import org.dromara.sis.sdk.hik.model.upload.FaceAppendData; +import org.dromara.sis.sdk.hik.model.upload.SimpleMemory; +import org.dromara.sis.sdk.hik.model.upload.UploadStatus; + +import java.io.StringWriter; +import java.nio.charset.StandardCharsets; + +import static org.dromara.sis.sdk.hik.HCNetSDK.IMPORT_DATA_TO_FACELIB; + +/** + * 海康上传服务 + */ +@Slf4j +public class FdLibUploadService extends SdkBaseServer { + + /** + * 上传文件到人脸库 + * + * @param luserId 登录句柄 + * @return 返回上传句柄 + */ + public static int uploadFile(int luserId, int libId) { + HCNetSDK.NET_DVR_FACELIB_COND param = new HCNetSDK.NET_DVR_FACELIB_COND(); + param.dwSize = param.size(); + byte[] bytes = String.valueOf(libId).getBytes(); + System.arraycopy(bytes, 0, param.szFDID, 0, bytes.length); + param.byConcurrent = 0; // 设备并发处理：0- 不开启(设备自动会建模)，1- 开始(设备不会自动进行建模) + param.byCover = 1; + param.byCustomFaceLibID = 0; + param.byPictureSaveMode = 0; + int dwInBufferSize = param.size(); + param.write(); + return hcNetSDK.NET_DVR_UploadFile_V40(luserId, IMPORT_DATA_TO_FACELIB, param.getPointer(), dwInBufferSize, null, null, 0); + } + + /** + * 上传数据发送 + * + * @param lUploadHandle 文件上传句柄，NET_DVR_UploadFile_V40的返回值 + * @param data 上传文件的二进制数据 + * @param fileType 文件的类型 + * @return -1表示失败，大于等于0表示本次发送成功的字节数，未发送成功的剩余字节数可以再次调用该接口进行发送。 + */ + public static int uploadSend(int lUploadHandle, byte[] data, byte fileType, FaceAppendData userInfo) throws JAXBException { + HCNetSDK.NET_DVR_SEND_PARAM_IN param = new HCNetSDK.NET_DVR_SEND_PARAM_IN(); + SimpleMemory memory = new SimpleMemory(data.length); + memory.write(0, data, 0, data.length); + // 设置人像附加信息 + JAXBContext context = JAXBContext.newInstance(FaceAppendData.class); + Marshaller marshaller = context.createMarshaller(); + // 转换为字符串 + StringWriter writer = new StringWriter(); + marshaller.marshal(userInfo, writer); + String xmlString = writer.toString(); + byte[] faceBytes = xmlString.getBytes(); + SimpleMemory addendData = new SimpleMemory(faceBytes.length); + addendData.write(0, faceBytes, 0, faceBytes.length); + + param.pSendData = memory; + param.dwSendDataLen = data.length; + param.byPicType = fileType; + param.pSendAppendData = addendData; + param.dwSendAppendDataLen = faceBytes.length; + return hcNetSDK.NET_DVR_UploadSend(lUploadHandle, param, null); + } + + + /** + * 查询上传数据进度 + * + * @param lUploadHandle 文件上传句柄，NET_DVR_UploadFile_V40的返回值 + * @return -1表示函数调用失败，其他为上传的状态值见下表说明。接口返回失败请调用NET_DVR_GetLastError获取错误码，通过错误码判断出错原因。 + * -1：表示调用失败 + * 1：上传成功 + * 2：正在上传 + * 3：上传失败 + * 其他状态码请参考sdk开发文档 + */ + public static UploadStatus getUploadState(int lUploadHandle) { + IntByReference reference = new IntByReference(0); + int i = hcNetSDK.NET_DVR_GetUploadState(lUploadHandle, reference.getPointer()); + UploadStatus status = new UploadStatus(); + status.setStatusCode(i); + status.setProcess(reference.getValue()); + return status; + } + + public static String getUploadResult(int lUploadHandle) { + HCNetSDK.NET_DVR_UPLOAD_FILE_RET params = new HCNetSDK.NET_DVR_UPLOAD_FILE_RET(); + params.write(); + Pointer lpOutBuffer = params.getPointer(); + int dwOutBufferSize = params.size(); + boolean b = hcNetSDK.NET_DVR_GetUploadResult(lUploadHandle, lpOutBuffer, dwOutBufferSize); + if (b) { + params.read(); + String url = new String(params.sUrl, StandardCharsets.UTF_8); + if (StrUtil.isNotEmpty(url)) { + return url.trim(); + } + } + return null; + } + + public static boolean uploadClose(int lUploadHandle) { + // TRUE表示成功，FALSE表示失败。接口返回失败请调用NET_DVR_GetLastError获取错误码，通过错误码判断出错原因。 + boolean b = hcNetSDK.NET_DVR_UploadClose(lUploadHandle); + if (b) { + log.info("文件上传关闭成功, lUploadHandle:{}", lUploadHandle); + } else { + int errorCode = hcNetSDK.NET_DVR_GetLastError(); + System.out.println("文件上传关闭失败, errorCode:" + errorCode); + } + return b; + } + + public static int download(int luserId, String url, HCNetSDK.DownloadCallBack callback) { + HCNetSDK.NET_DVR_DOWNLOAD_FILEVOLUME_PARAM param = new HCNetSDK.NET_DVR_DOWNLOAD_FILEVOLUME_PARAM(); + byte[] fns = url.getBytes(); + System.arraycopy(fns, 0, param.sUrl, 0, fns.length); + param.fnDownloadDataCB = callback; + param.write(); + param.dwSize = param.size(); + int i = hcNetSDK.NET_DVR_StartDownload(luserId, 20, param, param.dwSize, null); + if (i == -1) { + log.info("发起图片下载失败，lDownloadHandle={}, errorCode={}", i, getErrorCode()); + } + return i; + } + + /** + * 关闭文件下载 + * + * @param lDownloadHandle 下载句柄 + */ + public static void stopDownload(int lDownloadHandle) { + boolean b = hcNetSDK.NET_DVR_StopDownload(lDownloadHandle); + if (b) { + log.info("文件下载关闭成功, lDownloadHandle={}", lDownloadHandle); + } else { + System.out.println("文件下载关闭失败, errorCode:" + getErrorCode()); + } + } + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/SdkBaseServer.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/SdkBaseServer.java index da31abe6..94cd1a76 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/SdkBaseServer.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/SdkBaseServer.java @@ -1,11 +1,9 @@ package org.dromara.sis.sdk.hik.service; -import com.sun.jna.Memory; import com.sun.jna.Native; import com.sun.jna.Pointer; import lombok.extern.slf4j.Slf4j; import org.dromara.sis.sdk.hik.HCNetSDK; -import org.dromara.sis.sdk.hik.SDK_Structure; import org.springframework.util.Assert; import static org.dromara.sis.sdk.hik.common.osSelect.isWindows; @@ -120,6 +118,9 @@ public class SdkBaseServer { } } + public static int getErrorCode() { + return getHcNetSDK().NET_DVR_GetLastError(); + } /** * 登出操作 From 59dc46f019ff376a0581289f430d2a50186bbb49 Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Tue, 12 Aug 2025 15:48:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java | 2 +- .../dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java | 4 ++-- .../sis/service/impl/SisAlarmEventsServiceImpl.java | 7 ++++--- .../sis/service/impl/ZeroSensationPassageServiceImpl.java | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java index 9056b669..d5af0418 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java @@ -40,7 +40,7 @@ public class HikAlarmCallBack implements HCNetSDK.FMSGCallBack_V31 { Pointer pFaceSnapInfo = strFaceSnapInfo.getPointer(); pFaceSnapInfo.write(0, pAlarmInfo.getByteArray(0, strFaceSnapInfo.size()), 0, strFaceSnapInfo.size()); strFaceSnapInfo.read(); -// handleFaceSnap(strFaceSnapInfo, pAlarmer); + handleFaceSnap(strFaceSnapInfo, pAlarmer); break; } // 异常行为检测 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java index c04a8249..c003ade3 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java @@ -243,8 +243,8 @@ public class ZLMediaKitServiceImpl implements ZLMediaKitService { commonParams.put("src_url", url); commonParams.put("dst_url", targetUrl); commonParams.put("timeout_ms", 10000); - commonParams.put("enable_hls", false); - commonParams.put("enable_mp4", false); + commonParams.put("enable_hls", true); + commonParams.put("enable_mp4", true); R result = HttpClientUtil.get(getRequestUrl("addFFmpegSource"), commonParams, AddStreamProxyResp.class); if (result != null) { if (result.getCode() == 0) { diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java index 9427887f..9bd6cf42 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.sis.service.impl; +import cn.dev33.satoken.context.mock.SaTokenContextMockUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -151,7 +152,7 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService { @Async @Override @Transactional(rollbackFor = Exception.class) - public void createAlarmRecord(String deviceIp, Integer level, Integer type,String msg, byte[] smallImg, byte[] bigImg) { + public void createAlarmRecord(String deviceIp, Integer level, Integer type, String msg, byte[] smallImg, byte[] bigImg) { // 校验设备信息 SisDeviceManage sisDeviceManage = deviceManageService.queryByDeviceIp(deviceIp); if (sisDeviceManage == null) { @@ -186,10 +187,10 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService { } public SisAlarmEventAttachments createEventAttachments(byte[] img, SisAlarmEvents alarmEvents, SisDeviceManage sisDeviceManage) { - RemoteFile result = remoteFileService.uploadImg(img); + RemoteFile remoteFile = SaTokenContextMockUtil.setMockContext(() -> remoteFileService.uploadImg(img)); SisAlarmEventAttachments attachments = new SisAlarmEventAttachments(); attachments.setEventId(alarmEvents.getId()); - attachments.setOssId(result.getOssId()); + attachments.setOssId(remoteFile.getOssId()); attachments.setType(1L); attachments.setTenantId(sisDeviceManage.getTenantId()); attachments.setCreateDept(sisDeviceManage.getCreateDept()); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java index ccad1e28..75e3ea5a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java @@ -65,7 +65,7 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer if (result.getCode() != 200) { log.info("华为盒子比对失败,msg={}", result.getMessage()); // 产生告警数据 -// alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "人脸比对失败", smallImg, bigImg); + alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "人脸比对失败", smallImg, bigImg); return; } log.info("人脸比对执行完成,耗时：{}ms", interval.intervalMs()); @@ -76,19 +76,19 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer if (authRecord == null) { log.info("人员[{}]没有授权记录，判定为陌生人", person); // 不是内部人员 产生紧急的告警信息 -// alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "陌生人员入内", smallImg, bigImg); + alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "陌生人员入内", smallImg, bigImg); return; } else { if (Objects.equals(authRecord.getRosterType(), RosterTypeEnum.BLACK_LIST.getCode())) { log.info("人员[{}]在黑名单中，暂不处理。", person); -// alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "黑名单人员入内", smallImg, bigImg); + alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "黑名单人员入内", smallImg, bigImg); return; } } Date now = new Date(); if (DateUtil.compare(now, authRecord.getEndDate()) > 0) { -// alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "人员授权信息已过期", smallImg, bigImg); + alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "人员授权信息已过期", smallImg, bigImg); log.info("当前人脸已过期，暂不处理。"); return; }