From 755b60c531999e9d3c0a94759a2a5e92f5e4ad4e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 25 三月 2024 14:18:01 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 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 d9c6ddd..d94d165 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
@@ -132,12 +132,14 @@
.eq(Empower::getId, c.getId())
.set(Empower::getRemark, "鍒犻櫎鏉冮檺涓嬪彂澶辫触")
.set(Empower::getSendInfo, "鍒犻櫎鏉冮檺涓嬪彂澶辫触")
+ .set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
.set(Empower::getSendStatus, Constants.EmpowerStatus.fail));
}else{
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.fail));
}
@@ -321,28 +323,40 @@
List<Empower> allList =getAllFailDealList( endId);
if(allList!=null && allList.size()>0){
Date date = new Date();
+ List<Integer> retryIds = new ArrayList<>();
+ List<Integer> noIds = new ArrayList<>();
for(Empower empower:allList){
- if(Constants.equalsObject(empower.getIsdeleted(),Constants.ONE)){
- //濡傛灉鏄垹闄ょ殑鏉冮檺涓嬪彂锛屾煡璇㈡槸鍚︿己鍊欐湁涓嬪彂鎴愬姛鐨勬暟鎹紝濡傛灉鏈夛紝鍒欎笉澶勭悊
- Empower param = empowerMapper.selectOne(new QueryWrapper<Empower>().lambda()
- .eq(Empower::getMemberId,empower.getMemberId())
- .eq(Empower::getDeviceId,empower.getDeviceId() )
- .gt(Empower::getId,empower.getId())
- .last("limit 1"));
- if(empower ==null || Constants.equalsInteger(empower.getIsdeleted(),Constants.ONE)){
-// addIds.add(did);
- }
+ //濡傛灉鏄垹闄ょ殑鏉冮檺涓嬪彂锛屾煡璇㈡槸鍚︿己鍊欐湁涓嬪彂鎴愬姛鐨勬暟鎹紝濡傛灉鏈夛紝鍒欎笉澶勭悊
+ if(empower.getId().equals(392479)){
+ System.out.println("============================");
}
- //鏇存柊閲嶆柊涓嬪彂娆℃暟
+// int flag= empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
+// .eq(Empower::getMemberId,empower.getMemberId())
+// .eq(Empower::getDeviceId,empower.getDeviceId() )
+// .gt(Empower::getId,empower.getId())
+// .last("limit 1"));
+ if(empower.getTempCouunt() ==0){
+ //濡傛灉涔嬪悗鏃堕棿鍐呭張閲嶆柊涓嬪彂璁板綍锛屽垯璺宠繃涓嶅仛澶勭悊
+ retryIds.add(empower.getId());
+ }else{
+ noIds.add(empower.getId());
+ }
+ }
+
+ if(retryIds.size()>0){
empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
- .eq(Empower::getEditDate,date)
- .setSql("try_num = ifnull(tyr_num,0) +1" )
+ .set(Empower::getCreateDate,date)
.set(Empower::getSendStatus,Constants.EmpowerStatus.wait)
- .set(Empower::getSendDate,null)
.set(Empower::getEditDate,date)
.set(Empower::getRemark,"涓嬪彂澶辫触锛屽緟閲嶆柊涓嬪彂~")
- .set(Empower::getRemark,"涓嬪彂澶辫触锛屽緟閲嶆柊涓嬪彂~")
- .eq(Empower::getId,empower.getId()));
+ .set(Empower::getSendInfo,"涓嬪彂澶辫触锛屽緟閲嶆柊涓嬪彂~")
+ .in(Empower::getId,retryIds));
+ }
+ if(noIds.size()>0){
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .set(Empower::getEditDate,date)
+ .set(Empower::getFailFlag,Constants.ONE)
+ .in(Empower::getId,noIds));
}
return allList.get(allList.size()-1).getId();
}
@@ -631,22 +645,14 @@
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
}
- private List<Empower> getAllFailDealList(int endId ) {
+ private List<Empower> getAllFailDealList(int endId ) {
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.selectAll(Empower.class);
- queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
- queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
- queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
- queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
- queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
- queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
- queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
- queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
+ queryWrapper.select(Empower::getId,Empower::getMemberId,Empower::getDeviceId,Empower::getIsdeleted);
+ queryWrapper.select(" (select count(1) from empower ee where ee.member_id=t.MEMBER_ID and ee.device_id =t.DEVICE_ID and ee.id>t.id) as tempCouunt");
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.fail);
queryWrapper.gt(Empower::getId,endId);
queryWrapper.orderByAsc(Empower::getId );
-// queryWrapper.orderByAsc(Empower::getCreateDate );
- queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
+ queryWrapper.ne( Empower::getFailFlag,Constants.ONE);
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
}
--
Gitblit v1.9.3