From 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 三月 2024 18:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 95 +++++++++++++++++++++--------------------------
1 files changed, 42 insertions(+), 53 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 a0b2d69..7e4ad77 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
@@ -52,33 +52,29 @@
* 瀹氭椂鏌ヨ鏉冮檺涓嬪彂浠诲姟杩涘害鎵ц缁撴灉
*/
@Override
- public void syncEmpowerDetailData(){
- if(Constants.DEALING_HK_EMPOWER_DETAIL){
- return ;
- }
- Constants.DEALING_HK_EMPOWER_DETAIL = true;
- try {
+ public Integer syncEmpowerDetailData(Integer endId){
+// if(Constants.DEALING_HK_EMPOWER_DETAIL){
+// return ;
+// }
+// Constants.DEALING_HK_EMPOWER_DETAIL = true;
//鏌ヨ鎵�鏈夊畬鎴愪笅杞斤紝寰呮煡璇㈢粨鏋滅殑鏁版嵁璁板綍
- List<Empower> list = getDealListDetail();
+ List<Empower> list = getDealListDetail(endId);
if(list == null || list.size() ==0){
- return;
+ return null;
}
- Thread t1=new Thread(new Runnable() {
- @Override
- public void run() {
- try {
+ Thread t1=new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
for(Empower c : list){
TaskPersonDetailRequest param = new TaskPersonDetailRequest();
param.setPageNo(1);
- param.setPageSize(100);
-// param.setPersonIds(new ArrayList<>());
-
+ param.setPageSize(10);
param.setPersonIds(new String[]{c.getMemberHkId()});
param.setTaskId(c.getHkId());
TaskDataAdditionResourceRequest rec = new TaskDataAdditionResourceRequest();
rec.setResourceIndexCode(c.getDeviceIndexCode());
rec.setResourceType(c.getDeviceType());
-// rec.setChannelNos(c.getDeviceChannelNo().split(","));
param.setResourceInfo(rec);
//鏌ヨ涓嬪彂鐘舵��
BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
@@ -123,15 +119,13 @@
//濡傛灉鏄凡鍒犻櫎鐨勬暟鎹紝涓嬪彂澶辫触锛堥槻姝㈣澶囩绾匡級锛屽垯灏濊瘯閲嶆柊涓嬪彂浠诲姟
if(Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
// && Constants.formatIntegerNum(c.getTryNum())+1 < tryNum ){
- empowerMapper.update(null, new UpdateWrapper<Empower>()
+ /* empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
.eq(Empower::getId, c.getId())
.set(Empower::getRemark, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
-// .set(Empower::getHkId,null)
-// .set(Empower::getSendDate,null)
.set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
.set(Empower::getSendInfo, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
- .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));
+ .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));*/
empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
.eq(Empower::getId, c.getId())
@@ -150,21 +144,19 @@
checkDelMemberTask(c.getMemberId());
}
}
- }catch (Exception e){
+ }catch (Exception e){
- }finally {
- Constants.DEALING_HK_EMPOWER_DETAIL=false;
- }
+ }finally {
+// Constants.DEALING_HK_EMPOWER_DETAIL=false;
}
- });
- t1.start();
-
-
- }catch (Exception e){
- e.printStackTrace();
- }
+ }
+ });
+ t1.start();
+ return list.get(list.size()-1).getId();
}
+
+
/**
* 瀵规捣搴峰垹闄ょ粍缁囦俊鎭�
* @param id
@@ -226,7 +218,7 @@
Constants.DEALING_HK_EMPOWER_DETAIL = true;
try {
//鏌ヨ鎵�鏈夊畬鎴愪笅杞斤紝寰呮煡璇㈢粨鏋滅殑鏁版嵁璁板綍
- List<Empower> list = getDealListDetail();
+ List<Empower> list = getDealListDetail(0);
if(list == null || list.size() ==0){
return;
}
@@ -272,16 +264,15 @@
* 瀹氭椂鏌ヨ鏉冮檺涓嬪彂浠诲姟杩涘害鎵ц缁撴灉
*/
@Override
- public void syncEmpowerResultData(){
- if(Constants.DEALING_HK_EMPOWER_RESULT){
- return ;
- }
- Constants.DEALING_HK_EMPOWER_RESULT=true;
- try {
+ public Integer syncEmpowerResultData(Integer endId){
+// if(Constants.DEALING_HK_EMPOWER_RESULT){
+// return null ;
+// }
+// Constants.DEALING_HK_EMPOWER_RESULT=true;
//鏌ヨ鎵�鏈夋墽琛屼腑寰楁暟鎹�
- List<Empower> list = getIngTaskListResult();
+ List<Empower> list = getIngTaskListResult(Constants.formatIntegerNum(endId));
if(list == null || list.size() ==0){
- return;
+ return null;
}
Thread t1=new Thread(new Runnable() {
@Override
@@ -315,9 +306,8 @@
}
});
t1.start();
- }catch (Exception e){
- e.printStackTrace();
- }
+ return list.get(list.size()-1).getId();
+
}
@@ -331,7 +321,6 @@
// return null ;
// }
// Constants.DEALING_HK_EMPOWER =true;
- try {
//鍏堝垹闄ゆ墍鏈夐渶瑕佸彇娑堟巿鏉冪殑鏁版嵁
List<Empower> allList =getAllWaitDealList( endId);
if(allList !=null && allList.size()>0){
@@ -360,12 +349,6 @@
t1.start();
return allList.get(allList.size()-1).getId();
}
-
- }catch (Exception e){
- e.printStackTrace();
- }finally {
-// Constants.DEALING_HK_EMPOWER =false;
- }
return null;
}
@Override
@@ -631,7 +614,7 @@
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
}
- private List<Empower> getDealListDetail() {
+ private List<Empower> getDealListDetail(int endId ) {
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
@@ -642,17 +625,23 @@
queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.downloaded);
queryWrapper.isNotNull(Member::getHkId) ;
+ queryWrapper.gt(Empower::getId,endId);
queryWrapper.orderByAsc(Empower::getSendDate);
+ queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
}
- private List<Empower> getIngTaskListResult() {
+ private List<Empower> getIngTaskListResult(int endId) {
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Empower.class);
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.ing);
+ queryWrapper.gt(Empower::getId,endId);
queryWrapper.groupBy(Empower::getHkId);
- List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
+ queryWrapper.orderByAsc(Empower::getSendDate);
+ queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
+ List<Empower> list = empowerMapper.selectList(queryWrapper);
return list;
}
+
}
--
Gitblit v1.9.3