diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java index 3cd8b539..476c4eb9 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/GenderConversionTask.java @@ -2,6 +2,7 @@ package com.baiye.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.text.csv.CsvData; import cn.hutool.core.text.csv.CsvReader; @@ -70,9 +71,12 @@ public class GenderConversionTask { Long lastId = list.get(list.size() - DefaultNumberConstants.ONE_NUMBER).getId(); // 去除重复并转换相应的格式 List stringList = list.stream().filter(source -> StringUtils.isNotBlank(source.getNid())).map - (source -> AESUtils.dbEncrypt(AdPlatFormConstants.AES_PASSWORD, Objects.requireNonNull(AESUtils.decrypt(source.getNid(), - AdPlatFormConstants.AD_PLATFORM)))) - .distinct().collect(Collectors.toList()); + (source -> { + String decrypt = AESUtils.decrypt(source.getNid(), AdPlatFormConstants.AD_PLATFORM); + return StringUtils.isNotBlank(decrypt) ? + AESUtils.dbEncrypt(AdPlatFormConstants.AES_PASSWORD, decrypt) : CharSequenceUtil.EMPTY; + }).filter(StringUtils::isNotBlank).distinct() + .collect(Collectors.toList()); String taskImeiName = redisUtils.acquisitionBatch(MailRequestEnum.GG.getCacheName()); String file = fileUrl.concat(StrPool.SLASH).concat(taskImeiName); // 压缩文件并发送 @@ -139,7 +143,7 @@ public class GenderConversionTask { // 修改gender clueService.updateGenderByZid(AESUtils.encrypt (letterToNum, AdPlatFormConstants.AD_PLATFORM), ValidationUtil.isInteger(genderType) - ? Integer.parseInt(genderType) + DefaultNumberConstants.ONE_NUMBER : DefaultNumberConstants.FOUR_NUMBER); + ? Integer.parseInt(genderType) + DefaultNumberConstants.ONE_NUMBER : DefaultNumberConstants.FOUR_NUMBER); } } byTaskName.setStatus(DefaultNumberConstants.ONE_NUMBER);