From f2c26596b44cccea3276b25c665e4fd5238d6c88 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 09:29:58 +0800
Subject: [PATCH] 海康接口对接开发
---
server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 10 +
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java | 2
server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 5 +
server/openapi/src/main/resources/application.yml | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 4
server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java | 39 +++------
server/dmvisit_service/src/main/java/com/doumee/core/erp/ErpTool.java | 73 +++++++++++++----
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 1
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 7 +
server/dmvisit_service/src/main/java/com/doumee/core/utils/HttpsUtil.java | 50 ++++++++++++
10 files changed, 140 insertions(+), 53 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
index efcf4fc..c1e9dbf 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java
@@ -2,9 +2,13 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.pr.PreventRepeat;
+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.haikang.model.param.request.AcsDeviceListRequest;
import com.doumee.core.haikang.model.param.request.ParkListRequest;
import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.ERPSyncService;
import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
import com.doumee.service.business.impl.hksync.HkSyncPrivilegeServiceImpl;
@@ -25,36 +29,23 @@
@RestController
@RequestMapping("/business/erpsync")
public class ERPSyncController extends BaseController {
-
@Autowired
- private HkSyncDeviceServiceImpl hkSyncDeviceService;
- @Autowired
- private HkSyncParkServiceImpl hkSyncParkService;
- @Autowired
- private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;
+ private ERPSyncService erpSyncService;
@PreventRepeat
- @ApiOperation("銆怑RP銆戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
- @PostMapping("/syncDevices")
- //@RequiresPermissions("business:erpsync:device")
- public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
- String result = hkSyncDeviceService.syncHkDevices(param);
+ @ApiOperation("銆怑RP銆戝叏閲忓悓姝RP缁勭粐鎺ュ彛")
+ @PostMapping("/getCompanies")
+ //@RequiresPermissions("business:erpsync:company")
+ public ApiResponse getCompanies(@RequestBody OrgListRequest param) {
+ String result = erpSyncService.syncCompany(param);
return ApiResponse.success(result);
}
@PreventRepeat
- @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
- @PostMapping("/getParks")
-// @RequiresPermissions("business:hksync:park")
- public ApiResponse getParks(@RequestBody ParkListRequest param) {
- String result = hkSyncParkService.syncHkParks(param);
- return ApiResponse.success(result);
- }
- @PreventRepeat
- @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
- @PostMapping("/getPrivilege")
-// @RequiresPermissions("business:hksync:privilege")
- public ApiResponse getPrivilege(@RequestBody ParkListRequest param) {
- String result = hkSyncPrivilegeService.syncHkParks(param);
+ @ApiOperation("銆怑RP銆戝叏閲忓悓姝RP浜哄憳鎺ュ彛")
+ @PostMapping("/getUsers")
+// @RequiresPermissions("business:erpsync:users")
+ public ApiResponse getUsers(@RequestBody UserListRequest param) {
+ String result = erpSyncService.syncUsers(param);
return ApiResponse.success(result);
}
}
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 48b4bad..0ee8894 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
@@ -2,12 +2,14 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.HKTools;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.EventSubRequest;
import com.doumee.core.haikang.model.param.respose.OrgListResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import org.apache.commons.lang3.StringUtils;
@@ -27,6 +29,8 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private InterfaceLogService interfaceLogService;
@PostConstruct
public int initHkConfig(){
@@ -36,6 +40,7 @@
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;
//鑾峰彇鏍圭粍缁囩紪鐮�
getRootOrgCode();
//寮�濮嬭闃呴棬绂佷簨浠躲�佽瀹簨浠躲�佸拰鍋滆溅鍦轰簨浠�
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
index c7a57ca..e4fa49f 100644
--- 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
@@ -10,9 +10,14 @@
import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.HttpsUtil;
+import com.doumee.dao.business.model.Member;
+import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
+import java.util.ArrayList;
import java.util.List;
public class ErpTool {
@@ -23,17 +28,32 @@
* @return
*/
public static List<ErpOrgListResponse> getErpOrgList(String url, OrgListRequest param){
- String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
- if(StringUtils.isNotBlank(result)){
- TypeReference typeReference =
- new TypeReference<ERPApiResponse<List<ErpOrgListResponse>>>(){};
- ERPApiResponse<List<ErpOrgListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
- if(response!=null){
- return response.getData();
- }
- }
- return null;
+ List<ErpOrgListResponse> list = new ArrayList<>();
+ int page =1;
+ int pageSize = 100;
+ boolean hasLast = true;
+ while (hasLast){
+ hasLast = false;
+ PageWrap<OrgListRequest> pageWrap = new PageWrap<>();
+ pageWrap.setModel(param);
+ pageWrap.setPage(page);
+ pageWrap.setCapacity(pageSize);
+ String result = HttpsUtil.postJson(url, JSONObject.toJSONString(pageWrap));
+ if(StringUtils.isNotBlank(result)){
+ TypeReference typeReference =
+ new TypeReference<ERPApiResponse<PageData<ErpOrgListResponse>>>(){};
+ ERPApiResponse<PageData<ErpOrgListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
+ if(response!=null && response.getData()!=null&& response.getData().getRecords()!=null){
+ list.addAll(response.getData().getRecords());
+ if(100*pageSize < response.getData().getTotal() ){
+ hasLast =true;//杩樻湁涓嬩竴椤�
+ }
+ page++;
+ }
+ }
+ }
+ return list;
}
/**
@@ -43,16 +63,33 @@
* @return
*/
public static List<ErpUserListResponse> getErpUserList(String url, UserListRequest param){
- String result = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
- if(StringUtils.isNotBlank(result)){
- TypeReference typeReference =
- new TypeReference<ERPApiResponse<List<ErpUserListResponse>>>(){};
- ERPApiResponse<List<ErpUserListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
- if(response!=null){
- return response.getData();
+
+ List<ErpUserListResponse> list = new ArrayList<>();
+ int page =1;
+ int pageSize = 100;
+ boolean hasLast = true;
+ while (hasLast){
+ hasLast = false;
+ PageWrap<UserListRequest> pageWrap = new PageWrap<>();
+ pageWrap.setModel(param);
+ pageWrap.setPage(page);
+ pageWrap.setCapacity(pageSize);
+ String result = HttpsUtil.postJson(url, JSONObject.toJSONString(pageWrap));
+ if(StringUtils.isNotBlank(result)){
+ TypeReference typeReference =
+ new TypeReference<ERPApiResponse<PageData<ErpUserListResponse>>>(){};
+ ERPApiResponse<PageData <ErpUserListResponse>> response = JSONObject.parseObject(result, typeReference.getType());
+ if(response!=null && response.getData()!=null && response.getData().getRecords()!=null){
+ list.addAll(response.getData().getRecords());
+ if(100*pageSize < response.getData().getTotal() ){
+ hasLast =true;//杩樻湁涓嬩竴椤�
+ }
+ page++;
+ }
}
}
- return null;
+ return list;
+
}
/**
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 11507ce..221f827 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -51,9 +51,10 @@
System.out.println(content.toString());
}
+ public static InterfaceLogService interfaceLogService = null;
private static void saveInterfaceLog(String s, String result,Map<String, String> path) {
- InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class);
- if(bean !=null){
+// InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class);
+ if(interfaceLogService !=null){
InterfaceLog hkMonitoryLogDO=new InterfaceLog();
hkMonitoryLogDO.setType(0);
hkMonitoryLogDO.setCreateDate(new Date());
@@ -62,7 +63,7 @@
hkMonitoryLogDO.setRepose(result);
hkMonitoryLogDO.setName(path.get(HKConstants.https));
hkMonitoryLogDO.setUrl(HKConstants.https + ArtemisConfig.host+path.get(HKConstants.https));
- bean.create(hkMonitoryLogDO);
+ interfaceLogService.create(hkMonitoryLogDO);
}
}
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 6d6dc9c..c74af73 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
@@ -4,6 +4,7 @@
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.HttpURLConnection;
import java.net.URL;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
@@ -21,7 +22,11 @@
return connection(url, "POST", data, contentType, ignoreSSL);
}
public static String postJson(String url, String data) {
- return connection(url, "POST", data, "application/json", false);
+ if(url.startsWith("https://")){
+ return connection(url, "POST", data, "application/json", true);
+ }else{
+ return connectionHttp(url, "POST", data, "application/json");
+ }
}
public static String connection(String url,String method,String data,String contentType,boolean ignoreSSL){
@@ -82,6 +87,49 @@
}
return null;
}
+ public static String connectionHttp(String url,String method,String data,String contentType ){
+ HttpURLConnection connection = null;
+ try {
+ URL _url = new URL(url);
+ connection = (HttpURLConnection) _url.openConnection();
+ connection.setRequestMethod(method);
+ connection.setDoOutput(true);
+ connection.setDoInput(true);
+ connection.setUseCaches(false);
+ if(contentType != null){
+ connection.setRequestProperty("Content-Type", contentType);
+ }
+
+ connection.connect();
+
+ if(data != null){
+ OutputStream outputStream = connection.getOutputStream();
+ outputStream.write(data.getBytes("utf-8"));
+ outputStream.close();
+ }
+
+ int responseCode = connection.getResponseCode();
+ if (responseCode == HttpsURLConnection.HTTP_OK) {
+ InputStream is = connection.getInputStream();
+ byte[] b = new byte[4096];
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(b.length);
+ int len;
+ while ((len = is.read(b)) != -1) {
+ baos.write(b, 0, len);
+ }
+ is.close();
+ return baos.toString("utf-8");
+ }
+ return connection.getResponseMessage();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if(connection != null){
+ connection.disconnect();
+ }
+ }
+ return null;
+ }
public static void main(String[] args) {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index aeb6008..6b80601 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -118,8 +118,8 @@
@TableField(exist = false)
private String createrName;
- @ApiModelProperty(value = "涓嬪彂鐘舵�� 0寰呬笅鍙� 1宸蹭笅鍙� 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 ", example = "1")
- @ExcelColumn(name="涓嬪彂鐘舵��",index= 8,valueMapping ="0=寰呬笅鍙�;1=宸蹭笅鍙�;2=涓嬪彂鎴愬姛;3=宸插彇娑�;4=涓嬪彂澶辫触" )
+ @ApiModelProperty(value = "涓�鍗￠�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1浠诲姟鎵ц 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉� ", example = "1")
+ @ExcelColumn(name="涓嬪彂鐘舵��",index= 8,valueMapping ="0=寰呬笅鍙�;1=宸蹭笅鍙�;2=涓嬪彂鎴愬姛;3=宸插彇娑�;4=涓嬪彂澶辫触;5=浠诲姟涓嬭浇宸茬粨鏉�" )
private Integer sendStatus;
@ApiModelProperty(value = "涓嬪彂绫诲瀷 0瀹炴椂 1瀹氭椂 ", example = "1")
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 d16049c..5a6e7fa 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
@@ -221,6 +221,7 @@
company.setName(respone.getName());
company.setErpId(respone.getId());
company.setCreateDate(date);
+ company.setType(Constants.ONE);
company.setCode(respone.getCode());
company.setErpParentId(respone.getParentOrgId());
company.setErpDate(date);
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 8635604..03fafb7 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
@@ -186,7 +186,7 @@
OrgDelRequest request = new OrgDelRequest();
request.setIndexCodes( delHkIds.toArray(new String[]{}));
BaseResponse<List<OrgUpdateFailureResponse>> result = HKService.delBatchOrg(request);
- if(StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
List<String> fIds = new ArrayList<>();
if(result.getData()!=null){
for(OrgUpdateFailureResponse r : result.getData()){
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 14ea118..cc8cb5e 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
@@ -43,16 +43,18 @@
List<ErpOrgListResponse> list = new ArrayList<>();
String[] ids = new String[]{"","001","002","003"};
String[] names = new String[]{"","缁勭粐1","缁勭粐2","缁勭粐3"};
- for(int i=1;i<=4;i++){
+ for(int i=1;i<4;i++){
ErpOrgListResponse r = new ErpOrgListResponse();
r.setParentOrgId(ids[i-1]);
+ r.setId(ids[i]);
r.setCreateDate(new Date());
- r.setCode(UUID.randomUUID().toString());
+ r.setCode(ids[i]);
r.setStatus(Constants.ZERO);
r.setName(names[i]);
list.add(r);
}
IPage<ErpOrgListResponse> pageInfo = new Page<>(1,10,3);
+ pageInfo.setTotal(3);
pageInfo.setRecords(list);
PageData<ErpOrgListResponse> r = PageData.from( pageInfo);
return ERPApiResponse.success(r);
@@ -64,18 +66,20 @@
String[] ids = new String[]{"","1001","1002","1003"};
String[] names = new String[]{"","浜哄憳1","浜哄憳2","浜哄憳3"};
String[] orgs = new String[]{"","001","002","003"};
- for(int i=1;i<=4;i++){
+ for(int i=1;i<4;i++){
ErpUserListResponse r = new ErpUserListResponse();
r.setOrgId(orgs[i]);
r.setId(ids[i]);
r.setName(names[i-1]);
r.setCode( ids[i]);
+ r.setIsdeleted(Constants.ONE);
r.setName(names[i]);
r.setFaceImg("/20223402/"+r.getId()+".png");
list.add(r);
}
IPage<ErpUserListResponse> pageInfo = new Page<>(1,10,3);
pageInfo.setRecords(list);
+ pageInfo.setTotal(3);
PageData<ErpUserListResponse> r = PageData.from( pageInfo);
return ERPApiResponse.success(r);
}
diff --git a/server/openapi/src/main/resources/application.yml b/server/openapi/src/main/resources/application.yml
index aed8465..a81464d 100644
--- a/server/openapi/src/main/resources/application.yml
+++ b/server/openapi/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: test
+ active: dev
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3