moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台-封禁管理-封禁设备-优化判断

Browse Source
This commit is contained in:
khalil
2025-08-14 15:26:48 +08:00
parent 168fa60a70
commit bbfe7843db
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountBlockAdminService.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import com.accompany.admin.service.base.BaseService;
import com.accompany.business.service.AccountLoginRecordService;
import com.accompany.business.service.account.AccountBlockService;
import com.accompany.common.constant.Constant;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.core.constant.BlockStatusEnum;
@@ -78,7 +79,6 @@ public class AccountBlockAdminService extends BaseService {
String blockImgUrl, Byte blockDevice, Byte blockImgType) throws Exception {
List<AccountBlock> list = new ArrayList<>();
Map<String, AccountBlock> accountBlockMap = accountBlockService.mapValidByBlockValue(blockValueList);
List<Long> uids = new ArrayList<>();
for (String blockValue : blockValueList) {
AccountBlock accountBlock = new AccountBlock();
accountBlock.setBlockValue(blockValue);
@@ -92,7 +92,6 @@ public class AccountBlockAdminService extends BaseService {
throw new AdminServiceException("ID:" + blockValue + "不存在");
}
accountBlock.setBlockUid(erBanNo.getUid());
uids.add(erBanNo.getUid());
blockDesc = String.format("%s:%s" , blockValue, blockDesc);
}
accountBlock.setBlockStatus(1);
@@ -112,7 +111,7 @@ public class AccountBlockAdminService extends BaseService {
list.add(accountBlock);
}
List<AccountBlock> blockDevices = fillDevicesBlockByErbanNo(list, blockDesc, wallStatus, adminName, remark, blockImgUrl, blockImgType);
List<AccountBlock> blockDevices = fillDevicesBlockByErbanNo(list, blockDesc, wallStatus, adminName, remark);
if (CollectionUtils.isNotEmpty(blockDevices)) {
list.addAll(blockDevices);
}
@@ -126,11 +125,10 @@ public class AccountBlockAdminService extends BaseService {
return result;
}
public List<AccountBlock> fillDevicesBlockByErbanNo(List<AccountBlock> list, String blockDesc, Boolean wallStatus, String adminName, String remark,
String blockImgUrl, Byte blockImgType) {
public List<AccountBlock> fillDevicesBlockByErbanNo(List<AccountBlock> list, String blockDesc, Boolean wallStatus, String adminName, String remark) {
List<AccountBlock> blockDevices = new ArrayList<>();
for (AccountBlock block : list) {
if (block.getBlockType() != BlockTypeEnum.BLOCK_ACCOUNT.getValue() || block.getBlockDevice() != 1) {
if (block.getBlockType() != BlockTypeEnum.BLOCK_ACCOUNT.getValue() || !Constant.status.valid.equals(block.getBlockDevice())) {
continue;
}
List<String> recentLoginDevices = accountLoginRecordService.getRecentLoginDevices(DateUtil.offsetDay(new Date(), -30), block.getBlockUid());
@@ -145,7 +143,7 @@ public class AccountBlockAdminService extends BaseService {
// accountBlock.setBlockImgUrl(blockImgUrl);
// accountBlock.setBlockImgType(blockImgType);
accountBlock.setBlockType(BlockTypeEnum.BLOCK_DEVICE.getValue());
accountBlock.setBlockStatus(1);
accountBlock.setBlockStatus(Constant.Yes1No0.YES);
AccountBlock oldRecord = accountBlockMap.get(loginDevice);
if (oldRecord != null) {
accountBlock.setBlockDesc(String.format("%s+%s" , oldRecord.getBlockDesc(), blockDesc));
@@ -209,7 +207,7 @@ public class AccountBlockAdminService extends BaseService {
accountBlockService.deleteBlockedAccountCache(Arrays.asList(block));
}
if (needBlockDevice) {
List<AccountBlock> accountBlocks = fillDevicesBlockByErbanNo(Arrays.asList(block), blockDesc, wallStatus, adminName, remark, blockImgUrl, blockImgType);
List<AccountBlock> accountBlocks = fillDevicesBlockByErbanNo(Arrays.asList(block), blockDesc, wallStatus, adminName, remark);
accountBlockService.saveOrUpdateBatch(accountBlocks);
accountBlockService.saveBlockedAccountCache(accountBlocks);
accountBlockService.batchKickOut(accountBlocks);