diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 61e5dde..372caed 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -113,33 +113,33 @@ public class ApplicationEvent { // riskPersonalService.fixed(); // personalService.syncPerson(); - petitionService.petitionModelTask(initDomain(List.of(40))); - riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); - riskTaskService.infoModelTask(initDomain(List.of(32,33))); - marriageService.marriageModelTask(initDomain(List.of(39,51))); - pointService.syncSecurity(initDomain(List.of(37))); - habitService.habitModelTask(start, initDomain(List.of(36,60,61,62))); - pointService.syncCarUser(initDomain(List.of(53))); - pointService.syncScore(initDomain(List.of(43))); - pointService.syncViolence(initDomain(List.of(44))); - noControlService.syncNoControlData(initDomain(List.of(45))); - pointService.syncDrug(initDomain(List.of(37))); - pointService.syncControlNoPower(initDomain(List.of(48))); - pointService.syncOilBuy(initDomain(List.of(52))); - gBaseJJDService.pullPoliceInstance(start, end, initDomain(List.of(55,56,57,58))); - jsbryService.syncPys(initDomain(List.of(59))); - gBaseSHRWFRService.combatCrime(initDomain(List.of(63))); - gBaseJJDService.syncPoliceAttack(initDomain(List.of(64))); - gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66))); - pointService.syncPointType(initDomain(List.of(67))); - gBaseSHRWFRService.hadWork(initDomain(List.of(68))); - gBaseJJDService.syncParentRelation(initDomain(List.of(69,70))); - gBaseJJDService.syncLove(initDomain(List.of(71))); - gBaseJJDService.syncMarryDispute(initDomain(List.of(72))); - gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73))); - gBaseJJDService.syncBullying(initDomain(List.of(74))); - gBaseSHRWFRService.crimeName(initDomain(List.of(76))); - pointService.syncIsPetition(initDomain(List.of(40))); +// petitionService.petitionModelTask(initDomain(List.of(40))); +// riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); +// riskTaskService.infoModelTask(initDomain(List.of(32,33))); +// marriageService.marriageModelTask(initDomain(List.of(39,51))); +// pointService.syncSecurity(initDomain(List.of(37))); +// habitService.habitModelTask(start, initDomain(List.of(36,60,61,62))); +// pointService.syncCarUser(initDomain(List.of(53))); +// pointService.syncScore(initDomain(List.of(43))); +// pointService.syncViolence(initDomain(List.of(44))); +// noControlService.syncNoControlData(initDomain(List.of(45))); +// pointService.syncDrug(initDomain(List.of(37))); +// pointService.syncControlNoPower(initDomain(List.of(48))); +// pointService.syncOilBuy(initDomain(List.of(52))); +// gBaseJJDService.pullPoliceInstance(start, end, initDomain(List.of(55,56,57,58))); +// jsbryService.syncPys(initDomain(List.of(59))); +// gBaseSHRWFRService.combatCrime(initDomain(List.of(63))); +// gBaseJJDService.syncPoliceAttack(initDomain(List.of(64))); +// gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66))); +// pointService.syncPointType(initDomain(List.of(67))); +// gBaseSHRWFRService.hadWork(initDomain(List.of(68))); +// gBaseJJDService.syncParentRelation(initDomain(List.of(69,70))); +// gBaseJJDService.syncLove(initDomain(List.of(71))); +// gBaseJJDService.syncMarryDispute(initDomain(List.of(72))); +// gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73))); +// gBaseJJDService.syncBullying(initDomain(List.of(74))); +// gBaseSHRWFRService.crimeName(initDomain(List.of(76))); +// pointService.syncIsPetition(initDomain(List.of(40))); // petitionService.petitionModelTask(initDomain(List.of(40))); // riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); // riskTaskService.eduModelTask(initDomain(List.of(34))); @@ -169,12 +169,12 @@ public class ApplicationEvent { // gBaseJJDService.syncBullying(initDomain(List.of(74))); // gBaseSHRWFRService.crimeName(initDomain(List.of(76))); // pointService.syncIsPetition(initDomain(List.of(40))); - pointService.syncFatherEducation(initDomain(List.of(112))); - pointService.syncMotherEducation(initDomain(List.of(113))); - pointService.syncDomicileType(initDomain(List.of(114))); - pointService.syncCriminalPunishment(initDomain(List.of(115))); - pointService.syncAdministrativePunishment(initDomain(List.of(116))); - pointService.syncParentsDivorce(initDomain(List.of(117))); +// pointService.syncFatherEducation(initDomain(List.of(112))); +// pointService.syncMotherEducation(initDomain(List.of(113))); +// pointService.syncDomicileType(initDomain(List.of(114))); +// pointService.syncCriminalPunishment(initDomain(List.of(115))); +// pointService.syncAdministrativePunishment(initDomain(List.of(116))); +// pointService.syncParentsDivorce(initDomain(List.of(117))); pointService.syncFamilyDie(initDomain(List.of(118))); pointService.syncFatherDie(initDomain(List.of(119))); pointService.syncMotherDie(initDomain(List.of(120))); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java index 4cfa7ad..d18ed2f 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java @@ -16,30 +16,10 @@ public interface GBaseCSCZRKMapper extends BaseMapper { + "on a.mqgmsfzhm = b.gmsfhm where a.mqgmsfzhm is not null and b.whcdmc is not null and a.mqgmsfzhm != a.gmsfhm") List selectMotherEducation(); - // 户籍类型 - @Select("") - List selectDomicileType(List idNos); - // 户籍类型 @Select("SELECT a.gmsfhm, a.hlxmc FROM dwd_ry_kxgxzyk_csczrk a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code WHERE a.hlxmc is not null") List selectDomicileType(); - // 父母婚姻变故 - @Select("") - List selectParentsDivorce(List idNos); - // 父母婚姻变故 @Select("select distinct a.gmsfhm from (SELECT DISTINCT a.gmsfhm FROM csga_dwd.dwd_ry_kxgxzyk_csczrk a join csga_wdpcdb.wdpc_grjd_lhxx b " + "on (a.fqgmsfzhm = b.male_id_code or a.mqgmsfzhm = b.female_id_code)) a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code;") @@ -86,25 +66,6 @@ public interface GBaseCSCZRKMapper extends BaseMapper { + "") List selectMotherDiePeople(List part); - // 行为人子女数 - @Select("") - List selectChildNo(List idNos); - // 行为人子女数 @Select("SELECT c.gmsfhm, SUM(CASE WHEN c.mc1 = '子' AND c.mc2 IN ('孙子','孙女') THEN 1 " + "WHEN c.mc1 = '女' AND c.mc2 IN ('外孙子','外孙女') THEN 1 " diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseJJDMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseJJDMapper.java index cae8576..40f8406 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseJJDMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseJJDMapper.java @@ -78,13 +78,6 @@ public interface GBaseJJDMapper extends BaseMapper { @Select(" select jjdbh, bjdh,bjrxm ,bjrzjhm, bjnr, cjqk, bjsj from dwd_asj_zhtx_jjd where (bjnr like '%家暴%' or cjqk like '%家暴%' or jqxzmc like '%家庭暴力%' or cjqk like '%家庭暴力%' or bjnr like '%家庭暴力%') and SUBSTR(jqxzdm, 1, 2) != '99' and bjsj >= #{start}") List selectHomeViolence(@Param("start")String start); - // 与子女关系 - @Select(" select jjdbh, bjrzjhm, bjnr,cjqk ,bjsj from dwd_asj_zhtx_jjd " - + "where (jqxzmc like '%纠纷%' or jqxzmc like '%矛盾%') " - + "AND (bjnr like '%孩子%' OR bjnr like '%儿子%' OR bjnr like '%女儿%' OR bjnr like '%子女%' OR cjqk like '%孩子%' OR cjqk like '%儿子%' OR cjqk like '%女儿%' OR cjqk like '%子女%') " - + "AND bjrzjhm is not null and bjsj > '2019-12-06 00:00:00' and substr(jqxzdm, 1, 2) != '99';") - List selectFiliation(List idNos); - // 与子女关系 @Select(" select a.jjdbh, a.bjrzjhm, a.bjnr,a.cjqk ,a.bjsj from dwd_asj_zhtx_jjd a inner join csga_wdpcdb.wdpc_person b on a.bjrzjhm = b.id_code " + "where (a.jqxzmc like '%纠纷%' or a.jqxzmc like '%矛盾%') " diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java index 9fd6d11..538acb9 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java @@ -12,16 +12,8 @@ import java.util.List; * @since 1.8 */ public interface GBaseWFRWFXXMapper extends BaseMapper { - @Select("select b.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " + - "(SELECT COUNT(DISTINCT a2.ajbh) " + - "FROM dwd_asj_zfba_wfrwfxx a2 " + - "WHERE a2.zjhm = b.zjhm AND a.ajbzdm = 1) count_num " + - "from dwd_asj_zfba_ajjbxx a " + - "join dwd_asj_zfba_wfrwfxx b on a.ajbh = b.ajbh " + - "where a.ajbzdm = 1;") - List selectCriminalPunishmentOld(); - @Select("select b.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " + + @Select("select b.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq " + "from dwd_asj_zfba_ajjbxx a " + "join dwd_asj_zfba_wfrwfxx b on a.ajbh = b.ajbh " + "inner join csga_wdpcdb.wdpc_person c on b.zjhm = c.id_code " + diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdJsbryMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdJsbryMapper.java index 70005f4..70c9778 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdJsbryMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdJsbryMapper.java @@ -13,14 +13,6 @@ import java.util.List; */ public interface WdpcGrjdJsbryMapper extends BaseMapper { - @Select("") - List selectByIdNos(List idNos); - @Select("select a.id_code, a.actual_time, a.actual_id from wdpc_grjd_jsbry a inner join negative.risk_personal b on a.id_code = b.id_code;") List selectByIdNos(); } diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java index ca97dfa..a0a5efa 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java @@ -12,13 +12,6 @@ import java.util.List; * @since 1.8 */ public interface WdpcSqjzryMapper extends BaseMapper { - @Select("") - List selectByIdNos(List idNos); @Select("select a.id_code, a.sentence_organization_name, a.correct_end_time, a.correct_begin_time, a.action_place, a.crime_describe from wdpc_grjd_sqjzry a inner join negative.risk_personal b on a.id_code = b.id_code;") List selectByIdNos(); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java index b831031..36e2c33 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java @@ -12,14 +12,6 @@ import java.util.List; * @since 1.8 */ public interface WdpcXdryMapper extends BaseMapper { - @Select("") - List selectXIDU(List idCard); @Select("select a.sfzh, a.xm, a.fxdw_dwmc, a.fxjsrq, a.fxqsrq, a.chdw_dwmc, a.gkxz_mc, a.jlsmc, a.rsrq, a.csrq from wdpc_grjd_xdry a " + "inner join negative.risk_personal b on a.sfzh = b.id_code where (a.swrq is not null or a.swyy is not null);") diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java index 293c7e6..ba1adca 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java @@ -12,68 +12,22 @@ import java.util.List; * @since 1.8 */ public interface WdpcXfsjCsDetailMapper extends BaseMapper { - @Select("") - List selectPetitionContent5(List idNos); @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code " + "where (a.detail like '%退%' or a.detail like '%迁%' or a.detail like '%军%') " + "and (a.detail not like '%投诉%' and a.detail not like '%举报%' and a.detail not like '%不公%' and a.detail not like '%交房%');") List selectPetitionContent5(); - @Select("") - List selectPetitionContent3(List idNos); - @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code " + "where (a.detail like '%投诉%' or a.detail like '%举报%') " + "and (a.detail not like '%退%' and a.detail not like '%迁%' and a.detail not like '%军%' and a.detail not like '%不公%' and a.detail not like '%交房%');") List selectPetitionContent3(); - @Select("") - List selectPetitionContent2(List idNos); - @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code " + "where (a.detail like '%不公%' or a.detail like '%交房%') " + "and (a.detail not like '%退%' and a.detail not like '%迁%' and a.detail not like '%军%' and a.detail not like '%投诉%' and a.detail not like '%举报%');") List selectPetitionContent2(); - @Select("") - List selectPetitionDissatisfied(List idNos); - @Select("select distinct a.id_code from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code " + "where a.satisfaction_code = '1' " + "group by a.id_code") diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java index 8d8c76f..55695bb 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java @@ -12,13 +12,6 @@ import java.util.List; * @since 1.8 */ public interface WdpcXmsfryMapper extends BaseMapper { - @Select("") - List selectByIdNos(List idNos); @Select("select a.id_code, a.crime_name, a.sentence_time, a.prison_begin, a.prison_end, a.prison_organization from wdpc_grjd_xmsfry a inner join negative.risk_personal b on a.id_code = b.id_code;") List selectByIdNos();