From f2c26596b44cccea3276b25c665e4fd5238d6c88 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 09:29:58 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 70 ++--------------------------------
1 files changed, 5 insertions(+), 65 deletions(-)
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 b201c67..87c31ce 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
@@ -147,7 +147,7 @@
Constants.DEALING_HK_EMPOWER =true;
try {
//鍏堝垹闄ゆ墍鏈夐渶瑕佸彇娑堟巿鏉冪殑鏁版嵁
-// dealDelListTask(getDealList(Constants.ONE));
+ dealDelListTask(getDealList(Constants.ONE));
//鏌ヨ鎵�鏈夐渶瑕佸悓姝ョ殑鏁版嵁
dealNewListTask(getDealList(Constants.ZERO));
}catch (Exception e){
@@ -206,7 +206,7 @@
if(list ==null || list.size()==0){
return;
}
- clearAllEmpowerFirst(list);
+// clearAllEmpowerFirst(list);
Date date = new Date();
//鍒涘缓浠诲姟
String taskId = hkTaskAddtion();
@@ -256,8 +256,8 @@
//鍒涘缓浠诲姟
String taskId = hkTaskAddtion();
for(Empower c : list) {
- //鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
- addTaskDataAll(c,taskId,allDevice);
+ //鍚戜换鍔″埅闄や汉鍛樼殑鎵�鏈夎澶囦俊鎭暟鎹�
+ addTaskDataAllDel(c.getHkId(),taskId,allDevice);
}
startTask(taskId);
}
@@ -295,67 +295,7 @@
return false;
}
}
- private boolean addTaskDataAll(Empower c,String taskId,List<Device> deviceList) {
- if(StringUtils.isBlank(c.getMemberHkId() )
- ||StringUtils.isBlank(c.getDeviceChannelNo())
- ||StringUtils.isBlank(c.getDeviceType())
- ||StringUtils.isBlank(c.getDeviceIndexCode())){
- //蹇呭～鍙傛暟鏍￠獙
- return false;
- }
- TaskDataAdditionRequest param = new TaskDataAdditionRequest();
- param.setTaskId(taskId);
- List<TaskDataAdditionResourceRequest> resourceInfos = new ArrayList<>();// object[] True 璧勬簮瀵硅薄
- for(Device d:deviceList){
- TaskDataAdditionResourceRequest res = new TaskDataAdditionResourceRequest();
- res.setChannelNos(d.getChannelNo().split(","));
- res.setResourceType(d.getResourceType());
- res.setResourceIndexCode(c.getDeviceIndexCode());
- resourceInfos.add(res);
- }
- List<TaskDataAdditionPersonRequest> personInfos = new ArrayList<>();
- TaskDataAdditionPersonRequest pinfo = new TaskDataAdditionPersonRequest();
- pinfo.setName(c.getMemberName());
- pinfo.setEndTime(DateUtil.getISO8601Timestamp(c.getEndTime()));
- pinfo.setStartTime(DateUtil.getISO8601Timestamp(c.getStartTime()));
- pinfo.setOperatorType(HKConstants.OPERA_TYPE.DEL.getKey());
- pinfo.setPersonId(c.getMemberHkId());
- param.setResourceInfos(resourceInfos);
- param.setPersonInfos(personInfos);
- BaseResponse response = HKService.taskDataAddition(param);
- if(response!=null
- && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
- return true;
- }else{
- return false;
- }
- }
- private boolean startTask(String taskId) {
- TaskProgressRequest param = new TaskProgressRequest();
- param.setTaskId(taskId);
- BaseResponse response = HKService.taskStart(param);
- if(response!=null
- && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
- return true;
- }else{
- return false;
- }
- }
-
- private String hkTaskAddtion() {
- TaskAdditionRequest param = new TaskAdditionRequest();
- param.setTaskType(HKConstants.TASK_TYPE.FACE.getKey());
- BaseResponse<TaskAdditionResponse> response = HKService.taskAddition(param);
- if(response!=null
- && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)
- && response.getData()!=null
- && StringUtils.isNotBlank(response.getData().getTaskId())){
- return response.getData().getTaskId();
- }else{
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "娴峰悍鍒涘缓涓嬭浇浠诲姟澶辫触==================");
- }
- }
private List<Empower> getDealList(int del ) {
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
@@ -367,7 +307,7 @@
queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.wait);
-// queryWrapper.eq( Empower::getIsdeleted,del);
+ queryWrapper.eq( Empower::getIsdeleted,del);
// queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
--
Gitblit v1.9.3