From 9fcdfaac88e60112d88e11ed03284c1b43ae7f53 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Thu, 16 Oct 2025 11:17:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../supervisiondata/pojo/enums/EduType.java | 2 + .../service/impl/MarriageServiceImpl.java | 1 + .../service/impl/RiskTaskServiceImpl.java | 42 +++++++++++-------- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 0b3568a..c724bbe 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ com.alibaba.fastjson2 fastjson2 - 2.0.45 + 2.0.57 compile diff --git a/src/main/java/com/biutag/supervisiondata/pojo/enums/EduType.java b/src/main/java/com/biutag/supervisiondata/pojo/enums/EduType.java index 91c7bcc..7a80f0b 100644 --- a/src/main/java/com/biutag/supervisiondata/pojo/enums/EduType.java +++ b/src/main/java/com/biutag/supervisiondata/pojo/enums/EduType.java @@ -22,6 +22,7 @@ public enum EduType { MIDDLE_1("初中毕业", "初中", 4), MIDDLE_2("初级中等教育", "初中", 4), MIDDLE_3("初中肄业", "初中", 4), + MIDDLE_4("技工学校毕业", "初中", 3), MIDDLE_HEIGHT_1("普通高中结业", "高中/中专", 3), MIDDLE_HEIGHT_2("普通高级中学教育", "高中/中专", 3), MIDDLE_HEIGHT_3("普通高中毕业", "高中/中专", 3), @@ -30,6 +31,7 @@ public enum EduType { MIDDLE_HEIGHT_6("中等专科教育", "高中/中专", 3), MIDDLE_HEIGHT_7("中等专业毕业", "高中/中专", 3), MIDDLE_HEIGHT_8("技工学校肄业", "高中/中专", 3), + MIDDLE_HEIGHT_9("技工学校结业", "高中/中专", 3), HEIGHT_1("大学专科毕业", "大学", 2), HEIGHT_2("大学专科结业", "大学", 2), HEIGHT_3("大学本科/专科教育", "大学", 2), diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java index 1b7538a..37d5e49 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java @@ -39,6 +39,7 @@ public class MarriageServiceImpl implements MarriageService { @Override public void marriageModelTask(TaskParamDomain domain) { + log.info("开始进行婚姻任务"); List data = hyqkbRepository.getBaseMapper().selectDistinctInfo(); LocalDateTime yearsDate = LocalDateTime.now().minusYears(1); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java index 4fabd18..988efe1 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java @@ -49,6 +49,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { @Override public void infoModelTask(TaskParamDomain domain) { + log.info("开始进行年龄和性别任务"); RiskTask genderTask = riskTaskRepository.create(domain.getPersons().size(), 32); RiskTask ageTask = riskTaskRepository.create(domain.getPersons().size(), 33); @@ -59,6 +60,9 @@ public class RiskTaskServiceImpl implements RiskTaskService { List toInsertAge = new ArrayList<>(); List toInsertGender = new ArrayList<>(); List toDeletes = new ArrayList<>(); + int deleteSize = 0; + int ageSize = 0; + int genderSize = 0; for (RiskPersonal person : domain.getPersons()) { RiskModelTaskClue oldAge = oldAgeMap.get(person.getIdCode()); Integer age = IdCodeUtil.idCard2Age(person.getIdCode(), now); @@ -69,6 +73,12 @@ public class RiskTaskServiceImpl implements RiskTaskService { clue.setId(oldAge.getId()); clue.setDel(1); toDeletes.add(clue); + if(toDeletes.size() >=1000) { + clueRepository.removeBatchByIds(toDeletes); + deleteSize+=toDeletes.size(); + log.info("已删除年龄数据{}条", deleteSize); + toDeletes = new ArrayList<>(); + } } // 年龄属于阶段 增加 if (ageType != null && oldAge == null) { @@ -82,6 +92,12 @@ public class RiskTaskServiceImpl implements RiskTaskService { .idCode(person.getIdCode()) .eventTime(null) .build())); + if(toInsertAge.size() >=1000) { + riskModelTaskClueService.saveClues(toInsertAge, "B2年龄"); + ageSize += toInsertAge.size(); + toInsertAge = new ArrayList<>(); + log.info("已增加年龄数据{}条", ageSize); + } } if (person.getGender() == null || !person.getGender().equals("1") || oldGenderMap.get(person.getIdCode()) != null) continue; @@ -95,21 +111,15 @@ public class RiskTaskServiceImpl implements RiskTaskService { .idCode(person.getIdCode()) .eventTime(null) .build())); + if(toInsertGender.size() >=1000) { + riskModelTaskClueService.saveClues(toInsertGender, "B1性别"); + genderSize += toInsertGender.size(); + log.info("增加性别数据{}条", genderSize); + toInsertGender = new ArrayList<>(); + } } - if (!toInsertAge.isEmpty()) { - log.info("增加年龄数据{}条", toInsertAge.size()); - riskModelTaskClueService.saveClues(toInsertAge, "B2年龄"); - } - if (!toDeletes.isEmpty()) { - log.info("删除年龄数据{}条", toDeletes.size()); - clueRepository.removeBatchByIds(toDeletes); - } - riskTaskRepository.updateTask(ageTask.getId(), toInsertAge.size(), toDeletes.size()); - if (!toInsertGender.isEmpty()) { - log.info("增加性别数据{}条", toInsertGender.size()); - riskModelTaskClueService.saveClues(toInsertGender, "B1性别"); - } - riskTaskRepository.updateTask(genderTask.getId(), toInsertGender.size(), 0); + riskTaskRepository.updateTask(ageTask.getId(), ageSize, deleteSize); + riskTaskRepository.updateTask(genderTask.getId(), genderSize, 0); } @Override @@ -129,9 +139,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { for (RiskPersonal person : domain.getPersons()) { GBaseSYRKXX xx = xxMap.get(person.getIdCode()); - if (xx == null) { - continue; - } + if (xx == null) continue; RiskModelTaskClue areaClue = area(xx, person, areaTask, oldAreaMap.get(person.getIdCode())); if (areaClue != null) toInsert2.add(areaClue); RiskModelTaskClue eudClue = edu(xx, person, eduTask, oldEduMap.get(person.getIdCode()));