From a6d6627a6e13aef60941337a270541f507d53ba7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 十二月 2023 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java
index e1db654..a3ab002 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEventServiceImpl.java
@@ -43,10 +43,10 @@
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();
- //寮�濮嬭闃呴棬绂佷簨浠躲�佽瀹簨浠躲�佸拰鍋滆溅鍦轰簨浠�
- startHkEventSub();
//鑾峰彇鏍圭粍缁囩紪鐮�
getRootOrgCode();
+ //寮�濮嬭闃呴棬绂佷簨浠躲�佽瀹簨浠躲�佸拰鍋滆溅鍦轰簨浠�
+ startHkEventSub();
return 0;
}
/**
@@ -65,7 +65,6 @@
}
}
}
-
}
/**
@@ -73,15 +72,37 @@
*/
public void startHkEventSub(){
EventSubRequest param = new EventSubRequest();
- param.setEventDest(systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_PUSH_URL).getCode());
+ String path =systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_PUSH_URL).getCode();
+ param.setEventDest(path+"/parks");
+ param.setEventTypes(new Integer[]{HKConstants.EventTypes.PARK_LINE_IN.getKey()
+ ,HKConstants.EventTypes.PARK_LINE_OUT.getKey()
+ ,HKConstants.EventTypes.PARK_PASS_IN.getKey()
+ ,HKConstants.EventTypes.PARK_PASS_OUT.getKey() });
+ HKService.eventSub(param);//鍋滆溅鍦轰簨浠�
+
+ param.setEventDest(path+"/visit");
+ param.setEventTypes(new Integer[]{HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()
+ ,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()});
+ HKService.eventSub(param);//璁垮浜嬩欢
+
+ param.setEventDest(path+"/acs");
+ param.setEventTypes(new Integer[]{HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()});
+ HKService.eventSub(param);//闂ㄧ浜嬩欢
+
+ }
+ /**
+ * 鍙栨秷璁㈤槄闂ㄧ浜嬩欢銆佽瀹簨浠躲�佸拰鍋滆溅鍦轰簨浠�
+ */
+ @Override
+ public void cancelEventSub(){
+ EventSubRequest param = new EventSubRequest();
param.setEventTypes(new Integer[]{HKConstants.EventTypes.PARK_LINE_IN.getKey()
,HKConstants.EventTypes.PARK_LINE_OUT.getKey()
,HKConstants.EventTypes.PARK_PASS_IN.getKey()
,HKConstants.EventTypes.PARK_PASS_OUT.getKey()
- ,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()
- ,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()
- ,HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()});
- HKService.eventSub(param);
+ ,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey(),
+ HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()});
+ HKService.cancelEventSub(param);//鍋滆溅鍦轰簨浠�
}
}
--
Gitblit v1.9.3