|
@@ -27,7 +27,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
|
|
@EnableAsync
|
|
@EnableAsync
|
|
|
public class ZdLaboratoryApplication {
|
|
public class ZdLaboratoryApplication {
|
|
|
public static void main(String[] args) {
|
|
public static void main(String[] args) {
|
|
|
- HaiKangDoorService.skdInit = AcsBase.sdk_init();
|
|
|
|
|
|
|
+ //海康门禁与大华门禁使用的jna包版本有冲突,暂时注释掉海康门禁初始化
|
|
|
|
|
+ //HaiKangDoorService.skdInit = AcsBase.sdk_init();
|
|
|
ZdStartApplication.run(ApplicationConstants.LABORATORY_SERVICE, ZdLaboratoryApplication.class, args);
|
|
ZdStartApplication.run(ApplicationConstants.LABORATORY_SERVICE, ZdLaboratoryApplication.class, args);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|