From 350e542c1dd056b6c12be90f54387c0c9a5c96b7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十二月 2023 16:39:39 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 4 +++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java | 6 +++---
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 5 ++++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 0f8eb9b..3ad095e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -2,6 +2,7 @@
import com.doumee.service.business.impl.hksync.HkSyncImgServiceImpl;
+import com.doumee.service.business.impl.hksync.HkSyncOrgUserServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -20,6 +21,8 @@
@Autowired
private HkSyncImgServiceImpl hkSyncImgService;
+ @Autowired
+ private HkSyncOrgUserServiceImpl hkSyncOrgUserService;
/**
* 鏄惁寮�鍙戣��
*/
@@ -41,7 +44,7 @@
*/
@Scheduled(fixedDelay= 60*1000)
public void syncOrgData() {
- hkSyncImgService.syncOrgData();
+ hkSyncOrgUserService.syncOrgData();
}
/**
* 瀹氭椂鍚屾鐢ㄦ埛淇℃伅鍒版捣搴风郴缁�
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 69242b4..4fe02c2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -61,8 +61,11 @@
public static final String ERP_APPROVE_URL ="ERP_APPROVE_URL" ;
public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ;
public static final String ERP ="ERP" ;
+ public static final Integer THREE =3 ;
public static boolean DEALING_HK_IMG = false;
+ public static boolean DEALING_HK_ORG = false;
+ public static boolean DEALING_HK_USER = false;
// ERP鎺ュ彛閰嶇疆
public static final String ERP_CONFIG = "ERP_CONFIG";
// ERP ACCESS_KEY
@@ -71,7 +74,6 @@
public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET";
// FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
- public static final String FTP_RESOURCE_PATH = "FTP_RESOURCE_PATH";
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
index 610c3ff..9aea7de 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
@@ -53,10 +53,10 @@
*/
@Override
public void syncOrgData(){
- if(Constants.DEALING_HK_IMG){
+ if(Constants.DEALING_HK_ORG){
return ;
}
- Constants.DEALING_HK_IMG =true;
+ Constants.DEALING_HK_ORG =true;
try {
//鏌ヨ鎵�鏈夐渶瑕佸悓姝ョ殑浼佷笟鏁版嵁
String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
@@ -112,7 +112,7 @@
}catch (Exception e){
e.printStackTrace();
}finally {
- Constants.DEALING_HK_IMG =false;
+ Constants.DEALING_HK_ORG =false;
}
}
--
Gitblit v1.9.3