From 84fc70c4b1fb78f6d6d052289fd35e4328d15e8d Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Thu, 12 Dec 2024 19:16:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=A6=E5=8E=86=E5=92=8C?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E7=9A=84=E6=9F=A5=E8=AF=A2=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 126 +++++++++--------- .../mapper/ads/GBaseSYRKXXMapper.java | 3 + .../mapper/dwd/GBaseWFRXXMapper.java | 3 + .../repository/GBaseWFRXXRepository.java | 4 + .../service/impl/GBaseBAServiceImpl.java | 2 +- .../service/impl/GBaseJJDServiceImpl.java | 4 - .../service/impl/GBaseSHRWFRServiceImpl.java | 72 +++------- .../service/impl/HabitServiceImpl.java | 2 +- .../service/impl/MarriageServiceImpl.java | 4 +- .../service/impl/PointServiceImpl.java | 83 ++++++------ .../service/impl/PoliceServiceImpl.java | 2 +- .../service/impl/RiskTaskServiceImpl.java | 20 +-- 12 files changed, 151 insertions(+), 174 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 498a10f..1557f89 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -102,69 +102,69 @@ public class ApplicationEvent { LocalDateTime start = LocalDateTime.of(2023, 12, 6, 0, 0, 0); LocalDateTime end = LocalDateTime.now(); CompletableFutureUtil.runSync(() -> { -// personalService.init(); -// personalService.pullInvestigate(); -// personalService.pullPsychosis(); -// gBaseSHRWFRService.pullAndSave(start, end); -// petitionService.personPullAndSave(start, end); -// personalService.pullPetitionAgain(); -// pointService.personPullAndSave(start, end); -// gBaseJJDService.pullAndSave(start, end); -// riskPersonalService.fixed(); -// personalService.syncPerson(); -// -// petitionService.petitionModelTask(initDomain(List.of(40))); -// riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); -//// riskTaskService.eduModelTask(initDomain(List.of(34))); -// riskTaskService.infoModelTask(initDomain(List.of(32,33))); -// marriageService.marriageModelTask(initDomain(List.of(39,51))); -// pointService.syncSecurity(initDomain(List.of(37))); -// habitService.habitModelTask(start, initDomain(List.of(36,60,61,62))); -// pointService.syncCarUser(initDomain(List.of(53))); -//// riskTaskService.riskAreaModelTask(initDomain(List.of(41))); -// pointService.syncScore(initDomain(List.of(43))); -// pointService.syncViolence(initDomain(List.of(44))); -// noControlService.syncNoControlData(initDomain(List.of(45))); -// pointService.syncDrug(initDomain(List.of(37))); -// pointService.syncControlNoPower(initDomain(List.of(48))); -// pointService.syncOilBuy(initDomain(List.of(52))); -// gBaseJJDService.pullPoliceInstance(start, 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.syncHomeViolence(initDomain(List.of(65,66))); -// pointService.syncPointType(initDomain(List.of(67))); -// gBaseSHRWFRService.hadWork(initDomain(List.of(68))); -// gBaseJJDService.syncParentRelation(initDomain(List.of(69,70))); -// gBaseJJDService.syncLove(initDomain(List.of(71))); -// gBaseJJDService.syncMarryDispute(initDomain(List.of(72))); -// gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73))); -// gBaseJJDService.syncBullying(initDomain(List.of(74))); -// gBaseSHRWFRService.crimeName(initDomain(List.of(76))); -// pointService.syncIsPetition(initDomain(List.of(40))); -// pointService.syncFatherEducation(initDomain(List.of(112))); -// pointService.syncMotherEducation(initDomain(List.of(113))); -// pointService.syncDomicileType(initDomain(List.of(114))); -// pointService.syncCriminalPunishment(initDomain(List.of(115)));// 需重跑 报错 -// pointService.syncAdministrativePunishment(initDomain(List.of(116)));// 需重跑 -// 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))); -// // 必须在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))); + personalService.init(); + personalService.pullInvestigate(); + personalService.pullPsychosis(); + gBaseSHRWFRService.pullAndSave(start, end); + petitionService.personPullAndSave(start, end); + personalService.pullPetitionAgain(); + pointService.personPullAndSave(start, end); + gBaseJJDService.pullAndSave(start, end); + riskPersonalService.fixed(); + personalService.syncPerson(); + + petitionService.petitionModelTask(initDomain(List.of(40))); + riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); +// riskTaskService.eduModelTask(initDomain(List.of(34))); + riskTaskService.infoModelTask(initDomain(List.of(32,33))); + marriageService.marriageModelTask(initDomain(List.of(39,51))); + pointService.syncSecurity(initDomain(List.of(37))); + habitService.habitModelTask(start, initDomain(List.of(36,60,61,62))); + pointService.syncCarUser(initDomain(List.of(53))); +// riskTaskService.riskAreaModelTask(initDomain(List.of(41))); + pointService.syncScore(initDomain(List.of(43))); + pointService.syncViolence(initDomain(List.of(44))); + noControlService.syncNoControlData(initDomain(List.of(45))); + pointService.syncDrug(initDomain(List.of(37))); + pointService.syncControlNoPower(initDomain(List.of(48))); + pointService.syncOilBuy(initDomain(List.of(52))); + gBaseJJDService.pullPoliceInstance(start, 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.syncHomeViolence(initDomain(List.of(65,66))); + pointService.syncPointType(initDomain(List.of(67))); + gBaseSHRWFRService.hadWork(initDomain(List.of(68))); + gBaseJJDService.syncParentRelation(initDomain(List.of(69,70))); + gBaseJJDService.syncLove(initDomain(List.of(71))); + gBaseJJDService.syncMarryDispute(initDomain(List.of(72))); + gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73))); + gBaseJJDService.syncBullying(initDomain(List.of(74))); + gBaseSHRWFRService.crimeName(initDomain(List.of(76))); + pointService.syncIsPetition(initDomain(List.of(40))); + pointService.syncFatherEducation(initDomain(List.of(112))); + pointService.syncMotherEducation(initDomain(List.of(113))); + pointService.syncDomicileType(initDomain(List.of(114))); + pointService.syncCriminalPunishment(initDomain(List.of(115)));// 需重跑 报错 + pointService.syncAdministrativePunishment(initDomain(List.of(116)));// 需重跑 + 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))); + // 必须在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))); // *********暂时不要********** // riskTaskService.heightFight(initDomain(List.of(42))); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/ads/GBaseSYRKXXMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/ads/GBaseSYRKXXMapper.java index 3439cda..d9db157 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/ads/GBaseSYRKXXMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/ads/GBaseSYRKXXMapper.java @@ -70,4 +70,7 @@ public interface GBaseSYRKXXMapper extends BaseMapper { @Select(" select a.gmsfhm as gmsfhm, a.xlmc as xlmc, a.csdxzqhdm as csdxzqhdm, a.csdxzqhmc as csdxzqhmc from csga_ads.ads_ssxx_syrkxx as a inner join csga_wdpcdb.wdpc_person as b on a.gmsfhm = b.id_code ") List selectEduAndArea(); + @Select(" select a.gmsfhm as gmsfhm, a.zydm as zydm from csga_ads.ads_ssxx_syrkxx as a inner join csga_wdpcdb.wdpc_person as b on a.gmsfhm = b.id_code where a.zydm is not null") + List selectWork(); + } diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java index f3688e1..f6b3f2a 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java @@ -54,4 +54,7 @@ public interface GBaseWFRXXMapper extends BaseMapper { " ) "+ "") List selectListByIdCode(@Param("list")List list); + @Select(" select a.zjhm as zjhm, a.zydm as zydm from dwd_ry_zfba_wfryxx as a inner join csga_wdpcdb.wdpc_person as b " + + " on a.zjhm = b.id_code where a.zydm is not null ") + List selectWork(); } diff --git a/src/main/java/com/biutag/supervisiondata/repository/GBaseWFRXXRepository.java b/src/main/java/com/biutag/supervisiondata/repository/GBaseWFRXXRepository.java index 3fdcb40..261087a 100644 --- a/src/main/java/com/biutag/supervisiondata/repository/GBaseWFRXXRepository.java +++ b/src/main/java/com/biutag/supervisiondata/repository/GBaseWFRXXRepository.java @@ -3,9 +3,12 @@ package com.biutag.supervisiondata.repository; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.biutag.supervisiondata.mapper.dwd.GBaseWFRXXMapper; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseWFRXX; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author kami on 2024-11-10 15:21:56 * @version 0.0.1 @@ -13,4 +16,5 @@ import org.springframework.stereotype.Service; */ @Service public class GBaseWFRXXRepository extends ServiceImpl { + } 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 e885221..24c9937 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java @@ -123,7 +123,7 @@ public class GBaseBAServiceImpl implements GBaseBAService { if(date.isAfter(LocalDate.of(1991, 1, 5))) { eventTime = LocalDateTime.of(date.getYear(), date.getMonth(),date.getDayOfMonth(),0 ,0,0); } - RiskModelTaskClue clue = createClue(task.getModelId(), 2, personMap.get(tmp.getSfzhm()), task.getId(), Default.BA_TAG, "发现该人员正任职保安人员，属于特种职业，增加风险分2分。",eventTime); + RiskModelTaskClue clue = createClue(task.getModelId(), 2, personMap.get(tmp.getSfzhm()), task.getId(), Default.BA_TAG, "发现该人员正任职保安人员，属于特种职业",eventTime); toInsert.add(clue); } } 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 0df3df8..58b6492 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java @@ -437,7 +437,6 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { if (gBaseJJD.getCjqk() != null && !gBaseJJD.getCjqk().isEmpty()) { sb.append("，处警情况；" + gBaseJJD.getCjqk()); } - sb.append("，增加风险分5分"); data.setSourceData(sb.toString()); try { data.setEventTime(gBaseJJD.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); @@ -975,7 +974,6 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { if (jjd.getCjqk() != null && !jjd.getCjqk().isEmpty()) { sb.append("，处警情况；" + jjd.getCjqk()); } - sb.append("，增加风险分5分"); data.setSourceData(sb.toString()); try { data.setEventTime(jjd.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); @@ -1225,7 +1223,6 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { if (jjd.getCjqk() != null && !jjd.getCjqk().isEmpty()) { sb.append("，处警情况；" + jjd.getCjqk()); } - sb.append("，增加风险分5分"); data.setSourceData(sb.toString()); try { data.setEventTime(jjd.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); @@ -1296,7 +1293,6 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { if (gBaseJJD.getCjqk() != null && !gBaseJJD.getCjqk().isEmpty()) { sb.append("，处警情况；" + gBaseJJD.getCjqk()); } - sb.append("，增加风险分5分"); data.setSourceData(sb.toString()); try { data.setEventTime(gBaseJJD.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); 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 90dbb48..d437042 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java @@ -129,9 +129,9 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { List toInsert2 = createInsertData(Default.SHR_TAG, shrTmp, tmpMap, idCodeMap, orgCodeMap, orgIdMap, externalDepart); log.info("违法人数: {}", toInsert1.size()); - riskPersonalService.formatAndSave(toInsert1, Default.WFR_TAG); + riskPersonalService.formatAndSave(toInsert1, Default.BIG_TAG_SHWFR); log.info("受害人数: {}", toInsert2.size()); - riskPersonalService.formatAndSave(toInsert2, Default.SHR_TAG); + riskPersonalService.formatAndSave(toInsert2, Default.BIG_TAG_SHWFR); } private final RiskTaskRepository taskRepository; @@ -172,7 +172,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { .idCode(person.getIdCode()) .tag("已被打击处理") .personId(person.getId()) - .sourceData("该人员因" + xx.getSxzm() + "被打击处理，案件编号：" + xx.getAjbh() + "，增加风险分5分") + .sourceData("该人员因" + xx.getSxzm() + "被打击处理，案件编号：" + xx.getAjbh()) .build(); try { data.setEventTime(xx.getLrsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); @@ -230,7 +230,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { .idCode(person.getIdCode()) .tag(zblx.getDmmc()) .personId(person.getId()) - .sourceData("该人员有犯罪前科，刑事处罚罪名：" + zblx.getDmmc() + "，案件编号：" + xx.getAjbh() + "，增加风险" + zblx.getScore().intValue() + "分") + .sourceData("该人员有犯罪前科，刑事处罚罪名：" + zblx.getDmmc() + "，案件编号：" + xx.getAjbh() ) .build(); try { data.setEventTime(xx.getLrsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); @@ -261,16 +261,10 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { Map> lxMap = lxList.stream().collect(Collectors.groupingBy(WdpcGrjdZblx::getLxdm)); Map wfrMap = new WeakHashMap<>(); - int count = domain.getIdCards().size(); - for (List idCard : domain.getIdCards()) { - count--; - log.info("违法人进度{}", count); - List tmp = wfrxxRepository.list(new LambdaQueryWrapper() - .select(GBaseWFRXX::getZjhm, GBaseWFRXX::getZydm) - .in(GBaseWFRXX::getZjhm, idCard)); - for (GBaseWFRXX gBaseWFRXX : tmp) { - wfrMap.put(gBaseWFRXX.getZjhm(), gBaseWFRXX.getZydm()); - } + + List tmp = wfrxxRepository.getBaseMapper().selectWork(); + for (GBaseWFRXX gBaseWFRXX : tmp) { + wfrMap.put(gBaseWFRXX.getZjhm(), gBaseWFRXX.getZydm()); } // 担心和保安、涉药模型混搭 Map oldMap = domain.getOldMap(task.getModelId(), true); @@ -283,32 +277,17 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { List toInsert2 = new ArrayList<>(); // 实有人口要查的 List personalList = new ArrayList<>(); - List> srIdCodes = new ArrayList<>(); for (RiskPersonal person : domain.getPersons()) { if (oldMap.get(person.getIdCode()) != null) { continue; } String zydm = wfrMap.get(person.getIdCode()); if (zydm == null) { - if (srIdCodes.isEmpty()) { - srIdCodes.add(new ArrayList<>()); - } - if (srIdCodes.getLast().size() >= 10000) { - srIdCodes.add(new ArrayList<>()); - } - srIdCodes.getLast().add(person.getIdCode()); personalList.add(person); continue; } WdpcGrjdZblx zblx = wfzyMap.get(zydm); if (zblx == null) { - if (srIdCodes.isEmpty()) { - srIdCodes.add(new ArrayList<>()); - } - if (srIdCodes.getLast().size() >= 10000) { - srIdCodes.add(new ArrayList<>()); - } - srIdCodes.getLast().add(person.getIdCode()); personalList.add(person); continue; } @@ -321,9 +300,9 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { .personId(person.getId()) .build(); if (zblx.getScore() < 5.0) { - data.setSourceData("该人员从事" + zblx.getDmmc() + "的职业，增加风险分" + zblx.getScore().intValue() + "分"); + data.setSourceData("该人员从事" + zblx.getDmmc() ); } else { - data.setSourceData("该人员" + zblx.getDmmc() + "，增加风险分" + zblx.getScore().intValue() + "分"); + data.setSourceData("该人员" + zblx.getDmmc() ); ClueData data2 = ClueData.builder() .name(person.getName()) .id("zy") @@ -331,25 +310,16 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { .tag(zblx.getDmmc()) .eventTime(LocalDateTime.now()) .personId(person.getId()) - .sourceData("该人员无固定职业，增加风险分5分") + .sourceData("该人员无固定职业") .build(); toInsert2.add(createClue(task2.getModelId(), zblx.getScore().intValue(), task2.getId(), data2)); } toInsert.add(createClue(task.getModelId(), zblx.getScore().intValue(), task.getId(), data)); } - List xxList = new ArrayList<>(); - count = srIdCodes.size(); - for (List srIdCode : srIdCodes) { - count--; - log.info("实有人口进度{}", count); - xxList.addAll(gBaseSYRKXXRepository.list(new LambdaQueryWrapper() - .select(GBaseSYRKXX::getZydm, GBaseSYRKXX::getGmsfhm) - .isNotNull(GBaseSYRKXX::getZydm) - .in(GBaseSYRKXX::getGmsfhm, srIdCode))); - } - + List xxList = gBaseSYRKXXRepository.getBaseMapper().selectWork(); Map syMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, GBaseSYRKXX::getZydm, (val, old) -> val)); + for (RiskPersonal person : personalList) { String zydm = syMap.get(person.getIdCode()); if (zydm == null) continue; @@ -364,9 +334,9 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { .personId(person.getId()) .build(); if (zblx.getScore() < 5.0) { - data.setSourceData("该人员从事" + zblx.getDmmc() + "的职业，增加风险分" + zblx.getScore().intValue() + "分"); + data.setSourceData("该人员从事" + zblx.getDmmc() + "的职业"); } else { - data.setSourceData("该人员" + zblx.getDmmc() + "，增加风险分" + zblx.getScore().intValue() + "分"); + data.setSourceData("该人员" + zblx.getDmmc()); ClueData data2 = ClueData.builder() .name(person.getName()) .id("zy") @@ -374,7 +344,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { .tag(zblx.getDmmc()) .eventTime(LocalDateTime.now()) .personId(person.getId()) - .sourceData("该人员无固定职业，增加风险分5分") + .sourceData("该人员无固定职业") .build(); toInsert2.add(createClue(task2.getModelId(), zblx.getScore().intValue(), task2.getId(), data2)); } @@ -421,7 +391,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { personal.setControlTime(LocalDateTime.now()); } else { personal.setName(person.getName()); - personal.setName(person.getMobile()); + personal.setMobileNumber(person.getMobile()); try { personal.setControlTime(person.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); } catch (Exception e) { @@ -447,7 +417,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { WFSHPerson result = tmpMap.get(person.getIdCode()); RiskPersonal personal; - String departId; + String departId = null; if (result != null) { personal = createPerson(result, null, tag); personal.setControlDepartType(DepartType.OTHER.getType()); @@ -456,7 +426,9 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { GBaseSYRKXX xx = idCodeMap.get(person.getIdCode()); personal = createPerson(person, xx, tag); personal.setControlDepartType(DepartType.HUMAN.getType()); - departId = xx.getSspcsdm(); + if(xx != null) { + departId = xx.getSspcsdm(); + } } if (departId == null) { toInsert.add(personal); @@ -473,7 +445,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { } if (depart != null) { personal.setControlDepartId(depart.getInternalId()); - personal.setControlDepartName(depart.getInternalName()); + personal.setControlDepartName(depart.getInternalShortName()); } toInsert.add(personal); exist.put(person.getIdCode(), new Byte[0]); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java index 9c32f1e..977cee3 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java @@ -212,7 +212,7 @@ public class HabitServiceImpl implements HabitService { .idCode(person.getIdCode()) .tag(tag) .personId(person.getId()) - .sourceData("结合案件信息和违法人信息相关数据，发现该人员有："+aj.getAjlbmc()+"类型的案件，案件编号为："+aj.getAjbh()+"，存在"+tag+"，增加风险分5分") + .sourceData("结合案件信息和违法人信息相关数据，发现该人员有："+aj.getAjlbmc()+"类型的案件，案件编号为："+aj.getAjbh()+"，存在"+tag) .build(); try { data.setEventTime(aj.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); 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 9f256fa..88641cd 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java @@ -81,7 +81,7 @@ public class MarriageServiceImpl implements MarriageService { .id(person.getIdCode()) .idCode(person.getIdCode()) .name(person.getName()) - .sourceData("根据该人员最新的婚姻登记信息，发现该人员登记为离婚,增加风险分5分") + .sourceData("根据该人员最新的婚姻登记信息，发现该人员登记为离婚") .build(); try { clueData.setEventTime(LocalDate.parse(result.getRegisterTime(), DateTimeFormatter.ofPattern("yyyyMMdd")).atTime(0,0,0)); @@ -98,7 +98,7 @@ public class MarriageServiceImpl implements MarriageService { .id(person.getIdCode()) .idCode(person.getIdCode()) .name(person.getName()) - .sourceData("该人员最近一年有离婚登记信息,增加风险分5分") + .sourceData("该人员最近一年有离婚登记信息") .build(); try { clueData2.setEventTime(LocalDate.parse(result.getRegisterTime(), DateTimeFormatter.ofPattern("yyyyMMdd")).atTime(0,0,0)); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java index 470392d..5fb4191 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -124,7 +124,7 @@ public class PointServiceImpl implements PointService { .eventTime(Optional.ofNullable(personal.getControlTime()).orElse(LocalDateTime.now())) .departId(personal.getControlDepartId()) .departName(personal.getControlDepartName()) - .sourceData("该人员存在标签：" + personal.getTags() + "，属于重点人员，增加风险分5分") + .sourceData("该人员存在标签：" + personal.getTags() + "，属于重点人员") .build())); } continue; @@ -140,7 +140,7 @@ public class PointServiceImpl implements PointService { .eventTime(Optional.ofNullable(personal.getControlTime()).orElse(LocalDateTime.now())) .departId(personal.getControlDepartId()) .departName(personal.getControlDepartName()) - .sourceData("该人员存在标签：" + personal.getTags() + "，属于重点人员，增加风险分5分") + .sourceData("该人员存在标签：" + personal.getTags() + "，属于重点人员") .build())); } } @@ -198,7 +198,7 @@ public class PointServiceImpl implements PointService { .tag(zblx.getDmmc()) .name(person.getName()) .idCode(person.getIdCode()) - .sourceData("该人员存在标签：" + zblx.getDmmc() + "，增加风险分5分") + .sourceData("该人员存在标签：" + zblx.getDmmc() ) .build(); try { data.setEventTime(LocalDateTime.parse(ry.getJlbgsj(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); @@ -365,7 +365,7 @@ public class PointServiceImpl implements PointService { .personId(personal.getId()) .sourceData("发现该人员涉及" + domicileType.getCountNum() + "起案件，" + context + "为“" + domicileType.getAjmc() + "”，案件编号：" + domicileType.getAjbh() + "，处罚内容为“" + domicileType.getCfms1() - + "”。因受到" + domicileType.getCountNum() + "起行政处罚，增加风险分" + score + "分") + + "”。因受到" + domicileType.getCountNum() + "起行政处罚") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -420,7 +420,7 @@ public class PointServiceImpl implements PointService { .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员" + domicileType.getJysm() + "案件编号：" + domicileType.getAjbh() - + context + "，增加风险分" + score + "分") + + context ) .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -466,7 +466,7 @@ public class PointServiceImpl implements PointService { .tag("父母婚姻变故") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员父母离婚，增加风险分5分") + .sourceData("发现该人员父母离婚") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -518,7 +518,7 @@ public class PointServiceImpl implements PointService { .tag("父亲是否健在") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员父亲死亡，增加风险分5分") + .sourceData("发现该人员父亲死亡") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -570,7 +570,7 @@ public class PointServiceImpl implements PointService { .tag("母亲是否健在") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员母亲死亡，增加风险分5分") + .sourceData("发现该人员母亲死亡") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -623,7 +623,7 @@ public class PointServiceImpl implements PointService { .tag("家人患严重疾病") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员的家人有重大疾病，增加风险分5分") + .sourceData("发现该人员的家人有重大疾病") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -665,7 +665,7 @@ public class PointServiceImpl implements PointService { .tag("本人患严重疾病") .eventTime(LocalDateTime.now()) .personId(person.getId()) - .sourceData("发现该人员有过就诊记录，诊断病名为“" + idMap.get(person.getIdCode()).getDiseaseName() + "”，该人员患严重疾病，增加风险分5分") + .sourceData("发现该人员有过就诊记录，诊断病名为“" + idMap.get(person.getIdCode()).getDiseaseName() + "”，该人员患严重疾病") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -718,7 +718,7 @@ public class PointServiceImpl implements PointService { .tag("是否特殊人群") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员为精神障碍患者，是特殊人群，增加风险分5分") + .sourceData("发现该人员为精神障碍患者，是特殊人群") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -737,7 +737,7 @@ public class PointServiceImpl implements PointService { .tag("是否特殊人群") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员为艾滋人员，是特殊人群，增加风险分5分") + .sourceData("发现该人员为艾滋人员，是特殊人群") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -756,7 +756,7 @@ public class PointServiceImpl implements PointService { .tag("是否特殊人群") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员为吸毒人员，是特殊人群，增加风险分5分") + .sourceData("发现该人员为吸毒人员，是特殊人群") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -775,7 +775,7 @@ public class PointServiceImpl implements PointService { .tag("是否特殊人群") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员为社区矫正人员，是特殊人群，增加风险分5分") + .sourceData("发现该人员为社区矫正人员，是特殊人群") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -794,7 +794,7 @@ public class PointServiceImpl implements PointService { .tag("是否特殊人群") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员为刑释解教人员，是特殊人群，增加风险分5分") + .sourceData("发现该人员为刑释解教人员，是特殊人群") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -848,7 +848,7 @@ public class PointServiceImpl implements PointService { .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员于" + getDateString(domicileType.getActualTime()) - + "确诊为为“" + domicileType.getActualId() + "”精神障碍患者，增加风险分1分") + + "确诊为为“" + domicileType.getActualId() + "”精神障碍患者") .build(); toInsert.add(createClue(task.getModelId(), 1, task.getId(), data)); } @@ -867,7 +867,7 @@ public class PointServiceImpl implements PointService { .tag("特殊人群类型") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员为艾滋人员，增加风险分2分") + .sourceData("发现该人员为艾滋人员") .build(); toInsert.add(createClue(task.getModelId(), 2, task.getId(), data)); } @@ -886,7 +886,7 @@ public class PointServiceImpl implements PointService { .tag("特殊人群类型") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员为吸毒人员，增加风险分3分") + .sourceData("发现该人员为吸毒人员") .build(); toInsert.add(createClue(task.getModelId(), 3, task.getId(), data)); } @@ -921,7 +921,7 @@ public class PointServiceImpl implements PointService { .tag("特殊人群类型") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员为社区矫正人员" + context + "，增加风险分4分") + .sourceData("发现该人员为社区矫正人员" + context) .build(); toInsert.add(createClue(task.getModelId(), 4, task.getId(), data)); } @@ -956,7 +956,7 @@ public class PointServiceImpl implements PointService { .tag("特殊人群类型") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员为刑释解教人员" + context + "，增加风险分5分") + .sourceData("发现该人员为刑释解教人员" + context) .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1013,7 +1013,7 @@ public class PointServiceImpl implements PointService { .personId(personal.getId()) .sourceData("发现该人员为精神疾病患者，但驾照未注销" + context + "，驾照有效期为“" + getDateString(domicileType.getYxqs()) + "至" - + getDateString(domicileType.getYxqz()) + "”，增加风险分5分") + + getDateString(domicileType.getYxqz()) + "”") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1057,7 +1057,7 @@ public class PointServiceImpl implements PointService { .tag("父母关系状况") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员父母关系状况不佳，关联接警单单号为" + domicileType.get("jjdbh") + "，增加风险分5分") + .sourceData("发现该人员父母关系状况不佳，关联接警单单号为" + domicileType.get("jjdbh") ) .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1124,7 +1124,7 @@ public class PointServiceImpl implements PointService { .tag("吸食毒品") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员吸食毒品" + dataString + "增加风险分5分") + .sourceData("发现该人员吸食毒品" + dataString) .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1164,7 +1164,7 @@ public class PointServiceImpl implements PointService { .tag("医疗压力") .eventTime(LocalDateTime.now()) .personId(person.getId()) - .sourceData("发现该人员近三年没有医保缴纳信息，存在医疗压力，增加风险分5分") + .sourceData("发现该人员近三年没有医保缴纳信息，存在医疗压力") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1215,7 +1215,7 @@ public class PointServiceImpl implements PointService { .personId(personal.getId()) .sourceData("发现该人员上访过" + domicileType.getCountNum() + "次，上访内容为" + domicileType.getDetail() - + "，为涉退、涉迁、涉军等重点管控群体，增加风险分5分") + + "，为涉退、涉迁、涉军等重点管控群体") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1235,7 +1235,7 @@ public class PointServiceImpl implements PointService { .personId(personal.getId()) .sourceData("发现该人员上访过" + domicileType.getCountNum() + "次，上访内容为" + domicileType.getDetail() - + "，为投诉、举报等诉求，增加风险分3分") + + "，为投诉、举报等诉求") .build(); toInsert.add(createClue(task.getModelId(), 3, task.getId(), data)); } @@ -1255,7 +1255,7 @@ public class PointServiceImpl implements PointService { .personId(personal.getId()) .sourceData("发现该人员上访过" + domicileType.getCountNum() + "次，上访内容为" + domicileType.getDetail() - + "，为待遇不公、房屋交房等诉求，增加风险分2分") + + "，为待遇不公、房屋交房等诉求") .build(); toInsert.add(createClue(task.getModelId(), 2, task.getId(), data)); } @@ -1308,8 +1308,7 @@ public class PointServiceImpl implements PointService { .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员于" + getDateMinuteString(domicileType.getBjsj()) - + "报警，关联接警单单号" + domicileType.getJjdbh() + content - + "，增加风险分5分") + + "报警，关联接警单单号" + domicileType.getJjdbh() + content) .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1365,7 +1364,7 @@ public class PointServiceImpl implements PointService { .tag("行为人子女数") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员子女数为" + domicileType.getScore() + "，增加风险分" + realScore + "分") + .sourceData("发现该人员子女数为" + domicileType.getScore() ) .build(); toInsert.add(createClue(task.getModelId(), realScore, task.getId(), data)); } @@ -1417,7 +1416,7 @@ public class PointServiceImpl implements PointService { .tag("亲近家人死亡") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员亲近家人死亡，增加风险分5分") + .sourceData("发现该人员亲近家人死亡") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1467,7 +1466,7 @@ public class PointServiceImpl implements PointService { .tag("户籍类型") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员户籍类型为" + domicileType.getHlxmc() + "，增加风险分5分") + .sourceData("发现该人员户籍类型为" + domicileType.getHlxmc() ) .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1509,7 +1508,7 @@ public class PointServiceImpl implements PointService { .tag("父亲文化程度") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员父亲文化程度为" + fatherEducation.getFatherEducation() + "，增加风险分" + eduScore + "分") + .sourceData("发现该人员父亲文化程度为" + fatherEducation.getFatherEducation() ) .build(); toInsert.add(createClue(task.getModelId(), eduScore, task.getId(), data)); } @@ -1551,7 +1550,7 @@ public class PointServiceImpl implements PointService { .tag("母亲文化程度") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员母亲文化程度为" + motherEducation.getMotherEducation() + "，增加风险分" + eduScore + "分") + .sourceData("发现该人员母亲文化程度为" + motherEducation.getMotherEducation()) .build(); toInsert.add(createClue(task.getModelId(), eduScore, task.getId(), data)); } @@ -1615,7 +1614,7 @@ public class PointServiceImpl implements PointService { .tag("上访是否满意解决") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员有过上访经历，且上访没有满意解决，增加风险分5分") + .sourceData("发现该人员有过上访经历，且上访没有满意解决") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1658,7 +1657,7 @@ public class PointServiceImpl implements PointService { .tag("上访人员") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员有过上访经历，增加风险分5分") + .sourceData("发现该人员有过上访经历") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1698,7 +1697,7 @@ public class PointServiceImpl implements PointService { .tag("涉药人员") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员于" + drug.getGzdw() + "工作，属于特种工种中的涉药人员，增加风险分2分") + .sourceData("发现该人员于" + drug.getGzdw() + "工作，属于特种工种中的涉药人员") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1735,12 +1734,12 @@ public class PointServiceImpl implements PointService { .name(personal.getName()) .id(personal.getId().toString()) .idCode(personal.getIdCode()) - .tag("重点对象管控民警所控人员100人以上疑似日常管控不到位") + .tag("重点对象日常管控不到位") .departId(gBaseZDRY.getXzdpcsdm()) .departName(gBaseZDRY.getXzdpcs()) .personId(personal.getId()) .eventTime(LocalDateTime.of(2024, 10, 7, 12, 11, 23)) - .sourceData("发现该人员属于重点人员，该人员的管控民警所管控的重点人员达到100人以上\n属于未落实日常管控要求，增加风险分5分") + .sourceData("发现该人员属于重点人员，该人员的管控民警所管控的重点人员达到100人以上\n属于未落实日常管控要求") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -1922,7 +1921,7 @@ public class PointServiceImpl implements PointService { } data.setTag(Default.NO_CAR_OIL_BUY); - data.setSourceData("发现该人员属于无车人员，于" + item.getTime() + "在" + item.getCompanyName() + "购买容量为" + item.getNumber() + "L的" + item.getType() + ",用作" + item.getUseTo() + ",风险分增加5分"); + data.setSourceData("发现该人员属于无车人员，于" + item.getTime() + "在" + item.getCompanyName() + "购买容量为" + item.getNumber() + "L的" + item.getType() + ",用作" + item.getUseTo() ); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } } @@ -2007,7 +2006,7 @@ public class PointServiceImpl implements PointService { .departId(person.getControlDepartId()) .departName(person.getControlDepartName()) .personId(person.getId()) - .sourceData("发现该人员为保安人员，职位为：" + real.getJob() + "，属于特种职业，增加风险分2分。") + .sourceData("发现该人员为保安人员，职位为：" + real.getJob() + "，属于特种职业") .build(); try { if (real.getTime().indexOf("-") != -1) { @@ -2066,7 +2065,7 @@ public class PointServiceImpl implements PointService { .departName(person.getControlDepartName()) .personId(person.getId()) .eventTime(LocalDateTime.now()) - .sourceData("发现该人员有车，增加风险分5分。") + .sourceData("发现该人员有车。") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PoliceServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PoliceServiceImpl.java index 16f8677..c412b12 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PoliceServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PoliceServiceImpl.java @@ -117,7 +117,7 @@ public class PoliceServiceImpl implements PoliceService { } } if(insert) { - toInsert.add(createClue(task, 1, person, jjd, "通过对近12个月的警情筛查，发现该人员涉及："+jjd.getJqxzmc()+"的警情，接警单编号为："+jjd.getJjdbh()+"，该警情属于矛盾纠纷，增加风险分1分（发生一起增加1分，最高10分）")); + toInsert.add(createClue(task, 1, person, jjd, "通过对近12个月的警情筛查，发现该人员涉及："+jjd.getJqxzmc()+"的警情，接警单编号为："+jjd.getJjdbh())); RiskPersonalControlRecord tmpRecord = createControlRecord(person, jjd, toInsert.getLast().getRiskReason()); controlRecords.add(tmpRecord); if(person.getControlTime() == null || tmpRecord.getControlTime().isAfter(person.getControlTime())) { 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 efdf312..b28c5e1 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java @@ -380,7 +380,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { .idCode(person.getIdCode()) .personId(person.getId()) .eventTime(LocalDateTime.now()) - .sourceData("发现该人员在" + gBaseSYRKXX.getCsdxzqhmc() + "成长，该地区暴力警情情况较多，增加风险分5分") + .sourceData("发现该人员在" + gBaseSYRKXX.getCsdxzqhmc() + "成长，该地区暴力警情情况较多") .tag(gBaseSYRKXX.getCsdxzqhmc()) .build(), "area___" + person.getId().toString())); } @@ -443,7 +443,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { if (old != null) { RiskModelTaskClue update = new RiskModelTaskClue(); update.setId(old.getId()); - update.setData("该人员在近期发生" + fightMan.getFightCount() + "起矛盾纠纷，属于高频次矛盾纠纷发生人员，增加风险分3分"); + update.setData("该人员在近期发生" + fightMan.getFightCount() + "起矛盾纠纷，属于高频次矛盾纠纷发生人员"); toUpdates.add(update); continue; } @@ -454,7 +454,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { manList.add(fightMan.getGmsfhm()); continue; } - RiskModelTaskClue clue = createClue(task.getModelId(), 3, person, task.getId(), fightMan.getFightCount() + "起纠纷", "该人员在近期发生" + fightMan.getFightCount() + "起矛盾纠纷，属于高频次矛盾纠纷发生人员，增加风险分3分"); + RiskModelTaskClue clue = createClue(task.getModelId(), 3, person, task.getId(), fightMan.getFightCount() + "起纠纷", "该人员在近期发生" + fightMan.getFightCount() + "起矛盾纠纷，属于高频次矛盾纠纷发生人员"); toInsert.add(clue); person.setId(null); person.setTags(Default.FIGHT_MUCH); @@ -479,7 +479,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { RiskPersonal personal = createPerson(xx, Default.FIGHT_MUCH, orgCodeMap, orgIdMap, jqExternalDepart); toInsertPeople.add(personal); - RiskModelTaskClue clue = createClue(task.getModelId(), 3, personal, task.getId(), s.getValue().getFightCount() + "起纠纷", "该人员在近期发生" + s.getValue().getFightCount() + "起矛盾纠纷，属于高频次矛盾纠纷发生人员，增加风险分3分"); + RiskModelTaskClue clue = createClue(task.getModelId(), 3, personal, task.getId(), s.getValue().getFightCount() + "起纠纷", "该人员在近期发生" + s.getValue().getFightCount() + "起矛盾纠纷，属于高频次矛盾纠纷发生人员"); toInsert.add(clue); } @@ -528,27 +528,27 @@ public class RiskTaskServiceImpl implements RiskTaskService { } // 符合条件但是又没有旧数据 | 新增 if (age >= 16 && age <= 24) { - RiskModelTaskClue clue = createClue(task.getModelId(), 1, person, task.getId(), "年龄处于16岁至24岁之间", "该人员年龄为" + age + "，属于16岁至24岁之间，增加风险分1分"); + RiskModelTaskClue clue = createClue(task.getModelId(), 1, person, task.getId(), "年龄处于16岁至24岁之间", "该人员年龄为" + age + "，属于16岁至24岁之间"); taskClue.add(clue); continue; } if (age >= 25 && age <= 34) { - RiskModelTaskClue clue = createClue(task.getModelId(), 3, person, task.getId(), "年龄处于25岁至34岁之间", "该人员年龄为" + age + "，属于25岁至34岁之间，增加风险分3分"); + RiskModelTaskClue clue = createClue(task.getModelId(), 3, person, task.getId(), "年龄处于25岁至34岁之间", "该人员年龄为" + age + "，属于25岁至34岁之间"); taskClue.add(clue); continue; } if (age >= 35 && age <= 55) { - RiskModelTaskClue clue = createClue(task.getModelId(), 5, person, task.getId(), "年龄处于35岁至55岁之间", "该人员年龄为" + age + "，属于35岁至55岁之间，增加风险分5分"); + RiskModelTaskClue clue = createClue(task.getModelId(), 5, person, task.getId(), "年龄处于35岁至55岁之间", "该人员年龄为" + age + "，属于35岁至55岁之间"); taskClue.add(clue); continue; } if (age >= 56 && age <= 65) { - RiskModelTaskClue clue = createClue(task.getModelId(), 3, person, task.getId(), "年龄处于56岁至66岁之间", "该人员年龄为" + age + "，属于56岁至66岁之间，增加风险分3分"); + RiskModelTaskClue clue = createClue(task.getModelId(), 3, person, task.getId(), "年龄处于56岁至66岁之间", "该人员年龄为" + age + "，属于56岁至66岁之间"); taskClue.add(clue); continue; } if (age >= 66 && age <= 75) { - RiskModelTaskClue clue = createClue(task.getModelId(), 1, person, task.getId(), "年龄处于66岁至75岁之间", "该人员年龄为" + age + "，属于66岁至75岁之间，增加风险分1分"); + RiskModelTaskClue clue = createClue(task.getModelId(), 1, person, task.getId(), "年龄处于66岁至75岁之间", "该人员年龄为" + age + "，属于66岁至75岁之间"); taskClue.add(clue); } } @@ -577,7 +577,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { if (oldMap.get(person.getIdCode()) != null) { continue; } - RiskModelTaskClue clue = createClue(32, 5, person, task.getId(), "男性", "该人员性别为男性，增加风险分5分"); + RiskModelTaskClue clue = createClue(32, 5, person, task.getId(), "男性", "该人员性别为男性"); taskClue.add(clue); } riskModelTaskClueService.saveClues(taskClue, Default.GENDER_IG);