From 3a992a2be8c1cc815719ac76cd7242dd7a2f7c2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 八月 2024 17:33:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 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 b7f4fef..cb10fb7 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,6 +14,8 @@
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;
@@ -35,9 +37,24 @@
@PostConstruct
public int initHkConfig(){
//鑾峰彇鏍圭粍缁囩紪鐮�
+ initHkParamConfig();
getRootOrgCode();
//寮�濮嬭闃呴棬绂佷簨浠躲�佽瀹簨浠躲�佸拰鍋滆溅鍦轰簨浠�
startHkEventSub();
+ return 0;
+ }
+
+ 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();
+ }
+ HKTools.interfaceLogService=interfaceLogService;
return 0;
}
/**
@@ -89,6 +106,24 @@
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);//鏈堝彴宸ヤ綔鐘舵�佷簨浠�
+
+
+ param.setEventDest(path+"/platform/carstatus");
+ param.setEventTypes(new Integer[]{HKConstants.EventTypes.PLATFORM_CAR_STATUS.getKey()});
+ HKService.cancelEventSub(param);//鍏堝彇娑�
+ HKService.eventSub(param);//鏈堝彴杞﹁締鐘舵�佷簨浠�
+
}
/**
* 鍙栨秷璁㈤槄闂ㄧ浜嬩欢銆佽瀹簨浠躲�佸拰鍋滆溅鍦轰簨浠�
--
Gitblit v1.9.3