From 0ad53b755fb839f3275940530229d4705824e7e0 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 10 七月 2024 14:16:35 +0800 Subject: [PATCH] 修复bug --- server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java b/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java index d31fad0..c0f4baf 100644 --- a/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java +++ b/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java @@ -1,6 +1,7 @@ package com.doumee.service.impl; import com.doumee.biz.system.SystemDictDataBiz; +import com.doumee.core.erp.ErpTool; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.haikang.model.HKTools; import com.doumee.core.haikang.model.param.BaseResponse; @@ -34,13 +35,12 @@ @PostConstruct public int initHkConfig(){ - if(StringUtils.isBlank( ArtemisConfig.host )){ - 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; + ErpTool.interfaceLogService=interfaceLogService; //鑾峰彇鏍圭粍缁囩紪鐮� getRootOrgCode(); //寮�濮嬭闃呴棬绂佷簨浠躲�佽瀹簨浠躲�佸拰鍋滆溅鍦轰簨浠� @@ -86,7 +86,7 @@ HKService.eventSub(param);//鍋滆溅鍦轰簨浠� param.setEventDest(path+"/visit"); - param.setEventTypes(new Integer[]{HKConstants.EventTypes.VISIT_SIGN_OUT.getKey() + param.setEventTypes(new Integer[]{HKConstants.EventTypes.VISIT_SIGN_IN.getKey() ,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey()}); HKService.cancelEventSub(param);//鍏堝彇娑� HKService.eventSub(param);//璁垮浜嬩欢 @@ -107,6 +107,7 @@ ,HKConstants.EventTypes.PARK_LINE_OUT.getKey() ,HKConstants.EventTypes.PARK_PASS_IN.getKey() ,HKConstants.EventTypes.PARK_PASS_OUT.getKey() + ,HKConstants.EventTypes.VISIT_SIGN_IN.getKey() ,HKConstants.EventTypes.VISIT_SIGN_OUT.getKey(), HKConstants.EventTypes.DOOR_FACE_AUTH_SUCCESS.getKey()}); String path =systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_PUSH_URL).getCode(); -- Gitblit v1.9.3