From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java index b7deb0a..0a46fbe 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java @@ -14,8 +14,6 @@ import com.hikvision.artemis.sdk.config.ArtemisConfig; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.DependsOn; -import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @@ -45,15 +43,10 @@ } public int initHkParamConfig(){ - if(StringUtils.isBlank(ArtemisConfig.appKey ) - ||StringUtils.isBlank(ArtemisConfig.host ) - ||StringUtils.isBlank(ArtemisConfig.appSecret ) - ){ - ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode(); - ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode(); - ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode(); - HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode(); - } + ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode(); + ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode(); + ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode(); + HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode(); HKTools.interfaceLogService=interfaceLogService; return 0; } @@ -106,10 +99,17 @@ HKService.cancelEventSub(param);//鍏堝彇娑� HKService.eventSub(param);//闂ㄧ浜嬩欢 + param.setEventDest(path+"/visitIccm"); + param.setEventTypes(new Integer[]{HKConstants.EventTypes.VISIT_SIGN_ICCM_IN.getKey() + ,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey() + ,HKConstants.EventTypes.VISIT_SIGN_ICCM_OUT.getKey()}); + HKService.cancelEventSub(param);//鍏堝彇娑� + HKService.eventSub(param);//璁垮浜嬩欢 + param.setEventDest(path+"/platform/workstatus"); param.setEventTypes(new Integer[]{HKConstants.EventTypes.PLATFORM_WORKSTATUS.getKey()}); HKService.cancelEventSub(param);//鍏堝彇娑� - HKService.eventSub(param);//鏈堝彴宸ヤ綔鐘舵�佷簨浠� +// HKService.eventSub(param);//鏈堝彴宸ヤ綔鐘舵�佷簨浠� param.setEventDest(path+"/platform/carstatus"); -- Gitblit v1.9.3