From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 46323fb..0447e18 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
@@ -4,8 +4,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.HKResponseCode;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
@@ -19,14 +17,14 @@
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.*;
+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.MemberCard;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -551,9 +549,16 @@
List<Empower> successList = new ArrayList<>();
List<Empower> errorList = new ArrayList<>();
List<Empower> waitList = new ArrayList<>();
+ List<Empower> cancelList = new ArrayList<>();
List<Empower> faceErrorList = new ArrayList<>();
for(Empower c : list) {
//鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
+ if (Constants.equalsInteger(c.getDeviceDeleted(),Constants.ONE) ||
+ (Constants.equalsInteger(c.getMemberDeleted(), Constants.ONE) &&
+ Constants.equalsInteger(c.getMemberHkStatus(), Constants.ONE))){
+ cancelList.add(c);
+ continue;
+ }
if(c.getDeviceOnline() !=null && Constants.equalsInteger(c.getDeviceOnline(),0)){
waitList.add(c);
continue;
@@ -612,6 +617,20 @@
update.setSendStatus(Constants.EmpowerStatus.fail);
update.setRemark( "璁惧鐘舵�佸紓甯革紝绛夊緟閲嶆柊涓嬪彂");
update.setSendInfo( "璁惧鐘舵�佸紓甯革紝绛夊緟閲嶆柊涓嬪彂");
+ empowerMapper.updateById(update);
+ }
+ }
+ if(cancelList.size()>0){
+ for(Empower model : cancelList){
+ Empower update = new Empower();
+ update.setId(model.getId());
+ update.setSendDate(date);
+ update.setEditDate(date);
+ update.setHkId(taskId);
+ update.setFailFlag(Constants.ONE);
+ update.setSendStatus(Constants.EmpowerStatus.cancel);
+ update.setRemark( "璁惧鎴栦汉鍛樺凡鍒犻櫎锛屽彇娑堜笅鍙�");
+ update.setSendInfo( "璁惧鎴栦汉鍛樺凡鍒犻櫎锛屽彇娑堜笅鍙�");
empowerMapper.updateById(update);
}
}
@@ -773,7 +792,10 @@
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
queryWrapper.selectAs(Member::getFaceStatus,Empower::getMemberFaceStatus);
+ queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
queryWrapper.selectAs(Device::getOnline,Empower::getDeviceOnline);
+ queryWrapper.selectAs(Device::getIsdeleted,Empower::getDeviceDeleted);
+ queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
--
Gitblit v1.9.3