by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

hik-sdk jna 版本升级
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
lxj 2025-07-17 02:11:58 +08:00
parent 7928aa16f8
commit f866e2ffc6
8 changed files with 731 additions and 656 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/hik/jna-4.5.2_1.jar Normal file
View File

Binary file not shown.

7
pom.xml
View File

@ -104,15 +104,12 @@
<id>prod</id>
<properties>
<profiles.active>prod</profiles.active>
<nacos.server>47.109.37.87:8848</nacos.server>
<logstash.address>47.109.37.87:4560</logstash.address>
<nacos.server>10.20.1.185:8848</nacos.server>
<logstash.address>10.20.1.185:4560</logstash.address>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
<!-- <logstash.address>127.0.0.1:4560</logstash.address>-->
</properties>
</profile>
</profiles>

12
ruoyi-common/ruoyi-common-bus/pom.xml
View File

@ -17,19 +17,19 @@
<dependencies>
<!-- rabbitmq -->
<dependency>
<!-- <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bus-amqp</artifactId>
</dependency>
</dependency>-->
<!-- kafka -->
<!-- <dependency>-->
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-bus-kafka</artifactId>-->
<!-- </dependency>-->
<!-- rocketmq -->
<!-- <dependency>-->
<!-- <groupId>com.alibaba.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-bus-rocketmq</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-bus-rocketmq</artifactId>
</dependency>
</dependencies>
</project>

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java
View File

@ -2,16 +2,12 @@ package org.dromara.property.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rabbitmq.client.Return;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.base.BaseException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
@ -109,7 +105,8 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
}
/**
*查询该日期的会议记录
* 查询该日期的会议记录
*
* @param appointmentDateStr
* @return 当天的会议预约记录
*/

1
ruoyi-modules/Sis/pom.xml
View File

@ -119,6 +119,7 @@
<dependency>
<groupId>com.hik</groupId>
<artifactId>jna</artifactId>
<version>4.5.2_1</version>
</dependency>
</dependencies>

1323
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/HCNetSDK.java
View File

File diff suppressed because it is too large Load Diff

31
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/SDK_Structure.java Normal file
View File

@ -0,0 +1,31 @@
package org.dromara.sis.sdk.hik;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
import com.sun.jna.Structure;
public class SDK_Structure extends Structure
{
protected List<String> getFieldOrder()
{
List<String> fieldOrderList = new ArrayList<String>();
for (Class<?> cls = getClass();!cls.equals(SDK_Structure.class);cls = cls.getSuperclass())
{
Field[] fields = cls.getDeclaredFields();
int modifiers;
for (Field field : fields)
{
modifiers = field.getModifiers();
if (Modifier.isStatic(modifiers) || !Modifier.isPublic(modifiers))
{
continue;
}
fieldOrderList.add(field.getName());
}
}
//System.out.println(fieldOrderList);
return fieldOrderList;
}
}

6
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/service/SdkBaseServer.java
View File

@ -33,9 +33,9 @@ public class SdkBaseServer {
hcNetSDK = (HCNetSDK) Native.loadLibrary(dllFilePath, HCNetSDK.class);
log.info("window-sdk加载完成。");
} else {
String dllFilePath = System.getProperty("user.dir") + "/lib/libhcnetsdk.so";
log.info("linux系统加载库路径: {}", dllFilePath);
hcNetSDK = (HCNetSDK) Native.loadLibrary(dllFilePath, HCNetSDK.class);
String soFilePath = System.getProperty("user.dir") + "/lib/libhcnetsdk.so";
log.info("linux系统加载库路径: {}", soFilePath);
hcNetSDK = (HCNetSDK) Native.loadLibrary(soFilePath, HCNetSDK.class);
HCNetSDK.BYTE_ARRAY ptrByteArray1 = new HCNetSDK.BYTE_ARRAY(256);
HCNetSDK.BYTE_ARRAY ptrByteArray2 = new HCNetSDK.BYTE_ARRAY(256);
//这里是库的绝对路径，请根据实际情况修改，注意改路径必须有访问权限