Browse Source

Merge remote-tracking branch 'origin/master'

master
sjh 1 year ago
parent
commit
86327fad93
  1. 118
      src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
  2. 2
      src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcPersonMapper.java

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

@ -102,67 +102,67 @@ public class ApplicationEvent {
LocalDateTime start = LocalDateTime.of(2023, 12, 6, 0, 0, 0); LocalDateTime start = LocalDateTime.of(2023, 12, 6, 0, 0, 0);
LocalDateTime end = LocalDateTime.now(); LocalDateTime end = LocalDateTime.now();
CompletableFutureUtil.runSync(() -> { CompletableFutureUtil.runSync(() -> {
personalService.init(); // personalService.init();
personalService.pullInvestigate(); // personalService.pullInvestigate();
personalService.pullPsychosis(); // personalService.pullPsychosis();
gBaseSHRWFRService.pullAndSave(start, end); // gBaseSHRWFRService.pullAndSave(start, end);
petitionService.personPullAndSave(start, end); // petitionService.personPullAndSave(start, end);
personalService.pullPetitionAgain(); // personalService.pullPetitionAgain();
pointService.personPullAndSave(start, end); // pointService.personPullAndSave(start, end);
gBaseJJDService.pullAndSave(start, end); // gBaseJJDService.pullAndSave(start, end);
riskPersonalService.fixed(); // riskPersonalService.fixed();
personalService.syncPerson();
petitionService.petitionModelTask(initDomain(List.of(40))); //
riskTaskService.eduModelTask(initDomain(List.of(34))); // petitionService.petitionModelTask(initDomain(List.of(40)));
riskTaskService.infoModelTask(initDomain(List.of(32,33))); // riskTaskService.eduModelTask(initDomain(List.of(34)));
marriageService.marriageModelTask(initDomain(List.of(39,51))); // riskTaskService.infoModelTask(initDomain(List.of(32,33)));
pointService.syncSecurity(initDomain(List.of(37))); // marriageService.marriageModelTask(initDomain(List.of(39,51)));
habitService.habitModelTask(start, initDomain(List.of(36,60,61,62))); // pointService.syncSecurity(initDomain(List.of(37)));
pointService.syncCarUser(initDomain(List.of(53))); // habitService.habitModelTask(start, initDomain(List.of(36,60,61,62)));
riskTaskService.riskAreaModelTask(initDomain(List.of(41))); // pointService.syncCarUser(initDomain(List.of(53)));
pointService.syncScore(initDomain(List.of(43))); // riskTaskService.riskAreaModelTask(initDomain(List.of(41)));
pointService.syncViolence(initDomain(List.of(44))); // pointService.syncScore(initDomain(List.of(43)));
noControlService.syncNoControlData(initDomain(List.of(45))); // pointService.syncViolence(initDomain(List.of(44)));
pointService.syncDrug(initDomain(List.of(37))); // noControlService.syncNoControlData(initDomain(List.of(45)));
pointService.syncControlNoPower(initDomain(List.of(48))); // pointService.syncDrug(initDomain(List.of(37)));
pointService.syncOilBuy(initDomain(List.of(52))); // pointService.syncControlNoPower(initDomain(List.of(48)));
gBaseJJDService.pullPoliceInstance(start, end, initDomain(List.of(55,56,57,58))); // pointService.syncOilBuy(initDomain(List.of(52)));
jsbryService.syncPys(initDomain(List.of(59))); // gBaseJJDService.pullPoliceInstance(start, end, initDomain(List.of(55,56,57,58)));
gBaseSHRWFRService.combatCrime(initDomain(List.of(63))); // jsbryService.syncPys(initDomain(List.of(59)));
gBaseJJDService.syncPoliceAttack(initDomain(List.of(64))); // gBaseSHRWFRService.combatCrime(initDomain(List.of(63)));
gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66))); // gBaseJJDService.syncPoliceAttack(initDomain(List.of(64)));
pointService.syncPointType(initDomain(List.of(67))); // gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66)));
gBaseSHRWFRService.hadWork(initDomain(List.of(68))); // pointService.syncPointType(initDomain(List.of(67)));
gBaseJJDService.syncParentRelation(initDomain(List.of(69,70))); // gBaseSHRWFRService.hadWork(initDomain(List.of(68)));
gBaseJJDService.syncLove(initDomain(List.of(71))); // gBaseJJDService.syncParentRelation(initDomain(List.of(69,70)));
gBaseJJDService.syncMarryDispute(initDomain(List.of(72))); // gBaseJJDService.syncLove(initDomain(List.of(71)));
gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73))); // gBaseJJDService.syncMarryDispute(initDomain(List.of(72)));
gBaseJJDService.syncBullying(initDomain(List.of(74))); // gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73)));
gBaseSHRWFRService.crimeName(initDomain(List.of(76))); // gBaseJJDService.syncBullying(initDomain(List.of(74)));
pointService.syncIsPetition(initDomain(List.of(40))); // gBaseSHRWFRService.crimeName(initDomain(List.of(76)));
pointService.syncFatherEducation(initDomain(List.of(112))); // pointService.syncIsPetition(initDomain(List.of(40)));
pointService.syncMotherEducation(initDomain(List.of(113))); // pointService.syncFatherEducation(initDomain(List.of(112)));
pointService.syncDomicileType(initDomain(List.of(114))); // pointService.syncMotherEducation(initDomain(List.of(113)));
// pointService.syncCriminalPunishment(initDomain(List.of(115)));// 需重跑 报错 // pointService.syncDomicileType(initDomain(List.of(114)));
pointService.syncAdministrativePunishment(initDomain(List.of(116)));// 需重跑 pointService.syncCriminalPunishment(initDomain(List.of(115)));// 需重跑 报错
pointService.syncParentsDivorce(initDomain(List.of(117))); // pointService.syncAdministrativePunishment(initDomain(List.of(116)));// 需重跑
pointService.syncFamilyDie(initDomain(List.of(118))); // pointService.syncParentsDivorce(initDomain(List.of(117)));
pointService.syncFatherDie(initDomain(List.of(119))); // pointService.syncFamilyDie(initDomain(List.of(118)));
pointService.syncMotherDie(initDomain(List.of(120))); // pointService.syncFatherDie(initDomain(List.of(119)));
pointService.syncChildNo(initDomain(List.of(121))); // pointService.syncMotherDie(initDomain(List.of(120)));
pointService.syncXIDU(initDomain(List.of(122))); // pointService.syncChildNo(initDomain(List.of(121)));
pointService.syncFiliation(initDomain(List.of(123))); // pointService.syncXIDU(initDomain(List.of(122)));
// 必须在123后面 // pointService.syncFiliation(initDomain(List.of(123)));
gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); // // 必须在123后面
// gBaseJJDService.syncOtherContradict(initDomain(List.of(75)));
pointService.syncPetitionContent(initDomain(List.of(124))); //
pointService.syncMedicalPressure(initDomain(List.of(125))); // pointService.syncPetitionContent(initDomain(List.of(124)));
pointService.syncSeriousIllness(initDomain(List.of(126))); // pointService.syncMedicalPressure(initDomain(List.of(125)));
pointService.syncFamilySeriousIllness(initDomain(List.of(127))); // pointService.syncSeriousIllness(initDomain(List.of(126)));
pointService.syncPetitionDissatisfied(initDomain(List.of(128))); // pointService.syncFamilySeriousIllness(initDomain(List.of(127)));
// 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)));
// *********暂时不要********** // *********暂时不要**********
// riskTaskService.caseModelTask(initDomain(List.of(35))); // riskTaskService.caseModelTask(initDomain(List.of(35)));
// riskTaskService.heightFight(initDomain(List.of(42))); // riskTaskService.heightFight(initDomain(List.of(42)));

2
src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcPersonMapper.java

@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Update;
*/ */
public interface WdpcPersonMapper extends BaseMapper<WdpcPerson> { public interface WdpcPersonMapper extends BaseMapper<WdpcPerson> {
@Update("truncate table wpdc_person") @Update("truncate table wdpc_person")
int truncateTable(); int truncateTable();
} }

Loading…
Cancel
Save