From 87ec373c158f7fa4c65fb037822fe7142a6fd5e7 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 26 三月 2024 16:46:32 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 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 d94d165..ae2b0f8 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
@@ -81,7 +81,7 @@
BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
if(response!=null
&& StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null
- ) {
+ ){
if (response.getData().getList() != null
&& response.getData().getList().size() > 0) {
TaskPersonDetailResponse model = response.getData().getList().get(0);
@@ -108,6 +108,10 @@
.set(Empower::getRemark, remark)
.set(Empower::getSendInfo, remark)
.set(Empower::getSendStatus, Constants.EmpowerStatus.pass));
+ if(Constants.equalsInteger(c.getMemberDeleted(), Constants.ONE)&& Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
+ //濡傛灉鏄垹闄ゆ潈闄愭垚鍔燂紝妫�鏌ユ槸鍚﹀垹闄や汉鍛�
+ checkDelMemberTask(c.getMemberId(),c.getMemberHkId());
+ }
} else {
empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
@@ -119,14 +123,6 @@
} else {
//濡傛灉鏄凡鍒犻櫎鐨勬暟鎹紝涓嬪彂澶辫触锛堥槻姝㈣澶囩绾匡級锛屽垯灏濊瘯閲嶆柊涓嬪彂浠诲姟
if(Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
-// && Constants.formatIntegerNum(c.getTryNum())+1 < tryNum ){
- /* empowerMapper.update(null, new UpdateWrapper<Empower>()
- .lambda()
- .eq(Empower::getId, c.getId())
- .set(Empower::getRemark, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
- .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
- .set(Empower::getSendInfo, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
- .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));*/
empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
.eq(Empower::getId, c.getId())
@@ -144,7 +140,15 @@
.set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
}
}
- checkDelMemberTask(c.getMemberId());
+ }else if(response!=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_DOWNLOAD_ERROR) ){
+ empowerMapper.update(null, new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId, c.getId())
+ .set(Empower::getRemark, "涓嬪彂澶辫触")
+// .set(Empower::getFailFlag, Constants.ONE)//鏃犻渶閲嶅彂锛堜笅杞戒换鍔′笉瀛樺湪锛�
+ .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
+ .set(Empower::getSendInfo, "涓嬪彂澶辫触")
+ .set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
}
}
}catch (Exception e){
@@ -186,7 +190,7 @@
//鏍囪鍒犻櫎鎴愬姛鐨勬暟鎹紙娴峰悍瀵规帴鐘舵�佷负宸插悓姝ワ紝锛屽悓姝ュけ璐ョ殑浠嶄负寰呭悓姝ワ紝绛変笅涓�娆＄户缁鐞嗭紝鐭ラ亾鍏ㄩ儴鍒犻櫎瀹屾瘯锛�
memberMapper.update(null,new UpdateWrapper<Member>().lambda()
.set(Member::getHkStatus,Constants.ONE)//鍚屾鎴愬姛
- .set(Member::getRemark,"鍚屾娴峰悍鍒犻櫎澶辫触")//鍚屾澶辫触
+ .set(Member::getRemark,"宸插悓姝�")//鍚屾澶辫触
.set(Member::getHkDate,date)
.in(Member::getId, id));
//鍒犻櫎鎵�鏈夌粦瀹氱殑鍗＄墖淇℃伅
@@ -200,17 +204,18 @@
/**
* 妫�鏌ュ垹闄や汉鍛樼殑鏉冮檺鏄惁閮藉垹闄ゅ畬鎴愶紝濡傛灉鏉冮檺鍒犻櫎瀹屾垚锛� 杩涜娴峰悍浜哄憳鐨勫垹闄ゆ搷浣�
*/
- private void checkDelMemberTask(Integer memberId) {
+ private void checkDelMemberTask(Integer memberId,String memberHkid) {
Date date = new Date();
- Member member = memberMapper.selectById(memberId);
- if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
+// Member member = memberMapper.selectById(memberId);
+// if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
if(empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
- .eq(Empower::getMemberId,member.getId())
+ .eq(Empower::getMemberId,memberId)
.eq(Empower::getIsdeleted,Constants.ONE)
+ .ne(Empower::getFailFlag,Constants.ONE)
.ne(Empower::getSendStatus,Constants.EmpowerStatus.pass)) ==0){
//濡傛灉鏉冮檺閮藉凡缁忓垹闄ゆ垚鍔燂紝鍒欏垹闄ゆ捣搴蜂汉鍛樺拰鍗＄墖鏁版嵁
- doHkDeleteUser(member.getId(),member.getHkId(),date);
- }
+ doHkDeleteUser(memberId,memberHkid,date);
+// }
}
}
@@ -336,9 +341,9 @@
// .gt(Empower::getId,empower.getId())
// .last("limit 1"));
if(empower.getTempCouunt() ==0){
- //濡傛灉涔嬪悗鏃堕棿鍐呭張閲嶆柊涓嬪彂璁板綍锛屽垯璺宠繃涓嶅仛澶勭悊
retryIds.add(empower.getId());
}else{
+ //濡傛灉涔嬪悗鏃堕棿鍐呭張閲嶆柊涓嬪彂璁板綍锛屽垯璺宠繃涓嶅仛澶勭悊
noIds.add(empower.getId());
}
}
@@ -355,6 +360,8 @@
if(noIds.size()>0){
empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
.set(Empower::getEditDate,date)
+ .set(Empower::getRemark,"涓嬪彂澶辫触锛屽凡澶辨晥~")
+ .set(Empower::getSendInfo,"涓嬪彂澶辫触锛屽凡澶辨晥~")
.set(Empower::getFailFlag,Constants.ONE)
.in(Empower::getId,noIds));
}
@@ -680,6 +687,7 @@
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
+ queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
--
Gitblit v1.9.3