From 645da443d6749e76cb669547085d917289dc5cf3 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Mon, 16 Dec 2024 11:23:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=92=8C=E9=A3=8E=E9=99=A9=E9=A1=B9=E7=9A=84=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 30 +++++++++---------- .../service/impl/GBaseJJDServiceImpl.java | 10 +++---- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 44f7df1..fa60daa 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -112,7 +112,7 @@ public class ApplicationEvent { // riskPersonalService.fixed(); // personalService.syncPerson(LocalDate.now()); // 32，33，34，39，41，51，53，43，63 - // 36 60 61 62 44 45 48 52 59 + // 36 60 61 62 44 45 48 52 59 64 // petitionService.petitionModelTask(initDomain(List.of(40))); // riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); // riskTaskService.infoModelTask(initDomain(List.of(32,33))); @@ -129,7 +129,7 @@ public class ApplicationEvent { // gBaseJJDService.pullPoliceInstance(LocalDateTime.of(2023, 12, 6, 0, 0, 0), end, initDomain(List.of(55,56,57,58))); jsbryService.syncPys(initDomain(List.of(59))); // gBaseSHRWFRService.combatCrime(initDomain(List.of(63))); -// gBaseJJDService.syncPoliceAttack(initDomain(List.of(64))); + gBaseJJDService.syncPoliceAttack(initDomain(List.of(64))); // gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66))); // pointService.syncPointType(initDomain(List.of(67))); // gBaseSHRWFRService.hadWork(initDomain(List.of(68))); @@ -148,22 +148,22 @@ public class ApplicationEvent { // pointService.syncParentsDivorce(initDomain(List.of(117))); // pointService.syncFamilyDie(initDomain(List.of(118))); // pointService.syncFatherDie(initDomain(List.of(119))); - pointService.syncMotherDie(initDomain(List.of(120))); - pointService.syncChildNo(initDomain(List.of(121))); - pointService.syncXIDU(initDomain(List.of(122))); - pointService.syncFiliation(initDomain(List.of(123))); +// pointService.syncMotherDie(initDomain(List.of(120))); +// pointService.syncChildNo(initDomain(List.of(121))); +// pointService.syncXIDU(initDomain(List.of(122))); +// pointService.syncFiliation(initDomain(List.of(123))); // 必须在123后面 // gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); - pointService.syncPetitionContent(initDomain(List.of(124))); - pointService.syncMedicalPressure(initDomain(List.of(125))); - pointService.syncSeriousIllness(initDomain(List.of(126))); - pointService.syncFamilySeriousIllness(initDomain(List.of(127))); - pointService.syncPetitionDissatisfied(initDomain(List.of(128))); - pointService.syncIsSpecialPeople(initDomain(List.of(129))); - pointService.syncSpecialPeopleType(initDomain(List.of(130))); - pointService.syncParentsRelationship(initDomain(List.of(131))); - pointService.syncMentalDiseaseDriver(initDomain(List.of(132))); +// pointService.syncPetitionContent(initDomain(List.of(124))); +// pointService.syncMedicalPressure(initDomain(List.of(125))); +// pointService.syncSeriousIllness(initDomain(List.of(126))); +// pointService.syncFamilySeriousIllness(initDomain(List.of(127))); +// pointService.syncPetitionDissatisfied(initDomain(List.of(128))); +// pointService.syncIsSpecialPeople(initDomain(List.of(129))); +// pointService.syncSpecialPeopleType(initDomain(List.of(130))); +// pointService.syncParentsRelationship(initDomain(List.of(131))); +// pointService.syncMentalDiseaseDriver(initDomain(List.of(132))); // *********暂时不要********** // riskTaskService.heightFight(initDomain(List.of(42))); // pointService.syncKillSelf(initDomain(List.of(46))); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java index 05e67b2..d53336d 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java @@ -21,10 +21,7 @@ import com.biutag.supervisiondata.repository.*; import com.biutag.supervisiondata.service.GBaseJJDService; import com.biutag.supervisiondata.service.RiskModelTaskClueService; import com.biutag.supervisiondata.service.RiskPersonalService; -import com.biutag.supervisiondata.util.BhUtil; -import com.biutag.supervisiondata.util.IdCodeUtil; -import com.biutag.supervisiondata.util.OrgUtil; -import com.biutag.supervisiondata.util.PatternUtil; +import com.biutag.supervisiondata.util.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -442,12 +439,13 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { .name(person.getName()) .id("ptsjsj") .idCode(person.getIdCode()) - .tag("平台涉警事件") + .tags(List.of("平台涉警事件")) .sourceData(sb.substring(0, sb.length()-1)) .eventTime(Optional.ofNullable(eventTime).orElse(LocalDateTime.now())) .personId(person.getId()) + .score(Math.min(5,jjdList.size())) .build(); - toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); + toInsert.add(DataUtil.createClueData(task, data)); } log.info("保存袭警数据：{}", toInsert.size()); if (!toInsert.isEmpty()) {