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

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

master
kami 1 year ago
parent
9f7d276a49
commit
219fe269fe
6 changed files with 65 additions and 61 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. 106
      src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
  2. 12
      src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java
  3. 1
      src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java
  4. 3
      src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java
  5. 2
      src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java
  6. 2
      src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java

106
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,58 +111,58 @@ 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());
petitionService.petitionModelTask(initDomain(List.of(40))); // petitionService.petitionModelTask(initDomain(List.of(40)));
riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); // riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41)));
riskTaskService.infoModelTask(initDomain(List.of(32,33))); // riskTaskService.infoModelTask(initDomain(List.of(32,33)));
marriageService.marriageModelTask(initDomain(List.of(39,51))); // marriageService.marriageModelTask(initDomain(List.of(39,51)));
//
habitService.habitModelTask(LocalDateTime.of(2023, 12, 6, 0, 0, 0), initDomain(List.of(36,60,61,62))); // habitService.habitModelTask(LocalDateTime.of(2023, 12, 6, 0, 0, 0), initDomain(List.of(36,60,61,62)));
pointService.syncCarUser(initDomain(List.of(53))); // pointService.syncCarUser(initDomain(List.of(53)));
pointService.syncScore(initDomain(List.of(43))); // pointService.syncScore(initDomain(List.of(43)));
pointService.syncViolence(initDomain(List.of(44))); // pointService.syncViolence(initDomain(List.of(44)));
noControlService.syncNoControlData(initDomain(List.of(45))); // noControlService.syncNoControlData(initDomain(List.of(45)));
//
pointService.syncControlNoPower(initDomain(List.of(48))); // pointService.syncControlNoPower(initDomain(List.of(48)));
pointService.syncOilBuy(initDomain(List.of(52))); // pointService.syncOilB uy(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))); // 12-16报错
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)));
pointService.syncXIDUDriver(initDomain(List.of(133))); // pointService.syncXIDUDriver(initDomain(List.of(133)));
// *********暂时不要********** // *********暂时不要**********
// riskTaskService.heightFight(initDomain(List.of(42))); // riskTaskService.heightFight(initDomain(List.of(42)));
// pointService.syncKillSelf(initDomain(List.of(46))); // pointService.syncKillSelf(initDomain(List.of(46)));

12
src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java
Unescape View File

@ -48,8 +48,8 @@ public class MarriageServiceImpl implements MarriageService {
Map<String, WdpcGrjdHyqkb> dataMap = data.stream().collect(Collectors.toMap(WdpcGrjdHyqkb::getIdCode, Function.identity(), (val, old) -> val)); Map<String, WdpcGrjdHyqkb> dataMap = data.stream().collect(Collectors.toMap(WdpcGrjdHyqkb::getIdCode, Function.identity(), (val, old) -> val));
log.info("开始查询结婚数据：{}", dataMap.size()); log.info("开始查询结婚数据：{}", dataMap.size());
Map<String, RiskModelTaskClue> old1 = domain.getOldMap(39, true); Map<String, RiskModelTaskClue> old1 = domain.getOldMap(task.getModelId(), true);
Map<String, RiskModelTaskClue> old2 = domain.getOldMap(51, true); Map<String, RiskModelTaskClue> old2 = domain.getOldMap(task2.getModelId(), true);
List<RiskModelTaskClue> toInsert1 = new ArrayList<>(); List<RiskModelTaskClue> toInsert1 = new ArrayList<>();
@ -77,7 +77,7 @@ public class MarriageServiceImpl implements MarriageService {
} catch (Exception e) { } catch (Exception e) {
clueData.setEventTime(LocalDateTime.now()); clueData.setEventTime(LocalDateTime.now());
} }
toInsert1.add(DataUtil.createClueData(task, clueData)); toInsert1.add(DataUtil.createClueData(task2, clueData));
if(clueData.getEventTime().isBefore(yearsDate) || old2.get(person.getIdCode()) != null) { if(clueData.getEventTime().isBefore(yearsDate) || old2.get(person.getIdCode()) != null) {
continue; continue;
} }
@ -95,7 +95,7 @@ public class MarriageServiceImpl implements MarriageService {
} catch (Exception e) { } catch (Exception e) {
clueData2.setEventTime(LocalDateTime.now()); clueData2.setEventTime(LocalDateTime.now());
} }
toInsert2.add(DataUtil.createClueData(task2, clueData2)); toInsert2.add(DataUtil.createClueData(task, clueData2));
} }
List<RiskModelTaskClue> toUpdate = new ArrayList<>(); List<RiskModelTaskClue> toUpdate = new ArrayList<>();
@ -114,7 +114,7 @@ public class MarriageServiceImpl implements MarriageService {
log.info("新增离婚数据：{}", toInsert1.size()); log.info("新增离婚数据：{}", toInsert1.size());
riskModelTaskClueService.saveClues(toInsert1, "婚姻状态"); riskModelTaskClueService.saveClues(toInsert1, "婚姻状态");
} }
riskTaskRepository.updateTask(task.getId(), toInsert1.size(), 0); riskTaskRepository.updateTask(task2.getId(), toInsert1.size(), 0);
if(!toInsert2.isEmpty()) { if(!toInsert2.isEmpty()) {
log.info("新增个人婚姻创伤：{}", toInsert2.size()); log.info("新增个人婚姻创伤：{}", toInsert2.size());
@ -124,6 +124,6 @@ public class MarriageServiceImpl implements MarriageService {
log.info("修改个人婚姻创伤：{}", toUpdate.size()); log.info("修改个人婚姻创伤：{}", toUpdate.size());
riskModelTaskClueService.deleteCluesAndDeleteTag(toUpdate, idCodes, "个人婚姻创伤"); riskModelTaskClueService.deleteCluesAndDeleteTag(toUpdate, idCodes, "个人婚姻创伤");
} }
riskTaskRepository.updateTask(task.getId(), toInsert1.size(), toUpdate.size()); riskTaskRepository.updateTask(task.getId(), toInsert2.size(), toUpdate.size());
} }
} }

1
src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java
Unescape View File

@ -486,6 +486,7 @@ public class PersonalServiceImpl implements PersonalService {
@Override @Override
public void init() { public void init() {
// riskTestRepository.getBaseMapper().truncatePerson();
riskTestRepository.getBaseMapper().truncateClue(); riskTestRepository.getBaseMapper().truncateClue();
riskTestRepository.getBaseMapper().truncateTag(); riskTestRepository.getBaseMapper().truncateTag();
riskTestRepository.getBaseMapper().truncateTask(); riskTestRepository.getBaseMapper().truncateTask();

3
src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java
Unescape View File

@ -52,6 +52,9 @@ public class RiskPersonalServiceImpl implements RiskPersonalService {
@Override @Override
public void formatAndSave(List<RiskPersonal> list, String bigTag) { public void formatAndSave(List<RiskPersonal> list, String bigTag) {
List<String> searchOldCode = new ArrayList<>(); List<String> searchOldCode = new ArrayList<>();
for (RiskPersonal riskPersonal : list) {
riskPersonal.setIdCode(riskPersonal.getIdCode().toUpperCase());
}
list.stream().map(RiskPersonal::getIdCode).distinct().forEach(searchOldCode::add); list.stream().map(RiskPersonal::getIdCode).distinct().forEach(searchOldCode::add);
// 速度是割出来的 // 速度是割出来的
List<List<String>> olds = IntStream.range(0, (searchOldCode.size() + 9999) / 10000) List<List<String>> olds = IntStream.range(0, (searchOldCode.size() + 9999) / 10000)

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

@ -63,7 +63,7 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService {
Map<Integer, Model> modelMap = models.stream().collect(Collectors.toMap(Model::getRiskScoreRuleId, Function.identity(), (oldValue, newValue) -> newValue)); Map<Integer, Model> modelMap = models.stream().collect(Collectors.toMap(Model::getRiskScoreRuleId, Function.identity(), (oldValue, newValue) -> newValue));
List<RiskModelTaskClue> clues = riskModelTaskClueRepository.list(new LambdaQueryWrapper<RiskModelTaskClue>() List<RiskModelTaskClue> clues = riskModelTaskClueRepository.list(new LambdaQueryWrapper<RiskModelTaskClue>()
.select(RiskModelTaskClue::getIdCode, RiskModelTaskClue::getModelId, RiskModelTaskClue::getScore, RiskModelTaskClue::getScoreResult) .select(RiskModelTaskClue::getIdCode, RiskModelTaskClue::getModelId, RiskModelTaskClue::getScore, RiskModelTaskClue::getScoreCalc)
.eq(RiskModelTaskClue::getDel, 0)); .eq(RiskModelTaskClue::getDel, 0));
log.info("1、修改每项得分\n2、修改人员总分"); log.info("1、修改每项得分\n2、修改人员总分");
log.info("1、计算分项倍分"); log.info("1、计算分项倍分");

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

@ -194,7 +194,7 @@ public class RiskTaskServiceImpl implements RiskTaskService {
if(!areCode.contains(xx.getCsdxzqhdm())) { if(!areCode.contains(xx.getCsdxzqhdm())) {
continue; continue;
} }
toInsert2.add(DataUtil.createClueData(eduTask, ClueData.builder() toInsert2.add(DataUtil.createClueData(areaTask, ClueData.builder()
.id(BhUtil.sfBh(person.getId().toString())) .id(BhUtil.sfBh(person.getId().toString()))
.score(5) .score(5)
.personId(person.getId()) .personId(person.getId())

Write Preview
Loading…
Cancel
Save