From 8b00bff78ba86989df613fcc7b09e7f64e135a52 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 二月 2024 11:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 145 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 112 insertions(+), 33 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 2a30a2e..55c23bb 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
@@ -12,12 +12,11 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.DeviceMapper;
+import com.doumee.dao.business.MemberCardMapper;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.join.EmpowerJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
-import com.doumee.dao.business.model.Device;
-import com.doumee.dao.business.model.Empower;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.Visits;
+import com.doumee.dao.business.model.*;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -39,7 +38,11 @@
@Autowired
private EmpowerJoinMapper empowerMapper;
@Autowired
+ private MemberMapper memberMapper;
+ @Autowired
private DeviceMapper deviceMapper;
+ @Autowired
+ private MemberCardMapper memberCardMapper;
/**
* 瀹氭椂鏌ヨ鏉冮檺涓嬪彂浠诲姟杩涘害鎵ц缁撴灉
@@ -104,6 +107,7 @@
}
}
+ checkDelMemberTask();
}catch (Exception e){
e.printStackTrace();
}finally {
@@ -111,6 +115,62 @@
}
}
+ /**
+ * 瀵规捣搴峰垹闄ょ粍缁囦俊鎭�
+ * @param id
+ * @param date
+ */
+ private boolean doHkDeleteUser(Integer id,String delHkIds, Date date ) {
+ if(StringUtils.isBlank(delHkIds)){
+ return true;
+ }
+ UserDelRequest request = new UserDelRequest();
+ request.setPersonIds(new String[]{delHkIds});
+ BaseResponse<List<UserDelResponse>> result = HKService.delBatchUser(request);
+ if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ List<String> fIds = new ArrayList<>();
+ //鏍囪鍒犻櫎鎴愬姛鐨勬暟鎹紙娴峰悍瀵规帴鐘舵�佷负宸插悓姝ワ紝锛屽悓姝ュけ璐ョ殑浠嶄负寰呭悓姝ワ紝绛変笅涓�娆＄户缁鐞嗭紝鐭ラ亾鍏ㄩ儴鍒犻櫎瀹屾瘯锛�
+ if(result.getData()!=null && result.getData().size()>0){
+ log.info("娴峰悍鍒犻櫎鐢ㄦ埛澶辫触锛�==============="+result.getData().get(0).getPersonId());
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .set(Member::getHkStatus,Constants.TWO)//鍚屾澶辫触
+ .set(Member::getHkDate,date)
+ .in(Member::getId, id));
+ }else{
+ //鏍囪鍒犻櫎鎴愬姛鐨勬暟鎹紙娴峰悍瀵规帴鐘舵�佷负宸插悓姝ワ紝锛屽悓姝ュけ璐ョ殑浠嶄负寰呭悓姝ワ紝绛変笅涓�娆＄户缁鐞嗭紝鐭ラ亾鍏ㄩ儴鍒犻櫎瀹屾瘯锛�
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .set(Member::getHkStatus,Constants.ONE)//鍚屾鎴愬姛
+ .set(Member::getHkDate,date)
+ .in(Member::getId, id));
+ //鍒犻櫎鎵�鏈夌粦瀹氱殑鍗＄墖淇℃伅
+ memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,id));
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * 妫�鏌ュ垹闄や汉鍛樼殑鏉冮檺鏄惁閮藉垹闄ゅ畬鎴愶紝濡傛灉鏉冮檺鍒犻櫎瀹屾垚锛� 杩涜娴峰悍浜哄憳鐨勫垹闄ゆ搷浣�
+ */
+ private void checkDelMemberTask() {
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .eq(Member::getIsdeleted,Constants.ONE)
+ .eq(Member::getHkStatus,Constants.FOUR));
+ if(memberList!=null &&memberList.size()>0 ){
+ Date date = new Date();
+ for(Member member : memberList){
+ if(empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .eq(Empower::getIsdeleted,Constants.ONE)
+ .ne(Empower::getSendStatus,Constants.EmpowerStatus.pass)) ==0){
+ //濡傛灉鏉冮檺閮藉凡缁忓垹闄ゆ垚鍔燂紝鍒欏垹闄ゆ捣搴蜂汉鍛樺拰鍗＄墖鏁版嵁
+ doHkDeleteUser(member.getId(),member.getHkId(),date);
+ }
+ }
+ }
+ }
+
public void syncEmpowerDetailDataOld(){
if(Constants.DEALING_HK_EMPOWER_DETAIL){
return ;
@@ -224,7 +284,28 @@
}
}
+ /**
+ * 鍒嗘璇锋眰涓嬪彂鏉冮檺
+ * @param list
+ */
private void dealDelListTask(List<Empower> list) {
+ int sublistSize = 100;
+ int startIndex = 0;
+ int endIndex = sublistSize;
+
+ while (startIndex < list.size()) {
+ if (endIndex > list.size()) {
+ endIndex = list.size();
+ }
+ List<Empower> sublist = list.subList(startIndex, endIndex);
+ if(sublist.size()>0){
+ dealDelListTaskDo(sublist);
+ }
+ startIndex = endIndex;
+ endIndex += sublistSize;
+ }
+ }
+ private void dealDelListTaskDo(List<Empower> list) {
//鎸夌収鐖剁骇鐢宠鍒嗘壒澶勭悊姣忔鐢宠鏁版嵁
if(list ==null || list.size()==0){
return;
@@ -232,43 +313,41 @@
Date date = new Date();
//鍒涘缓浠诲姟
String taskId = hkTaskAddtion();
- List<Empower> successList = new ArrayList<>();
- List<Empower> errorList = new ArrayList<>();
+ List<Integer> successList = new ArrayList<>();
+ List<Integer> errorList = new ArrayList<>();
for(Empower c : list) {
//鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
if(addTaskData(c,taskId,HKConstants.OPERA_TYPE.DEL.getKey())){
- successList.add(c);
+ successList.add(c.getId());
}else{
- errorList.add(c);
+ errorList.add(c.getId());
}
}
if(successList.size()>0){
//寮�濮嬫墽琛屼笅鍙�
boolean status = startTask(taskId);
- for(Empower model : successList){
- Empower update = new Empower();
- update.setId(model.getId());
- update.setSendDate(date);
- update.setEditDate(date);
- update.setHkId(taskId);
- update.setRemark(status?"涓嬪彂浠诲姟鎵ц鎴愬姛":"涓嬪彂浠诲姟鎵ц澶辫触");
- update.setSendInfo(status?"涓嬪彂浠诲姟鎵ц鎴愬姛":"涓嬪彂浠诲姟鎵ц澶辫触");
- //涓嬪彂涓�
- update.setSendStatus(status?Constants.EmpowerStatus.ing:Constants.EmpowerStatus.fail);
- empowerMapper.updateById(update);
- }
+ empowerMapper.update(null,new UpdateWrapper<Empower>()
+ .lambda()
+ .set(Empower::getSendDate,date)
+ .set(Empower::getEditDate,date)
+ .set(Empower::getSendStatus,status?Constants.EmpowerStatus.ing:Constants.EmpowerStatus.fail)
+ .set(Empower::getHkId,taskId)
+ .set(Empower::getSendInfo,status?"涓嬪彂浠诲姟鎵ц鎴愬姛":"涓嬪彂浠诲姟鎵ц澶辫触")
+ .set(Empower::getRemark,status?"涓嬪彂浠诲姟鎵ц鎴愬姛":"涓嬪彂浠诲姟鎵ц澶辫触")
+ .set(Empower::getEditDate,date)
+ .in(Empower::getId,successList));
}
- for(Empower model : errorList){
- Empower update = new Empower();
- update.setId(model.getId());
- update.setSendDate(date);
- update.setEditDate(date);
- update.setHkId(taskId);
- update.setSendStatus(Constants.EmpowerStatus.fail);
- update.setSendInfo( "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触");
- update.setRemark( "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触");
- empowerMapper.updateById(update);
- }
+
+ empowerMapper.update(null,new UpdateWrapper<Empower>()
+ .lambda()
+ .set(Empower::getSendStatus,Constants.EmpowerStatus.fail)
+ .set(Empower::getSendDate,date)
+ .set(Empower::getEditDate,date)
+ .set(Empower::getHkId,taskId)
+ .set(Empower::getSendInfo, "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触")
+ .set(Empower::getRemark, "娣诲姞涓嬪彂浠诲姟鏁版嵁鍒櫎鎺堟潈澶辫触")
+ .set(Empower::getEditDate,date)
+ .in(Empower::getId,errorList));
}
private void dealNewListTask(List<Empower> list) {
@@ -407,13 +486,13 @@
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
- queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
+ queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.downloaded);
+ queryWrapper.isNotNull(Member::getHkId) ;
queryWrapper.orderByAsc(Empower::getSendDate);
- queryWrapper.isNotNull(Empower::getMemberHkId) ;
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
}
--
Gitblit v1.9.3