Browse Source

重构118模型3

master
sjh 1 year ago
parent
commit
1073282f9a
  1. 6
      src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
  2. 9
      src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

6
src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java

@ -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(List.of()); personalService.init(List.of(115, 116, 118));
// 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);
@ -141,8 +141,8 @@ public class ApplicationEvent {
// 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)));
// gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); // gBaseJJDService.syncOtherContradict(initDomain(List.of(75)));
pointService.syncFamilyDie(initDomain(List.of(118))); pointService.syncFamilyDie(initDomain(List.of(118)));

9
src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

@ -1416,7 +1416,14 @@ public class PointServiceImpl implements PointService {
List<GBaseCSCZRK> familys = cSCZRKRepository.getBaseMapper().selectFamilyByHh(hhPart); List<GBaseCSCZRK> familys = cSCZRKRepository.getBaseMapper().selectFamilyByHh(hhPart);
log.info("模型118查询到{}条familys", familys.size()); log.info("模型118查询到{}条familys", familys.size());
List<String> familyIds = familys.stream().map(GBaseCSCZRK::getGmsfhm).filter(v -> !idCodePart.contains(v) && !fatherCodePart.contains(v) && !motherCodePart.contains(v)).toList(); List<String> familyIds = familys.stream().map(GBaseCSCZRK::getGmsfhm).filter(v -> !idCodePart.contains(v) && !fatherCodePart.contains(v) && !motherCodePart.contains(v)).toList();
List<String> wdpcHZCRYXXS = hZCRYXXRepository.getBaseMapper().selectHZCPeople(familyIds); // 切割 每次查10000条
List<List<String>> familyIdsParts = IntStream.range(0, (familyIds.size() + 9999) / 10000)
.mapToObj(i -> familyIds.subList(i * 10000, Math.min((i + 1) * 10000, familyIds.size())))
.toList();
List<String> wdpcHZCRYXXS = new ArrayList<>();
for (List<String> familyIdsPart : familyIdsParts) {
wdpcHZCRYXXS.addAll(hZCRYXXRepository.getBaseMapper().selectHZCPeople(familyIdsPart));
}
log.info("模型118查询到{}条HZCPeople", wdpcHZCRYXXS.size()); log.info("模型118查询到{}条HZCPeople", wdpcHZCRYXXS.size());
List<String> targetHHs = familys.stream().filter(v -> wdpcHZCRYXXS.contains(v.getGmsfhm())).map(GBaseCSCZRK::getHh).toList(); List<String> targetHHs = familys.stream().filter(v -> wdpcHZCRYXXS.contains(v.getGmsfhm())).map(GBaseCSCZRK::getHh).toList();
list.addAll(riskHHsPart.stream().filter(v -> targetHHs.contains(v.getHh())).map(GBaseCSCZRK::getGmsfhm).toList()); list.addAll(riskHHsPart.stream().filter(v -> targetHHs.contains(v.getHh())).map(GBaseCSCZRK::getGmsfhm).toList());

Loading…
Cancel
Save