From 1293d3dba10c4e291dfbce4c936f952875557edb Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 18:40:49 +0800
Subject: [PATCH] 配置信息对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 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);
--
Gitblit v1.9.3