supervision
/
supervision-data
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改人员标签和风险项的入库逻辑

master
kami 1 year ago
parent
1604c2a079
commit
33853fa108
5 changed files with 64 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 101
      src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
  2. 2
      src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java
  3. 17
      src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java
  4. 29
      src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
  5. 18
      src/main/java/com/biutag/supervisiondata/service/impl/WdpcGrjdJsbryServiceService.java

101
src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
Unescape View File

@ -101,7 +101,7 @@ public class ApplicationEvent {
RedisDao.getInstance().init(redisTemplate); RedisDao.getInstance().init(redisTemplate);
LocalDateTime end = LocalDate.now().minusDays(1).atTime(23,59,59); LocalDateTime end = LocalDate.now().minusDays(1).atTime(23,59,59);
CompletableFutureUtil.runSync(() -> { CompletableFutureUtil.runSync(() -> {
// personalService.init(); personalService.init();
// personalService.pullInvestigate(); // personalService.pullInvestigate();
// personalService.pullPsychosis(); // personalService.pullPsychosis();
// gBaseSHRWFRService.pullAndSave(LocalDateTime.of(2019,12,6,0,0,0), end); // gBaseSHRWFRService.pullAndSave(LocalDateTime.of(2019,12,6,0,0,0), end);
@ -111,60 +111,57 @@ public class ApplicationEvent {
// gBaseJJDService.pullAndSave(LocalDateTime.of(2023, 12, 6, 0, 0, 0), end); // gBaseJJDService.pullAndSave(LocalDateTime.of(2023, 12, 6, 0, 0, 0), end);
// riskPersonalService.fixed(); // riskPersonalService.fixed();
// personalService.syncPerson(LocalDate.now()); // personalService.syncPerson(LocalDate.now());
// 32，33，34，39，41，51，53，43，63 petitionService.petitionModelTask(initDomain(List.of(40)));
// 36 60 61 62 44 45 48 52 59 64 riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41)));
// 76 74 73 72 71 70 69 67 66 65 55 56 57 58 68 riskTaskService.infoModelTask(initDomain(List.of(32,33)));
// petitionService.petitionModelTask(initDomain(List.of(40))); marriageService.marriageModelTask(initDomain(List.of(39,51)));
// riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41)));
// riskTaskService.infoModelTask(initDomain(List.of(32,33))); habitService.habitModelTask(LocalDateTime.of(2023, 12, 6, 0, 0, 0), initDomain(List.of(36,60,61,62)));
// marriageService.marriageModelTask(initDomain(List.of(39,51))); pointService.syncCarUser(initDomain(List.of(53)));
pointService.syncScore(initDomain(List.of(43)));
// habitService.habitModelTask(LocalDateTime.of(2023, 12, 6, 0, 0, 0), initDomain(List.of(36,60,61,62))); pointService.syncViolence(initDomain(List.of(44)));
// pointService.syncCarUser(initDomain(List.of(53))); noControlService.syncNoControlData(initDomain(List.of(45)));
// pointService.syncScore(initDomain(List.of(43)));
// pointService.syncViolence(initDomain(List.of(44))); pointService.syncControlNoPower(initDomain(List.of(48)));
// noControlService.syncNoControlData(initDomain(List.of(45)));
// pointService.syncControlNoPower(initDomain(List.of(48)));
pointService.syncOilBuy(initDomain(List.of(52))); pointService.syncOilBuy(initDomain(List.of(52)));
// gBaseJJDService.pullPoliceInstance(LocalDateTime.of(2023, 12, 6, 0, 0, 0), end, initDomain(List.of(55,56,57,58))); gBaseJJDService.pullPoliceInstance(LocalDateTime.of(2023, 12, 6, 0, 0, 0), end, initDomain(List.of(55,56,57,58)));
// jsbryService.syncPys(initDomain(List.of(59))); jsbryService.syncPys(initDomain(List.of(59)));
// gBaseSHRWFRService.combatCrime(initDomain(List.of(63))); 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))); gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66)));
// pointService.syncPointType(initDomain(List.of(67))); pointService.syncPointType(initDomain(List.of(67)));
// gBaseSHRWFRService.hadWork(initDomain(List.of(68))); gBaseSHRWFRService.hadWork(initDomain(List.of(68)));
// gBaseJJDService.syncParentRelation(initDomain(List.of(69,70))); gBaseJJDService.syncParentRelation(initDomain(List.of(69,70)));
// gBaseJJDService.syncLove(initDomain(List.of(71))); gBaseJJDService.syncLove(initDomain(List.of(71)));
// gBaseJJDService.syncMarryDispute(initDomain(List.of(72))); gBaseJJDService.syncMarryDispute(initDomain(List.of(72)));
// gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73))); gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73)));
// gBaseJJDService.syncBullying(initDomain(List.of(74))); gBaseJJDService.syncBullying(initDomain(List.of(74)));
gBaseSHRWFRService.crimeName(initDomain(List.of(76))); gBaseSHRWFRService.crimeName(initDomain(List.of(76)));
// pointService.syncIsPetition(initDomain(List.of(40))); pointService.syncIsPetition(initDomain(List.of(40)));
// pointService.syncFatherEducation(initDomain(List.of(112))); pointService.syncFatherEducation(initDomain(List.of(112)));
// pointService.syncMotherEducation(initDomain(List.of(113))); pointService.syncMotherEducation(initDomain(List.of(113)));
// pointService.syncDomicileType(initDomain(List.of(114))); pointService.syncDomicileType(initDomain(List.of(114)));
// pointService.syncCriminalPunishment(initDomain(List.of(115))); pointService.syncCriminalPunishment(initDomain(List.of(115)));
// pointService.syncAdministrativePunishment(initDomain(List.of(116))); pointService.syncAdministrativePunishment(initDomain(List.of(116)));
// pointService.syncParentsDivorce(initDomain(List.of(117))); pointService.syncParentsDivorce(initDomain(List.of(117)));
// pointService.syncFamilyDie(initDomain(List.of(118))); pointService.syncFamilyDie(initDomain(List.of(118)));
// pointService.syncFatherDie(initDomain(List.of(119))); pointService.syncFatherDie(initDomain(List.of(119)));
// pointService.syncMotherDie(initDomain(List.of(120))); pointService.syncMotherDie(initDomain(List.of(120)));
// pointService.syncChildNo(initDomain(List.of(121))); pointService.syncChildNo(initDomain(List.of(121)));
// pointService.syncXIDU(initDomain(List.of(122))); pointService.syncXIDU(initDomain(List.of(122)));
// pointService.syncFiliation(initDomain(List.of(123))); pointService.syncFiliation(initDomain(List.of(123)));
// 必须在123后面 // 必须在123后面
// gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); gBaseJJDService.syncOtherContradict(initDomain(List.of(75)));
// pointService.syncPetitionContent(initDomain(List.of(124))); pointService.syncPetitionContent(initDomain(List.of(124)));
// pointService.syncMedicalPressure(initDomain(List.of(125))); pointService.syncMedicalPressure(initDomain(List.of(125)));
// pointService.syncSeriousIllness(initDomain(List.of(126))); pointService.syncSeriousIllness(initDomain(List.of(126)));
// pointService.syncFamilySeriousIllness(initDomain(List.of(127))); pointService.syncFamilySeriousIllness(initDomain(List.of(127)));
// pointService.syncPetitionDissatisfied(initDomain(List.of(128))); pointService.syncPetitionDissatisfied(initDomain(List.of(128)));
// pointService.syncIsSpecialPeople(initDomain(List.of(129))); pointService.syncIsSpecialPeople(initDomain(List.of(129)));
// pointService.syncSpecialPeopleType(initDomain(List.of(130))); pointService.syncSpecialPeopleType(initDomain(List.of(130)));
// pointService.syncParentsRelationship(initDomain(List.of(131))); pointService.syncParentsRelationship(initDomain(List.of(131)));
// pointService.syncMentalDiseaseDriver(initDomain(List.of(132))); pointService.syncMentalDiseaseDriver(initDomain(List.of(132)));
// *********暂时不要********** // *********暂时不要**********
// riskTaskService.heightFight(initDomain(List.of(42))); // riskTaskService.heightFight(initDomain(List.of(42)));
// pointService.syncKillSelf(initDomain(List.of(46))); // pointService.syncKillSelf(initDomain(List.of(46)));

2
src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java
Unescape View File

@ -1066,7 +1066,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
if (!toInsert.isEmpty()) { if (!toInsert.isEmpty()) {
log.info("其他纠纷：{} ", toInsert.size()); log.info("其他纠纷：{} ", toInsert.size());
clueService.saveClues(toInsert, Default.HOME_VIOLENCE); clueService.saveClues(toInsert,"B57其他矛盾纠纷");
} }
taskRepository.updateTask(task.getId(), toInsert.size(), 0); taskRepository.updateTask(task.getId(), toInsert.size(), 0);
} }

17
src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java
Unescape View File

@ -542,21 +542,4 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
} }
return org; return org;
} }
RiskModelTaskClue createClue(Integer modelId, Integer score, Integer taskId, ClueData data) {
RiskModelTaskClue clue = new RiskModelTaskClue();
clue.setModelId(modelId);
clue.setScore(score);
clue.setName(data.getName());
clue.setIdCode(data.getIdCode());
clue.setTaskId(taskId);
clue.setData(data.getSourceData());
clue.setEventTime(data.getEventTime());
clue.setCreateTime(LocalDateTime.now());
clue.setUpdateTime(LocalDateTime.now());
clue.setCaseIds(data.getId());
clue.setRiskReason(data.getTag());
return clue;
}
} }

29
src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
Unescape View File

@ -296,12 +296,12 @@ public class PetitionServiceImpl implements PetitionService {
LocalDateTime time = LocalDateTime.now().minusMonths(12); LocalDateTime time = LocalDateTime.now().minusMonths(12);
List<PetitionData> dataList1 = new ArrayList<>(); // List<PetitionData> dataList1 = new ArrayList<>();
List<PetitionData> dataList2 = new ArrayList<>(); List<PetitionData> dataList2 = new ArrayList<>();
List<PetitionData> dataList3 = new ArrayList<>(); List<PetitionData> dataList3 = new ArrayList<>();
CompletableFuture.allOf( CompletableFuture.allOf(
CompletableFutureUtil.runSyncObject(() -> dataList1.addAll(dataCaseVerifRepository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))), // CompletableFutureUtil.runSyncObject(() -> dataList1.addAll(dataCaseVerifRepository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))),
CompletableFutureUtil.runSyncObject(() -> dataList2.addAll(complaintRepository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))), CompletableFutureUtil.runSyncObject(() -> dataList2.addAll(complaintRepository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))),
CompletableFutureUtil.runSyncObject(() -> dataList3.addAll(petition12337Repository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))) CompletableFutureUtil.runSyncObject(() -> dataList3.addAll(petition12337Repository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))))
).join(); ).join();
@ -311,23 +311,20 @@ public class PetitionServiceImpl implements PetitionService {
List<RiskModelTaskClue> oldList = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>()); List<RiskModelTaskClue> oldList = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>());
Map<String, RiskModelTaskClue> oldMap = oldList.stream().collect(Collectors.toMap(RiskModelTaskClue::getCaseIds, Function.identity(), (val, old) -> val)); Map<String, RiskModelTaskClue> oldMap = oldList.stream().collect(Collectors.toMap(RiskModelTaskClue::getCaseIds, Function.identity(), (val, old) -> val));
List<RiskModelTaskClue> toInsert1 = new ArrayList<>(createClues(dataList1, oldMap, idCodeMan, task, Default.PETITION_CASE_TAG)); // List<RiskModelTaskClue> toInsert1 = new ArrayList<>(createClues(dataList1, oldMap, idCodeMan, task, Default.PETITION_CASE_TAG));
List<RiskModelTaskClue> toInsert2 = new ArrayList<>(createClues(dataList2, oldMap, idCodeMan, task, Default.PETITION_TAG)); List<RiskModelTaskClue> toInsert2 = new ArrayList<>(createClues(dataList2, oldMap, idCodeMan, task, Default.PETITION_TAG));
List<RiskModelTaskClue> toInsert3 = new ArrayList<>(createClues(dataList3, oldMap, idCodeMan, task, Default.PETITION_12337_TAG)); List<RiskModelTaskClue> toInsert3 = new ArrayList<>(createClues(dataList3, oldMap, idCodeMan, task, Default.PETITION_12337_TAG));
toInsert2.addAll(toInsert3);
if (!toInsert1.isEmpty()) { Map<String, List<RiskModelTaskClue>> map = toInsert2.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode));
log.info("信访数据1: {}", toInsert1.size()); List<RiskModelTaskClue> toInsert = new ArrayList<>();
riskModelTaskClueService.saveClues(toInsert1, Default.PETITION_CASE_TAG); for (Map.Entry<String, List<RiskModelTaskClue>> entry : map.entrySet()) {
} toInsert.add(entry.getValue().getFirst());
if (!toInsert2.isEmpty()) {
log.info("信访数据2: {}", toInsert2.size());
riskModelTaskClueService.saveClues(toInsert2, Default.PETITION_TAG);
} }
if (!toInsert3.isEmpty()) { if(!toInsert.isEmpty()) {
log.info("信访数据3: {}", toInsert3.size()); riskModelTaskClueService.saveClues(toInsert, "B20是否上访");
riskModelTaskClueService.saveClues(toInsert3, Default.PETITION_12337_TAG);
} }
riskTaskRepository.updateTask(task.getId(), toInsert1.size() + toInsert2.size() + toInsert3.size(), 0); riskTaskRepository.updateTask(task.getId(), toInsert.size(), 0);
} }
List<RiskModelTaskClue> createClues(List<PetitionData> dataList, Map<String, RiskModelTaskClue> oldMap, Map<String, RiskPersonal> idCodeMan, RiskTask task, String tag) { List<RiskModelTaskClue> createClues(List<PetitionData> dataList, Map<String, RiskModelTaskClue> oldMap, Map<String, RiskPersonal> idCodeMan, RiskTask task, String tag) {
@ -344,8 +341,8 @@ public class PetitionServiceImpl implements PetitionService {
.id("") .id("")
.score(5) .score(5)
.personId(person.getId()) .personId(person.getId())
.tags(List.of(tag)) .tags(List.of("存在上访"))
.sourceData("该人员在近12个月内有" + tag + "的情况，具体情况为：" + data.getContent()) .sourceData("该人员存在上访行为")
.name(person.getName()) .name(person.getName())
.idCode(person.getIdCode()) .idCode(person.getIdCode())
.eventTime(null) .eventTime(null)

18
src/main/java/com/biutag/supervisiondata/service/impl/WdpcGrjdJsbryServiceService.java
Unescape View File

@ -81,24 +81,8 @@ public class WdpcGrjdJsbryServiceService implements WdpcGrjdJsbryService {
} }
if(!toInsert.isEmpty()) { if(!toInsert.isEmpty()) {
clueService.saveClues(toInsert, "精神心理特征"); clueService.saveClues(toInsert, "B31是否有精神疾病");
} }
taskRepository.updateTask(task.getId(), toInsert.size(), 0); taskRepository.updateTask(task.getId(), toInsert.size(), 0);
} }
RiskModelTaskClue createClue(Integer modelId, Integer score, Integer taskId, ClueData data) {
RiskModelTaskClue clue = new RiskModelTaskClue();
clue.setModelId(modelId);
clue.setScore(score);
clue.setName(data.getName());
clue.setIdCode(data.getIdCode());
clue.setTaskId(taskId);
clue.setData(data.getSourceData());
clue.setEventTime(data.getEventTime());
clue.setCreateTime(LocalDateTime.now());
clue.setUpdateTime(LocalDateTime.now());
clue.setCaseIds(data.getId());
clue.setRiskReason(data.getTag());
return clue;
}
} }

Write Preview
Loading…
Cancel
Save