diff --git a/src/main/java/com/biutag/supervisiondata/service/PersonalService.java b/src/main/java/com/biutag/supervisiondata/service/PersonalService.java index a11eddb..b64f535 100644 --- a/src/main/java/com/biutag/supervisiondata/service/PersonalService.java +++ b/src/main/java/com/biutag/supervisiondata/service/PersonalService.java @@ -22,7 +22,9 @@ public interface PersonalService { /** * 矛盾纠纷人员 */ - void pullContradictionInfo(); + void pullContradictionInfo(LocalDateTime start); + + void pullPetition(LocalDateTime start); void syncOrg(); 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 94a37f4..273e512 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java @@ -65,7 +65,7 @@ public class MarriageServiceImpl implements MarriageService { .select(GBaseHY::getYwlxdmmc, GBaseHY::getYwlxdmdm, GBaseHY::getYxbzdm, GBaseHY::getNfsfhm, GBaseHY::getNvfsfhm,GBaseHY::getDjrq) .eq(GBaseHY::getYxbzdm, "1") .in(GBaseHY::getNvfsfhm, idCard))); - log.info("查询经度: {}", count); + log.info("查询进度: {}", count); } // 每个人应该是最新的婚姻登记为标准 @@ -135,7 +135,7 @@ public class MarriageServiceImpl implements MarriageService { } ClueData data = ClueData.builder() .personId(person.getId()) - .tag(last.getYwlxdmmc()) + .tag("近12月内离婚") .id(last.getXlzjdjzh()) .idCode(person.getIdCode()) .name(person.getName()) @@ -151,7 +151,7 @@ public class MarriageServiceImpl implements MarriageService { } ClueData data = ClueData.builder() .personId(person.getId()) - .tag(last.getYwlxdmmc()) + .tag("离婚") .id(last.getXlzjdjzh()) .idCode(person.getIdCode()) .name(person.getName()) diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java index bf1f889..8c41016 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java @@ -8,9 +8,7 @@ import com.biutag.supervisiondata.pojo.entity.ads.GBaseSYRKXX; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseJJD; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseTbDZdrylb; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseZDRY; -import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonal; -import com.biutag.supervisiondata.pojo.entity.mine.SupDepart; -import com.biutag.supervisiondata.pojo.entity.mine.SupExternalDepart; +import com.biutag.supervisiondata.pojo.entity.mine.*; import com.biutag.supervisiondata.pojo.enums.DepartType; import com.biutag.supervisiondata.repository.*; import com.biutag.supervisiondata.service.PersonalService; @@ -163,7 +161,7 @@ public class PersonalServiceImpl implements PersonalService { List personals = new ArrayList<>(); for (GBaseZDRY ry : list) { - if(exist.get(ry.getSfzh()) != null) { + if (exist.get(ry.getSfzh()) != null) { continue; } exist.put(ry.getSfzh(), new Byte[0]); @@ -192,12 +190,12 @@ public class PersonalServiceImpl implements PersonalService { .filter(Character::isDigit) .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append) .toString(); - if(number.length() < 8 || number.equals("00000000")) { + if (number.length() < 8 || number.equals("00000000")) { continue; } mobiles.append(s).append(","); } - personal.setMobileNumber(mobiles.substring(0, mobiles.length()-1)); + personal.setMobileNumber(mobiles.length() == 0 ? "" : mobiles.substring(0, mobiles.length() - 1)); } personals.add(personal); } @@ -205,31 +203,60 @@ public class PersonalServiceImpl implements PersonalService { } @Override - public void pullContradictionInfo() { + public void pullContradictionInfo(LocalDateTime start) { LocalDateTime now = LocalDateTime.now(); - List list = gBaseSYRKXXRepository.getBaseMapper().selectContradiction(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + List list = gBaseSYRKXXRepository.getBaseMapper().selectContradiction(start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); List idCode = list.stream().map(Contradiction::getGmsfhm).distinct().toList(); // 切割 List> idCodes = IntStream.range(0, (idCode.size() + 9999) / 10000) .mapToObj(i -> idCode.subList(i * 10000, Math.min((i + 1) * 10000, idCode.size()))) .collect(Collectors.toList()); - Map map = list.stream().collect(Collectors.toMap(Contradiction::getGmsfhm, Function.identity(), (val, old)->val)); + Map map = list.stream().collect(Collectors.toMap(Contradiction::getGmsfhm, Function.identity(), (val, old) -> val)); List xxList = getByIdCode(idCodes); Map exist = new WeakHashMap<>(); List personals = new ArrayList<>(); for (GBaseSYRKXX syrkxx : xxList) { - if(exist.get(syrkxx.getGmsfhm()) != null) { + if (exist.get(syrkxx.getGmsfhm()) != null) { continue; } exist.put(syrkxx.getGmsfhm(), new Byte[0]); Contradiction contradiction = map.get(syrkxx.getGmsfhm()); personals.add(createPerson(syrkxx, Optional.of(contradiction).map(Contradiction::getMaxTime) - .orElse(null) ,now.toLocalDate(), now)); + .orElse(null), now.toLocalDate(), now)); } riskPersonalService.saveDistinct(personals); } + private final DataPetition12337Repository petition12337Repository; + + private final DataPetitionComplaintRepository complaintRepository; + + private final DataCaseVerifRepository dataCaseVerifRepository; + + @Override + public void pullPetition(LocalDateTime start) { + List pList1 = petition12337Repository.list(new LambdaQueryWrapper() + .select(DataPetition12337::getName, DataPetition12337::getIdCode, DataPetition12337::getPhone, DataPetition12337::getThirdDepartId, DataPetition12337::getThirdDepartName) + .ge(DataPetition12337::getDiscoverTime, start)); + + List pList2 = complaintRepository.list(new LambdaQueryWrapper() + .select(DataPetitionComplaint::getResponderName, DataPetitionComplaint::getResponderPhone, DataPetitionComplaint::getResponderName, DataPetitionComplaint::getThirdDepartId, DataPetitionComplaint::getThirdDepartName) + .ge(DataPetitionComplaint::getDiscoveryTime, start)); + + List pList3 = dataCaseVerifRepository.list(new LambdaQueryWrapper() + .select(DataCaseVerif::getResponderName, DataCaseVerif::getResponderPhone, DataCaseVerif::getThirdDepartId, DataCaseVerif::getThirdDepartName) + .ge(DataCaseVerif::getDiscoveryTime, start)); + + List ids = new ArrayList<>(); + List mobiles = new ArrayList<>(); + ids.addAll(pList1.stream().map(DataPetition12337::getIdCode).toList()); + ids.addAll(pList2.stream().map(DataPetitionComplaint::getResponderIdCode).toList()); + mobiles.addAll(pList3.stream().map(DataCaseVerif::getResponderPhone).toList()); + + + } + private final SupExternalDepartRepository supExternalDepartRepository; @Override 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 30ce798..82341d3 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java @@ -643,7 +643,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { RiskPersonal personal = createPerson(xx, Default.FIGHT_MUCH); toInsertPeople.add(personal); - RiskModelTaskClue clue = createClue(task.getModelId(),3, personal,task.getId(), Default.FIGHT_MUCH, "该人员在近期发生"+s.getValue().getFightCount()+"起矛盾纠纷，属于高频次矛盾纠纷发生人员，增加风险分3分"); + RiskModelTaskClue clue = createClue(task.getModelId(),3, personal,task.getId(), s.getValue().getFightCount()+"起纠纷", "该人员在近期发生"+s.getValue().getFightCount()+"起矛盾纠纷，属于高频次矛盾纠纷发生人员，增加风险分3分"); toInsert.add(clue); } @@ -711,16 +711,6 @@ public class RiskTaskServiceImpl implements RiskTaskService { toHidden.add(hidden); } } -// if (age >= 75) { -// RiskModelTaskClue clue = createClue(33, -1, person, task.getId(), "年龄处于75岁以上"); -// taskClue.add(clue); -// if (old != null) { -// RiskModelTaskClue hidden = new RiskModelTaskClue(); -// hidden.setId(old.getId()); -// hidden.setDel(0); -// toHidden.add(hidden); -// } -// } } return ClueInfo.builder() .toHidden(toHidden)