From aee2c99d29a0dd3d01eb477c8bfa0f175ff4bd71 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十二月 2023 14:47:47 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/AccessTokenResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 3
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/VisitEventListResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ParkListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 3
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 188 ++++++++++++++++--
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpConstants.java | 8
server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 34 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 6
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/RoleListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/DoorEventListResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ApproveInfoResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserFailRequest.java | 6
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java | 3
server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java | 4
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/UserListRespone.java | 10
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserAuthorRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserInfoRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java | 20 +
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/OrgUpdateRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/utils/HttpsUtil.java | 3
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ERPApiResponse.java | 130 +++++++++++++
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/ParkListResponse.java | 2
server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java | 4
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/TokenRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 6
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/VisitListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarEventListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/DeviceListResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/CarEventListResponse.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/OrgListRequest.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java | 5
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 95 +++++++++
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/OrgListRespone.java | 6
42 files changed, 492 insertions(+), 90 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpConstants.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpConstants.java
new file mode 100644
index 0000000..5371bad
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpConstants.java
@@ -0,0 +1,8 @@
+package com.doumee.core.erp;
+
+public class ErpConstants {
+ public static String orgListUrl;
+ public static String userListUrl;
+ public static String approveUrl;
+ public static String userStatusUrl;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
new file mode 100644
index 0000000..a2ea405
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java
@@ -0,0 +1,95 @@
+package com.doumee.core.erp;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.doumee.core.erp.model.openapi.request.erp.ApproveAddRequest;
+import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
+import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest;
+import com.doumee.core.erp.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
+import com.doumee.core.erp.model.openapi.response.erp.OrgListRespone;
+import com.doumee.core.erp.model.openapi.response.erp.UserListRespone;
+import com.doumee.core.utils.HttpsUtil;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+
+public class ErpTool {
+ /**
+ * 鍚屾缁勭粐
+ * @param url
+ * @param param
+ * @return
+ */
+ public static List<OrgListRespone> getErpOrgList(String url,OrgListRequest param){
+ String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
+ if(StringUtils.isNotBlank(result)){
+ TypeReference typeReference =
+ new TypeReference<ERPApiResponse<List<OrgListRespone>>>(){};
+ ERPApiResponse<List<OrgListRespone>> response = JSONObject.parseObject(result, typeReference.getType());
+ if(response!=null){
+ return response.getData();
+ }
+ }
+ return null;
+
+ }
+
+ /**
+ * 鍚屾浜哄憳
+ * @param url
+ * @param param
+ * @return
+ */
+ public static List<UserListRespone> getErpUserList(String url, UserListRequest param){
+ String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
+ if(StringUtils.isNotBlank(result)){
+ TypeReference typeReference =
+ new TypeReference<ERPApiResponse<List<UserListRespone>>>(){};
+ ERPApiResponse<List<UserListRespone>> response = JSONObject.parseObject(result, typeReference.getType());
+ if(response!=null){
+ return response.getData();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 瀹℃壒鎻愪氦
+ * @param url
+ * @param param
+ * @return
+ */
+ public static ApproveInfoResponse submitApprove(String url, ApproveAddRequest param){
+ String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
+ if(StringUtils.isNotBlank(result)){
+ TypeReference typeReference =
+ new TypeReference<ERPApiResponse<ApproveInfoResponse>>(){};
+ ERPApiResponse<ApproveInfoResponse> response = JSONObject.parseObject(result, typeReference.getType());
+ if(response!=null && response.isSuccess()){
+ return response.getData();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 閫氱煡浜哄憳鍚屾澶辫触
+ * @param url
+ * @param param
+ * @return
+ */
+ public static ERPApiResponse noticeUserStatus(String url, UserFailRequest param){
+ String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
+ if(StringUtils.isNotBlank(result)){
+ TypeReference typeReference =
+ new TypeReference<ERPApiResponse>(){};
+ ERPApiResponse response = JSONObject.parseObject(result, typeReference.getType());
+ if(response!=null){
+ return response;
+ }
+ }
+ return null;
+ }
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ApproveNoticeRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java
similarity index 92%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ApproveNoticeRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java
index 881e16f..e4a886a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ApproveNoticeRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarAuthorRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java
similarity index 95%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarAuthorRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java
index ebea39a..89c2a51 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarAuthorRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarEventListRequest.java
similarity index 94%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarEventListRequest.java
index 9bdd2f0..0c36a60 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/CarEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarEventListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.java
similarity index 94%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.java
index 5268119..4807f2d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/DoorEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/OrgUpdateRequest.java
similarity index 95%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/OrgUpdateRequest.java
index 206af61..1299f30 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/OrgUpdateRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/OrgUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ParkListRequest.java
similarity index 90%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ParkListRequest.java
index 707073f..0ef9e71 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/ParkListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/ParkListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/RoleListRequest.java
similarity index 90%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/RoleListRequest.java
index 5735992..2401cbd 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/RoleListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/RoleListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/TokenRequest.java
similarity index 88%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/TokenRequest.java
index 71dbbab..5cc86c3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/TokenRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/TokenRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserAuthorRequest.java
similarity index 94%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserAuthorRequest.java
index 37f017b..058d2c1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserAuthorRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserAuthorRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java
similarity index 96%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java
index 9e26308..5f60374 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/UserUpdateRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/VisitListRequest.java
similarity index 96%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/VisitListRequest.java
index e476921..41a0f27 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/VisitListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/VisitListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request;
+package com.doumee.core.erp.model.openapi.request;
import com.doumee.core.haikang.model.param.BaseRequst;
import io.swagger.annotations.ApiModel;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/ApproveAddRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java
similarity index 95%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/ApproveAddRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java
index 925b498..7fcbec5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/ApproveAddRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request.erp;
+package com.doumee.core.erp.model.openapi.request.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/OrgListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/OrgListRequest.java
similarity index 93%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/OrgListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/OrgListRequest.java
index d9558f1..595c366 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/OrgListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/OrgListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request.erp;
+package com.doumee.core.erp.model.openapi.request.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/MemberFailRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserFailRequest.java
similarity index 82%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/MemberFailRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserFailRequest.java
index c6c52f2..0282a76 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/MemberFailRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserFailRequest.java
@@ -1,10 +1,8 @@
-package com.doumee.core.model.openapi.request.erp;
+package com.doumee.core.erp.model.openapi.request.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
/**
* @author 姹熻箘韫�
@@ -12,7 +10,7 @@
*/
@Data
@ApiModel(value = "鍛樺伐鍚屾澶辫触鎺ㄩ�佽姹傚弬鏁�" )
-public class MemberFailRequest {
+public class UserFailRequest {
@ApiModelProperty(value = "鍛樺伐id" )
private String userId;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserInfoRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserInfoRequest.java
similarity index 93%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserInfoRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserInfoRequest.java
index 10de9c9..7feb315 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserInfoRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserInfoRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request.erp;
+package com.doumee.core.erp.model.openapi.request.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java
similarity index 94%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserListRequest.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java
index 2dd2496..059b2c3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/request/erp/UserListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.request.erp;
+package com.doumee.core.erp.model.openapi.request.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/AccessTokenResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/AccessTokenResponse.java
similarity index 89%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/AccessTokenResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/AccessTokenResponse.java
index cec9091..cc086da 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/AccessTokenResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/AccessTokenResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.response;
+package com.doumee.core.erp.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/CarEventListResponse.java
similarity index 97%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/CarEventListResponse.java
index fcbcd76..4f4a60e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/CarEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/CarEventListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.response;
+package com.doumee.core.erp.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DeviceListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/DeviceListResponse.java
similarity index 89%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DeviceListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/DeviceListResponse.java
index a617aed..80a98af 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DeviceListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/DeviceListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.response;
+package com.doumee.core.erp.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/DoorEventListResponse.java
similarity index 96%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/DoorEventListResponse.java
index f786218..4acbb65 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/DoorEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/DoorEventListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.response;
+package com.doumee.core.erp.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/ParkListResponse.java
similarity index 90%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/ParkListResponse.java
index fce5f57..82fd6fd 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/ParkListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/ParkListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.response;
+package com.doumee.core.erp.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/RoleListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java
similarity index 92%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/RoleListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java
index f09dbb2..58ee28e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/RoleListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/RoleListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.response;
+package com.doumee.core.erp.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/VisitEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/VisitEventListResponse.java
similarity index 96%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/VisitEventListResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/VisitEventListResponse.java
index 14b7290..69d0d2f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/VisitEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/VisitEventListResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.response;
+package com.doumee.core.erp.model.openapi.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/ApproveInfoResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ApproveInfoResponse.java
similarity index 91%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/ApproveInfoResponse.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ApproveInfoResponse.java
index e6e9ac0..deda22e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/ApproveInfoResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ApproveInfoResponse.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.response.erp;
+package com.doumee.core.erp.model.openapi.response.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ERPApiResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ERPApiResponse.java
new file mode 100644
index 0000000..e29d99a
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/ERPApiResponse.java
@@ -0,0 +1,130 @@
+package com.doumee.core.erp.model.openapi.response.erp;
+
+import com.doumee.core.constants.ResponseStatus;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.springframework.http.HttpStatus;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Serializable;
+
+/**
+ * 鎺ュ彛杩斿洖瀵硅薄
+ * @author Eva.Caesar Liu
+ * @date 2023/03/21 14:49
+ */
+@ApiModel("ERP鍝嶅簲瀵硅薄")
+@Data
+@AllArgsConstructor
+public class ERPApiResponse<T> implements Serializable {
+
+ @ApiModelProperty(value = "鍝嶅簲鐮�")
+ private int code;
+
+ @ApiModelProperty(value = "璇锋眰鏄惁鎴愬姛")
+ private boolean success;
+
+ @ApiModelProperty(value = "閿欒娑堟伅")
+ private String message;
+
+ @ApiModelProperty(value = "鏁版嵁")
+ private T data;
+
+ @ApiModelProperty(value = "寮傚父娑堟伅")
+ private String exception;
+
+ public ERPApiResponse() {}
+
+ /**
+ * 璇锋眰鎴愬姛
+ */
+ public static <T> ERPApiResponse<T> success(T data) {
+ return ERPApiResponse.success("璇锋眰鎴愬姛", data);
+ }
+
+ /**
+ * 璇锋眰鎴愬姛
+ */
+ public static <T> ERPApiResponse<T> success(String message, T data) {
+ return new ERPApiResponse<>(HttpStatus.OK.value(), Boolean.TRUE, message, data, null);
+ }
+
+ /**
+ * 璇锋眰澶辫触
+ */
+ public static <T> ERPApiResponse<T> failed(String message) {
+ return ERPApiResponse.failed(HttpStatus.INTERNAL_SERVER_ERROR.value(), message);
+ }
+
+ /**
+ * 璇锋眰澶辫触
+ */
+ public static <T> ERPApiResponse<T> failed(ResponseStatus status) {
+ return ERPApiResponse.failed(status.getCode(), status.getMessage());
+ }
+
+ /**
+ * 璇锋眰澶辫触
+ */
+ public static <T> ERPApiResponse<T> failed(ResponseStatus status, Throwable ex) {
+ return ERPApiResponse.failed(status.getCode(), status.getMessage(), ex);
+ }
+
+ /**
+ * 璇锋眰澶辫触
+ */
+ public static <T> ERPApiResponse<T> failed(Integer code, String message) {
+ return ERPApiResponse.failed(code, message, null);
+ }
+
+ /**
+ * 璇锋眰澶辫触
+ */
+ public static <T> ERPApiResponse<T> failed(Integer code, String message, Throwable ex) {
+ if (ex == null) {
+ return new ERPApiResponse<>(code, Boolean.FALSE, message, null, null);
+ }
+ // 澶勭悊寮傚父鏍堬紝闃叉杩囧鍐呭瀵艰嚧鍝嶅簲鍐呭杩囧ぇ
+ StackTraceElement[] trace = ex.getStackTrace();
+ StringBuilder exceptionStack = new StringBuilder(ex + "\n");
+ for (StackTraceElement traceElement : trace) {
+ exceptionStack.append("\tat ").append(traceElement).append("\n");
+ if (exceptionStack.length() > 5000) {
+ break;
+ }
+ }
+ return new ERPApiResponse<>(code, Boolean.FALSE, message, null, exceptionStack.toString());
+ }
+
+
+
+ public static void outputCode(HttpServletResponse response, String code) {
+ String ret ="code=" + code + "";
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ out.println(ret);
+ out.flush();
+ out.close();
+ }
+ public static void outputCode(HttpServletResponse response, int code,String msg) {
+ String ret = "{\"code\":" + code + ",\"message\":\"" + msg + "\"}";
+ // PrintWriter out = null;
+ try {
+ response.getOutputStream().write(ret.getBytes("UTF-8"));
+ // out = response.getWriter();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ // out.write(ret);
+ // out.flush();
+ // out.close();
+ }
+}
\ No newline at end of file
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/OrgListRespone.java
similarity index 86%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/OrgListRespone.java
index af00fa9..e4f6bf5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/OrgListRespone.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/OrgListRespone.java
@@ -1,4 +1,4 @@
-package com.doumee.core.model.openapi.response.erp;
+package com.doumee.core.erp.model.openapi.response.erp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +14,7 @@
@ApiModel("缁勭粐淇℃伅鍚屾杩斿洖淇℃伅")
public class OrgListRespone {
@ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
- private Integer id;
+ private String id;
@ApiModelProperty(value = "鍚嶇О" )
private String name;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�",example = "0")
@@ -29,5 +29,7 @@
private String parentOrgId;
@ApiModelProperty(value = "璐熻矗浜虹紪鐮�")
private String headId;
+ @ApiModelProperty(value = "缁勭粐浠ｇ爜")
+ private String code;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/UserListRespone.java
similarity index 84%
rename from server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java
rename to server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/UserListRespone.java
index f5a15f1..165f570 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/model/openapi/response/erp/UserListRespone.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/erp/UserListRespone.java
@@ -1,9 +1,16 @@
-package com.doumee.core.model.openapi.response.erp;
+package com.doumee.core.erp.model.openapi.response.erp;
+import com.doumee.core.constants.ResponseStatus;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import org.springframework.http.HttpStatus;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -45,4 +52,5 @@
private List<String> cardList;
@ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑" )
private Integer[] roleIds;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index a7db94a..9d6d3c8 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -8,7 +8,8 @@
@Data
public class HKConstants {
public static final String IMG_INDEX ="HKIMG=" ;
- public static final String IMG_INDEX_ERROR ="HKIMG=ERROR=" ;
+ public static final String IMG_INDEX_ERROR ="HKIMG_ERROR=" ;
+ public static final String RES_INDEX = "DM_";
private Logger logger = LoggerFactory.getLogger(HKConstants.class);
//娴峰悍骞冲彴鏍规嵁鐜板満鐜閰嶇疆http杩樻槸https
public static final String RESPONSE_SUCCEE = "0";
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 84e1f7f..abc5f81 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
@@ -56,6 +56,12 @@
public static final String FTP_USERNAME ="FTP_USERNAME" ;
public static final String FTP_PWD ="FTP_PWD" ;
public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
+ public static final String ERP_ORGLIST_URL ="ERP_ORGLIST_URL" ;
+ public static final String ERP_USERLIST_URL ="ERP_USERLIST_URL" ;
+ 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 boolean DEALING_HK_IMG = false;
// ERP鎺ュ彛閰嶇疆
public static final String ERP_CONFIG = "ERP_CONFIG";
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/HttpsUtil.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
index 09bea1e..6d6dc9c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/HttpsUtil.java
@@ -20,6 +20,9 @@
public static String post(String url, String data, String contentType, boolean ignoreSSL) {
return connection(url, "POST", data, contentType, ignoreSSL);
}
+ public static String postJson(String url, String data) {
+ return connection(url, "POST", data, "application/json", false);
+ }
public static String connection(String url,String method,String data,String contentType,boolean ignoreSSL){
HttpsURLConnection connection = null;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
index edc21fa..6ed1e68 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/CompanyMapper.java
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Company;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
*/
public interface CompanyMapper extends BaseMapper<Company> {
+ void insertBatchSomeColumn(List<Company> addList);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index c69f152..82ea543 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -85,7 +85,7 @@
@ApiModelProperty(value = "浼佷笟浠ｇ爜")
@ExcelColumn(name="浼佷笟浠ｇ爜")
- private Integer code;
+ private String code;
@ApiModelProperty(value = "涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@ExcelColumn(name="涓婄骇缁勭粐缂栫爜锛堣嚜鍏宠仈锛�")
@@ -114,6 +114,9 @@
@ApiModelProperty(value = "ERP鏍囪瘑")
@ExcelColumn(name="ERP鏍囪瘑")
private String erpId;
+ @ApiModelProperty(value = "ERP鐖剁骇缁勭粐鏍囪瘑")
+ @ExcelColumn(name="ERP鐖剁骇缁勭粐鏍囪瘑")
+ private String erpParentId;
@ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
@ExcelColumn(name="璐熻矗浜虹紪鐮�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
index 06d371a..cfda4ca 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
@@ -2,8 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.openapi.request.RoleListRequest;
-import com.doumee.core.model.openapi.response.RoleListResponse;
+import com.doumee.core.erp.model.openapi.request.RoleListRequest;
+import com.doumee.core.erp.model.openapi.response.RoleListResponse;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.web.response.DeviceRoleVO;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
index f2802b8..c87d6f1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ERPSyncService.java
@@ -1,14 +1,13 @@
package com.doumee.service.business;
+import com.doumee.core.erp.model.openapi.request.erp.*;
+import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.openapi.request.*;
-import com.doumee.core.model.openapi.request.erp.OrgListRequest;
-import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
-import com.doumee.core.model.openapi.request.erp.UserListRequest;
-import com.doumee.core.model.openapi.response.*;
+import com.doumee.core.erp.model.openapi.request.*;
+import com.doumee.core.erp.model.openapi.response.*;
import java.util.List;
@@ -18,6 +17,12 @@
* @date 2023/11/30 15:33
*/
public interface ERPSyncService {
+
+ /**
+ * 鍔犺浇榛樿鍙傛暟
+ * @return
+ */
+ int initHkConfig();
/**
* 鍚屾ERP缁勭粐淇℃伅
* @param param
@@ -33,12 +38,13 @@
String syncUsers(UserListRequest param);
+
/**
- * 鑾峰彇ERP浜哄憳淇℃伅
+ * 鎻愪氦鐢ㄦ埛鍚屾澶辫触璁板綍
* @param param
* @return
*/
- String syncUserInfo(UserInfoRequest param);
+ boolean noticeUserFail(UserFailRequest param);
/**
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 7f95229..77b11b7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.openapi.response.AccessTokenResponse;
+import com.doumee.core.erp.model.openapi.response.AccessTokenResponse;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index a5b0b7d..870df5f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -5,9 +5,9 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.openapi.request.RoleListRequest;
-import com.doumee.core.model.openapi.response.DeviceListResponse;
-import com.doumee.core.model.openapi.response.RoleListResponse;
+import com.doumee.core.erp.model.openapi.request.RoleListRequest;
+import com.doumee.core.erp.model.openapi.response.DeviceListResponse;
+import com.doumee.core.erp.model.openapi.response.RoleListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DeviceMapper;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index cd6e234..af53c9d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.IdcardUtil;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.erp.ErpTool;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.HKTools;
@@ -196,6 +197,8 @@
}
private String startSendErpCheck(Visits visits) {
+ //TODO ------------RK--------------
+// ErpTool.submitApprove()
return null;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 7886100..7c59fe5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -2,54 +2,54 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.erp.ErpConstants;
+import com.doumee.core.erp.ErpTool;
+import com.doumee.core.erp.model.openapi.request.erp.*;
+import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
-import com.doumee.core.haikang.model.param.request.DoorsListRequest;
-import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
-import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.OrgAddRequest;
+import com.doumee.core.haikang.model.param.request.OrgDelRequest;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.openapi.request.*;
-import com.doumee.core.model.openapi.request.erp.OrgListRequest;
-import com.doumee.core.model.openapi.request.erp.UserInfoRequest;
-import com.doumee.core.model.openapi.request.erp.UserListRequest;
-import com.doumee.core.model.openapi.response.*;
-import com.doumee.core.model.openapi.response.erp.OrgListRespone;
+import com.doumee.core.erp.model.openapi.request.*;
+import com.doumee.core.erp.model.openapi.response.*;
+import com.doumee.core.erp.model.openapi.response.erp.OrgListRespone;
+import com.doumee.core.erp.model.openapi.response.erp.UserListRespone;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.redis.RedisUtil;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.CarEventJoinMapper;
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.model.*;
-import com.doumee.dao.web.reqeust.CheckVisitedDTO;
-import com.doumee.dao.web.response.MemberVO;
-import com.doumee.service.business.*;
+import com.doumee.service.business.ERPSyncService;
+import com.doumee.service.business.InterfaceLogService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
+import com.hikvision.artemis.sdk.config.ArtemisConfig;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpServletResponse;
+import javax.annotation.PostConstruct;
import java.util.*;
import java.util.stream.Collectors;
@@ -94,7 +94,7 @@
@Autowired
private MemberMapper memberMapper;
-
+
@Autowired
private MemberRoleMapper memberRoleMapper;
@@ -107,15 +107,145 @@
@Autowired
private InterfaceLogService interfaceLogService;
+
+ @Override
+ @PostConstruct
+ public int initHkConfig(){
+ ErpConstants.approveUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_APPROVE_URL).getCode();
+ ErpConstants.orgListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_ORGLIST_URL).getCode();
+ ErpConstants.userListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERSTATUS_RL).getCode();
+ ErpConstants.userStatusUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERSTATUS_RL).getCode();
+ return 0;
+ }
/**
* 鍚屾ERP缁勭粐淇℃伅
* @param param
* @return
*/
@Override
+ @Transactional
public String syncCompany(OrgListRequest param){
- List<OrgListRespone> allList = new ArrayList<>();
+ //鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級
+ List<OrgListRespone> list = ErpTool.getErpOrgList(ErpConstants.orgListUrl,param);
+ if(list !=null && list.size()>0){
+ List<Company> addList = new ArrayList<>();
+ List<Company> updateList = new ArrayList<>();
+ List<Integer> delIds = new ArrayList<>();
+ List<Company> allList = companyMapper.selectList(new QueryWrapper<Company>().lambda().eq(Company::getType,Constants.ONE));
+ dealCompanyChangeList(list,addList,updateList,delIds,allList);
+ if(addList.size()>0){
+ companyMapper.insertBatchSomeColumn(addList);
+ }
+ if(updateList.size()>0){
+ for(Company c : updateList){
+ companyMapper.updateById(c);
+ }
+ }
+ if(delIds.size()>0){
+ //鍒犻櫎鎵�鏈夐渶瑕佸垹闄ょ殑缁勭粐淇℃伅(閫昏緫鍒犻櫎锛�
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda().set(Company::getIsdeleted, Constants.ONE).in(Company::getId,delIds));
+ }
+ return "鍚屾鏁版嵁锛氭柊澧炪��"+addList.size()+"銆戞潯锛屾洿鏂般��"+updateList.size()+"銆戞潯锛屽垹闄ゃ��"+delIds.size()+"銆戞潯";
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾ERP鏁版嵁涓虹┖锛�");
+ }
+ }
+ /**
+ * 鏍规嵁鍚屾erp鐨勭粍缁囦俊鎭皝瑁� 缁勭粐鏂板銆佷慨鏀瑰拰鍒犻櫎鐨勯泦鍚堜俊鎭�
+ * @param list
+ * @param addList
+ * @param updateList
+ * @param delIds
+ * @param allList
+ */
+ private void dealCompanyChangeList(List<OrgListRespone> list, List<Company> addList, List<Company> updateList, List<Integer> delIds, List<Company> allList) {
+ Date date = new Date();
+ for(OrgListRespone respone : list){
+ //鏍规嵁erpid鏌ヨ浼佷笟淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
+ Company company = findCompanyByERPId(allList,respone.getId());
+ if(company == null){
+ //濡傛灉鏄柊澧�
+ if(Constants.formatIntegerNum(respone.getIsdeleted()) == Constants.ONE){
+ continue;
+ }
+ //灏佽鏂板缁勭粐瀵硅薄鏁版嵁
+ addList.add(getAddCompanyModel(respone,date));
+ }else{
+ //濡傛灉鏄洿鏂�
+ if(Constants.formatIntegerNum(respone.getIsdeleted()) == Constants.ONE){
+ //濡傛灉宸插垹闄わ紝鍔犲叆鍒犻櫎闆嗗悎涓�
+ delIds.add(company.getId());
+ continue;
+ }
+ updateList.add(addUpdateCompanyModel(respone,company,date));
+ }
+ }
+ if(allList!=null && allList.size()>0){
+ for(Company c : allList){
+ if(isCompanyDeleted(c,list)){
+ delIds.add(c.getId());
+ }
+ }
+ }
+
+ }
+
+ /**
+ * 鏂板缁勭粐瀵硅薄
+ * @param respone
+ * @param company
+ * @param date
+ * @return
+ */
+ private Company addUpdateCompanyModel(OrgListRespone respone,Company company,Date date) {
+ company.setName(respone.getName());
+ company.setErpId(respone.getId());
+ company.setEditDate(date);
+ company.setStatus(respone.getStatus());
+ company.setCode(respone.getCode());
+ company.setErpParentId(respone.getParentOrgId());
+ company.setErpDate(date);
+ company.setHkStatus(Constants.ZERO);
+ return company;
+ }
+ /**
+ * 鏇存柊缁勭粐瀵硅薄
+ * @param respone
+ * @param date
+ * @return
+ */
+ private Company getAddCompanyModel(OrgListRespone respone, Date date) {
+ Company company = new Company();
+ company.setIsdeleted(Constants.ZERO);
+ company.setName(respone.getName());
+ company.setErpId(respone.getId());
+ company.setCreateDate(date);
+ company.setCode(respone.getCode());
+ company.setErpParentId(respone.getParentOrgId());
+ company.setErpDate(date);
+ //娴峰悍鏁版嵁
+ company.setHkId(HKConstants.RES_INDEX+UUID.randomUUID().toString());
+ return company;
+ }
+
+ private boolean isCompanyDeleted(Company c, List<OrgListRespone> list) {
+ for(OrgListRespone m : list){
+ if(StringUtils.equals(c.getErpId(),m.getId())){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private Company findCompanyByERPId(List<Company> allList, String id) {
+ if(allList!=null){
+ for(Company com :allList){
+ if(StringUtils.equals(com.getErpId(),id)){
+ return com;
+ }
+ }
+ }
return null;
}
@@ -126,19 +256,25 @@
*/
@Override
public String syncUsers(UserListRequest param){
+ //TODO----------------RK------------------
+ List<UserListRespone> allList = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
return null;
}
+
/**
- * 鑾峰彇ERP浜哄憳淇℃伅
+ * 鎻愪氦鐢ㄦ埛鍚屾澶辫触璁板綍
* @param param
* @return
*/
@Override
- public String syncUserInfo(UserInfoRequest param){
- return null;
+ public boolean noticeUserFail(UserFailRequest param){
+ ERPApiResponse r = ErpTool.noticeUserStatus(ErpConstants.userStatusUrl,param);
+ if(r!=null && r.isSuccess()){
+ return true;
+ }
+ return false;
}
-
@Override
public AccessTokenResponse createERPToken(String accessKey, String accessSecret){
diff --git a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
index 17abf6a..09cd5b7 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java
@@ -7,8 +7,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.openapi.request.*;
-import com.doumee.core.model.openapi.response.*;
+import com.doumee.core.erp.model.openapi.request.*;
+import com.doumee.core.erp.model.openapi.response.*;
import com.doumee.core.utils.Constants;
import com.doumee.service.business.DeviceRoleService;
import com.doumee.service.business.DeviceService;
diff --git a/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
index a89ee60..3aa4aa3 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
@@ -1,15 +1,15 @@
package com.doumee.api.web;
+import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.haikang.model.param.respose.OrgListResponse;
-import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.openapi.request.erp.ApproveAddRequest;
-import com.doumee.core.model.openapi.request.erp.MemberFailRequest;
-import com.doumee.core.model.openapi.request.erp.OrgListRequest;
-import com.doumee.core.model.openapi.request.erp.UserListRequest;
-import com.doumee.core.model.openapi.response.erp.ApproveInfoResponse;
-import com.doumee.core.model.openapi.response.erp.UserListRespone;
+import com.doumee.core.erp.model.openapi.request.erp.ApproveAddRequest;
+import com.doumee.core.erp.model.openapi.request.erp.UserFailRequest;
+import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest;
+import com.doumee.core.erp.model.openapi.request.erp.UserListRequest;
+import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
+import com.doumee.core.erp.model.openapi.response.erp.UserListRespone;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -34,31 +34,31 @@
public class ErpResourceController extends ApiController{
@ApiOperation(value = "鍏ㄩ噺缁勭粐淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴缁勭粐淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�")
@PostMapping("/org/list")
- public ApiResponse<PageData<OrgListResponse>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) {
- return ApiResponse.success(null);
+ public ERPApiResponse<PageData<OrgListResponse>> orgList (@RequestBody PageWrap<OrgListRequest> pageWrap) {
+ return ERPApiResponse.success(null);
}
@ApiOperation(value = "鍏ㄩ噺浜哄憳淇℃伅鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢鎷夊彇鍏ㄩ儴浜哄憳淇℃伅锛岀敤浜庡垵濮嬪寲鍙婂懆鏈熸�ф暟鎹牳鏌�")
@PostMapping("/user/list")
- public ApiResponse<PageData<UserListRespone>> userList (@RequestBody PageWrap<UserListRequest> pageWrap) {
- return ApiResponse.success(null);
+ public ERPApiResponse<PageData<UserListRespone>> userList (@RequestBody PageWrap<UserListRequest> pageWrap) {
+ return ERPApiResponse.success(null);
}
@ApiOperation(value = "璁垮鐢宠鎻愪氦瀹℃壒鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾彁浜よ瀹㈢敵璇蜂俊鎭�,鎺ュ彛鎻愪氦鎴愬姛锛孍RP绔繑鍥炲鎵硅褰曠紪鐮�")
@PostMapping("/event/approve/apply")
- public ApiResponse<String> approveApply(@RequestBody ApproveAddRequest param ) {
- return ApiResponse.success(UUID.randomUUID().toString());
+ public ERPApiResponse<String> approveApply(@RequestBody ApproveAddRequest param ) {
+ return ERPApiResponse.success(UUID.randomUUID().toString());
}
@ApiOperation(value = "璁垮鐢宠瀹℃壒缁撴灉鏌ヨ鎺ュ彛", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屾煡璇㈣瀹㈢敵璇峰鎵圭粨鏋�")
@GetMapping("/approve/info")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "瀹℃壒璁板綍鍞竴鏍囪瘑", required = true)
})
- public ApiResponse<ApproveInfoResponse> approveInfo(@RequestParam String id ) {
- return ApiResponse.success(null );
+ public ERPApiResponse<ApproveInfoResponse> approveInfo(@RequestParam String id ) {
+ return ERPApiResponse.success(null );
}
@ApiOperation(value = "鍛樺伐鍚屾澶辫触鎺ㄩ�佹帴鍙�", notes = "ERP绔彁渚涳紝渚涜瀹㈢璋冪敤锛屽憡鐭rp鍛樺伐淇℃伅鍚屾澶辫触鐨勬暟鎹�")
@PostMapping("/member/fail")
- public ApiResponse<ApproveInfoResponse> memberFail(@RequestBody List<MemberFailRequest> param) {
- return ApiResponse.success(null );
+ public ERPApiResponse memberFail(@RequestBody List<UserFailRequest> param) {
+ return ERPApiResponse.success(null );
}
}
--
Gitblit v1.9.3