From 72b4263800a376a998455d4ef11ed2321282a1e9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 17:21:30 +0800
Subject: [PATCH] 海康接口对接开发
---
server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 1
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/AuthItemListRequest.java | 5 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 9 +++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 26 ++++++++----
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java | 11 -----
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 3 +
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 7 +--
8 files changed, 35 insertions(+), 29 deletions(-)
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 221f827..9a2cae0 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
@@ -518,12 +518,11 @@
*/
public static String authItemList(String body) {
Map<String, String> path = getPath(HKConstants.InterfacePath.authItemList);
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
+ Map<String, String> header = new HashMap<>();
+ header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path);
return result;
}
-
-
-
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/AuthItemListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/AuthItemListRequest.java
index c6bfa3d..02336dc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/AuthItemListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/AuthItemListRequest.java
@@ -7,8 +7,9 @@
@Data
public class AuthItemListRequest {
- private List<AuthItemListPersonRequest> personIds;//string True
- private TaskDataAdditionResourceRequest resourceInfos;// object[] False 璧勬簮璁惧瀵硅薄淇℃伅
+// private List<AuthItemListPersonRequest> personIds;//string True
+ private String[] personIds;//string True
+ private List<TaskDataAdditionResourceRequest> resourceInfos;// object[] False 璧勬簮璁惧瀵硅薄淇℃伅
private String queryType ;//string True 鏌ヨ璧勬簮绫诲瀷锛屽弬鑰冮檮褰旳.50 璁惧閫氶亾绫诲瀷
private Integer[] personStatus;// number[] False 浜哄憳鐘舵��0锛氬凡閰嶇疆鏈笅杞�1锛氭洿鏂板緟涓嬭浇2锛氭洿鏂板緟鍒犻櫎3锛氬凡涓嬭浇4锛氭湭閰嶇疆
private Integer[] cardStatus;// number[] False 鍗＄墖鐘舵��0锛氬凡閰嶇疆鏈笅杞�1锛氭洿鏂板緟涓嬭浇2锛氭洿鏂板緟鍒犻櫎3锛氬凡涓嬭浇4锛氭湭閰嶇疆
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 8ea609a..ea9dc00 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -84,7 +84,7 @@
String res = HKTools.delOrg(JSONObject.toJSONString(param));
TypeReference typeReference =
- new TypeReference< BaseResponse<List<OrgUpdateFailureResponse>> >(){};
+ new TypeReference< BaseResponse >(){};
BaseResponse<List<OrgUpdateFailureResponse>> result = JSONObject.parseObject(res, typeReference.getType());
logResult(result,"娴峰悍鍒犻櫎缁勭粐");
return result;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
index 4226cb0..945bf10 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
@@ -88,6 +88,9 @@
@ApiModelProperty(value = "閫氶亾鍙�")
@ExcelColumn(name="閫氶亾鍙�")
private String channelNo;
+ @ApiModelProperty(value = "閫氶亾鍚嶇О闆嗗悎")
+ @ExcelColumn(name="閫氶亾鍚嶇О闆嗗悎")
+ private String channelInfo;
@ApiModelProperty(value = "璁惧绫诲瀷缂栫爜")
@ExcelColumn(name="璁惧绫诲瀷缂栫爜")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
index 1559ca8..230a9bb 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
@@ -59,16 +59,5 @@
@ExcelColumn(name="瑙掕壊缂栫爜锛堝叧鑱攄oor_role)")
private String roleId;
- @ApiModelProperty(value = "娴峰悍鏍囪瘑")
- @ExcelColumn(name="娴峰悍鏍囪瘑")
- private String hkId;
-
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
- private Integer hkStatus;
-
- @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- private Date hkDate;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
index 6e24bd8..a0f5433 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -179,7 +179,7 @@
model.setManufature(device.getManufacturer());
model.setType(Constants.ZERO);
// model.setNo(device.getDevSerialNum());
- model.setChannelNo(getChannelNo(device.getIndexCode(),hkDoorList));
+ model.setChannelNo(getChannelNo(device.getIndexCode(),hkDoorList,model));
model.setResourceType(device.getResourceType());
model.setDevTypeCode(device.getDevTypeCode());
model.setManufature(device.getManufacturer());
@@ -188,8 +188,9 @@
return model;
}
- private String getChannelNo(String indexCode, List<DoorsInfoResponse> hkDoorList) {
+ private String getChannelNo(String indexCode, List<DoorsInfoResponse> hkDoorList,Device model ) {
String str = "";
+ String names = "";
if(hkDoorList!=null && hkDoorList.size()>0){
for(DoorsInfoResponse info : hkDoorList){
if(StringUtils.equals(indexCode,info.getParentIndexCode())){
@@ -198,11 +199,15 @@
}
if(StringUtils.isNotBlank(str)){
str += ",";
+ names += ",";
}
str+=info.getChannelNo();
+ names+=info.getName();
}
}
}
+ model.setChannelNo(str);
+ model.setChannelInfo(names);
return str;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 87c31ce..6c8114f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -60,17 +60,21 @@
AuthItemListRequest param = new AuthItemListRequest();
param.setPageNo(1);
param.setPageSize(100);
- param.setPersonIds(new ArrayList<>());
- AuthItemListPersonRequest p = new AuthItemListPersonRequest();
- p.setPersonIds(c.getMemberHkId());
- param.getPersonIds().add(p);
+// param.setPersonIds(new ArrayList<>());
+// AuthItemListPersonRequest p = new AuthItemListPersonRequest();
+// p.setPersonIds(c.getMemberHkId());
+ param.setPersonIds(new String[]{c.getMemberHkId()});
+ param.setQueryType(c.getDeviceType());
TaskDataAdditionResourceRequest rec = new TaskDataAdditionResourceRequest();
rec.setResourceIndexCode(c.getDeviceIndexCode());
rec.setResourceType(c.getDeviceType());
rec.setChannelNos(c.getDeviceChannelNo().split(","));
- param.setResourceInfos(rec);
+ List<TaskDataAdditionResourceRequest> resourceRequests = new ArrayList<>();
+
+ resourceRequests.add(rec);
+// param.setResourceInfos(resourceRequests);
//鏌ヨ宸蹭笅杞�
- param.setPersonStatus(new Integer[]{3});
+// param.setPersonStatus(new Integer[]{3});
//鏌ヨ涓嬪彂鐘舵��
BaseResponse<AuthItemListResponse> response = HKService.authItemList(param);
if(response!=null
@@ -184,9 +188,10 @@
update.setSendDate(date);
update.setEditDate(date);
update.setHkId(taskId);
- update.setRemark(status?"涓嬪彂浠诲姟鎴愬姛":"涓嬪彂浠诲姟澶辫触");
+ update.setRemark(status?"涓嬪彂浠诲姟鎵ц鎴愬姛":"涓嬪彂浠诲姟鎵ц澶辫触");
//涓嬪彂涓�
update.setSendStatus(status?Constants.EmpowerStatus.ing:Constants.EmpowerStatus.fail);
+ empowerMapper.updateById(update);
}
}
for(Empower model : errorList){
@@ -196,7 +201,7 @@
update.setEditDate(date);
update.setHkId(taskId);
update.setSendStatus(Constants.EmpowerStatus.fail);
- update.setRemark( "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触");
+// update.setRemark( "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触");
empowerMapper.updateById(update);
}
}
@@ -268,6 +273,7 @@
||StringUtils.isBlank(c.getDeviceType())
||StringUtils.isBlank(c.getDeviceIndexCode())){
//蹇呭～鍙傛暟鏍￠獙
+ c.setRemark("璁惧淇℃伅涓嶆敮鎸佹巿鏉冧笅鍙戯紝妫�鏌ヤ汉鍛樻槸鍚﹀凡涓嬪彂娴峰悍鎴栬�呰澶囨槸鍚︺�愯澶囩被鍨嬨�侀�氶亾鍙枫�戞槸鍚﹀畬鍠�");
return false;
}
TaskDataAdditionRequest param = new TaskDataAdditionRequest();
@@ -285,6 +291,7 @@
pinfo.setStartTime(DateUtil.getISO8601Timestamp(c.getStartTime()));
pinfo.setOperatorType(type);
pinfo.setPersonId(c.getMemberHkId());
+ personInfos.add(pinfo);//
param.setResourceInfos(resourceInfos);
param.setPersonInfos(personInfos);
BaseResponse response = HKService.taskDataAddition(param);
@@ -292,6 +299,7 @@
&& StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
return true;
}else{
+ c.setRemark("娣诲姞浜哄憳銆佽澶囬�氶亾鏉冮檺涓嬪彂鏁版嵁澶辫触"+(response!=null?response.getMsg():""));
return false;
}
}
@@ -319,7 +327,7 @@
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
- queryWrapper.selectAs(Device::getDevTypeCode,Empower::getDeviceType);
+ queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.downloaded);
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
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 433c418..fcb986a 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
@@ -76,6 +76,7 @@
r.setIdNo("34112219880427042"+i);
r.setPhone("1534569000"+i);
r.setStatus(Constants.ZERO);
+ r.setRoleIds(new Integer[]{21+(i%2)});
r.setName(names[i]);
r.setFaceImg("/20223402/"+r.getId()+".png");
list.add(r);
--
Gitblit v1.9.3