From 757ef6f662e010626e3645057ea7e9955f6fccd9 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Thu, 19 Dec 2024 18:03:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AiServiceImpl.java | 1 - .../service/impl/GBaseBAServiceImpl.java | 1 - .../service/impl/GBaseSHRWFRServiceImpl.java | 14 ++--------- .../supervisiondata/task/TaskService.java | 3 +-- .../supervisiondata/util/IdCodeUtil.java | 8 ++++-- .../supervisiondata/util/ImageUtil.java | 5 ++++ .../supervisiondata/util/PatternUtil.java | 25 ++++++++++++++++--- .../supervisiondata/util/RandomUtil.java | 2 +- .../biutag/supervisiondata/util/TxtUtil.java | 16 +----------- 9 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/AiServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/AiServiceImpl.java index 99a9d1a..085a063 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/AiServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/AiServiceImpl.java @@ -14,7 +14,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java index 0e13091..a1218c5 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervisiondata.pojo.constants.Default; import com.biutag.supervisiondata.pojo.domain.TaskParamDomain; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseBAXX; -import com.biutag.supervisiondata.pojo.entity.dwd.GBaseBAYJ; import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue; import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonal; import com.biutag.supervisiondata.pojo.entity.mine.RiskTask; diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java index 6ba87e8..3de2182 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java @@ -38,6 +38,7 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.IntStream; +import java.util.stream.Stream; /** * @author kami on 2024-11-10 15:24:52 @@ -74,18 +75,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { Map tmpMap = new WeakHashMap<>(); // 要补全的数据 List idCodes = new ArrayList<>(); - for (WFSHPerson wfshPerson : shrTmp) { - if (tmpMap.get(wfshPerson.getIdCode()) != null) { - continue; - } - if (wfshPerson.getName() == null || wfshPerson.getName().isEmpty() || wfshPerson.getMobile() == null - || wfshPerson.getMobile().isEmpty() || wfshPerson.getMobile().equals("无")) { - idCodes.add(wfshPerson.getIdCode()); - continue; - } - tmpMap.put(wfshPerson.getIdCode(), wfshPerson); - } - for (WFSHPerson wfshPerson : wfrTmp) { + for (WFSHPerson wfshPerson : Stream.concat(shrTmp.stream(), wfrTmp.stream()).toList()) { if (tmpMap.get(wfshPerson.getIdCode()) != null) { continue; } diff --git a/src/main/java/com/biutag/supervisiondata/task/TaskService.java b/src/main/java/com/biutag/supervisiondata/task/TaskService.java index 42aa2a9..d62ed59 100644 --- a/src/main/java/com/biutag/supervisiondata/task/TaskService.java +++ b/src/main/java/com/biutag/supervisiondata/task/TaskService.java @@ -87,8 +87,7 @@ public class TaskService { List clues = riskModelTaskClueRepository.list(new LambdaQueryWrapper() .eq(RiskModelTaskClue::getDel, 0)); Map> map = clues.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getModelId)); - TaskParamDomain domain = new TaskParamDomain(persons, map); - return domain; + return new TaskParamDomain(persons, map); } @Scheduled(cron = "0 30 3 * * *") diff --git a/src/main/java/com/biutag/supervisiondata/util/IdCodeUtil.java b/src/main/java/com/biutag/supervisiondata/util/IdCodeUtil.java index 2b87b88..c7f6449 100644 --- a/src/main/java/com/biutag/supervisiondata/util/IdCodeUtil.java +++ b/src/main/java/com/biutag/supervisiondata/util/IdCodeUtil.java @@ -20,7 +20,7 @@ public class IdCodeUtil { * * @param idNumber 证件号 * @param now 当前日期 - * @return + * @return 年龄 */ public static Integer idCard2Age(String idNumber, LocalDate now) { try { @@ -34,10 +34,14 @@ public class IdCodeUtil { return null; } + /** + * 身份证转性别 + * @param idNumber 身份证 + * @return 性别 1男2女 + */ public static String idCard2Gender(String idNumber) { try { int gender = idNumber.length() == 18 ? Integer.valueOf(idNumber.substring(16, 17)) : Integer.valueOf(idNumber.substring(14, 15)); - // 结果0男1女 余数偶女奇男 return gender % 2 == 0 ? "2" : "1"; } catch (Exception e) { log.info("身份证转性别异常"); diff --git a/src/main/java/com/biutag/supervisiondata/util/ImageUtil.java b/src/main/java/com/biutag/supervisiondata/util/ImageUtil.java index be0216c..693bfcc 100644 --- a/src/main/java/com/biutag/supervisiondata/util/ImageUtil.java +++ b/src/main/java/com/biutag/supervisiondata/util/ImageUtil.java @@ -16,6 +16,11 @@ import java.util.Base64; @UtilityClass public class ImageUtil { + /** + * 文件转base64 + * @param path 文件路径 + * @return base64 + */ public static String file2Base64(String path) { try (FileInputStream fis = new FileInputStream(path); ByteArrayOutputStream bos = new ByteArrayOutputStream()) { diff --git a/src/main/java/com/biutag/supervisiondata/util/PatternUtil.java b/src/main/java/com/biutag/supervisiondata/util/PatternUtil.java index 321e413..b9a99f3 100644 --- a/src/main/java/com/biutag/supervisiondata/util/PatternUtil.java +++ b/src/main/java/com/biutag/supervisiondata/util/PatternUtil.java @@ -17,12 +17,17 @@ import java.util.regex.Pattern; @UtilityClass public class PatternUtil { - private static final Pattern ID_CARD = Pattern.compile("\\d{17}[\\d|x|X]|\\d{15}"); + private static final Pattern ID_CARD = Pattern.compile("\\d{17}[\\d|xX]|\\d{15}"); - private static final Pattern MOBILE = Pattern.compile("^1(3|4|5|6|7|8|9)\\\\d{9}$"); + private static final Pattern MOBILE = Pattern.compile("^1([3456789])\\\\d{9}$"); private static final Pattern MARK = Pattern.compile("1"); + /** + * 正则表达式提取身份证 + * @param content 内容 + * @return 身份证，“,”分割 + */ public static String takeIdCard(String content) { StringBuilder str = new StringBuilder(); if(content == null) { @@ -37,7 +42,11 @@ public class PatternUtil { } return str.substring(0, str.length()-1); } - + /** + * 正则表达式提取手机号 + * @param content 内容 + * @return 手机号，“,”分割 + */ public static String takeMobile(String content) { StringBuilder str = new StringBuilder(); if(content == null) { @@ -53,6 +62,11 @@ public class PatternUtil { return str.substring(0, str.length()-1); } + /** + * 提取1在字符串的所有位置 + * @param content 内容 + * @return 位置下标（1开始） + */ public static List takeMarkPosition(String content) { List indexes = new ArrayList<>(); if(content == null) { @@ -65,6 +79,11 @@ public class PatternUtil { return indexes; } + /** + * 提取1在字符串的所有位置（返回字符串） + * @param content 内容 + * @return 位置下标（1开始，个位数补“0”） + */ public static List takeMarkPositionToString(String content) { List indexes = new ArrayList<>(); if(content == null) { diff --git a/src/main/java/com/biutag/supervisiondata/util/RandomUtil.java b/src/main/java/com/biutag/supervisiondata/util/RandomUtil.java index f993cbf..68f42d3 100644 --- a/src/main/java/com/biutag/supervisiondata/util/RandomUtil.java +++ b/src/main/java/com/biutag/supervisiondata/util/RandomUtil.java @@ -77,7 +77,7 @@ public class RandomUtil { * 获取定长的随机数，只包含大写字母 * * @param length 随机数长度 - * @return + * @return 随机字符串 */ public static String generateUpperStringFast(int length) { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/com/biutag/supervisiondata/util/TxtUtil.java b/src/main/java/com/biutag/supervisiondata/util/TxtUtil.java index 73ac5d9..4a0eeee 100644 --- a/src/main/java/com/biutag/supervisiondata/util/TxtUtil.java +++ b/src/main/java/com/biutag/supervisiondata/util/TxtUtil.java @@ -6,8 +6,6 @@ import lombok.extern.slf4j.Slf4j; import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; /** * @author kami on 2024-07-15 15:47:40 @@ -22,19 +20,7 @@ public class TxtUtil { try (BufferedWriter bw = new BufferedWriter(new FileWriter(path))) { bw.write(str); } catch (IOException e) { - e.printStackTrace(); + log.error("", e); } } - - public static void main(String[] args) { - Date date = new Date(); - if (date != null) { - try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy年M月d日"); - System.out.println(sdf.format(date)); - } catch (Exception e) { - } - } - System.out.println(" 无时间数据 "); - } }