From 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 16:33:36 +0800
Subject: [PATCH] 导出字段对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 96 +++++++++++-------------------------------------
1 files changed, 22 insertions(+), 74 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..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
@@ -147,7 +151,7 @@
Constants.DEALING_HK_EMPOWER =true;
try {
//鍏堝垹闄ゆ墍鏈夐渶瑕佸彇娑堟巿鏉冪殑鏁版嵁
-// dealDelListTask(getDealList(Constants.ONE));
+ dealDelListTask(getDealList(Constants.ONE));
//鏌ヨ鎵�鏈夐渶瑕佸悓姝ョ殑鏁版嵁
dealNewListTask(getDealList(Constants.ZERO));
}catch (Exception e){
@@ -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);
}
}
@@ -206,7 +211,7 @@
if(list ==null || list.size()==0){
return;
}
- clearAllEmpowerFirst(list);
+// clearAllEmpowerFirst(list);
Date date = new Date();
//鍒涘缓浠诲姟
String taskId = hkTaskAddtion();
@@ -256,8 +261,8 @@
//鍒涘缓浠诲姟
String taskId = hkTaskAddtion();
for(Empower c : list) {
- //鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
- addTaskDataAll(c,taskId,allDevice);
+ //鍚戜换鍔″埅闄や汉鍛樼殑鎵�鏈夎澶囦俊鎭暟鎹�
+ addTaskDataAllDel(c.getHkId(),taskId,allDevice);
}
startTask(taskId);
}
@@ -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,70 +299,11 @@
&& StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)){
return true;
}else{
- 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{
+ c.setRemark("娣诲姞浜哄憳銆佽澶囬�氶亾鏉冮檺涓嬪彂鏁版嵁澶辫触"+(response!=null?response.getMsg():""));
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 +315,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;
@@ -379,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