diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 8d38b12..c2bff76 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -114,7 +114,7 @@ public class ApplicationEvent { // petitionService.personPullAndSave(start, end); // personalService.pullPetitionAgain(); // pointService.personPullAndSave(start, end); -// riskPersonalService.fixed(); + riskPersonalService.fixed(); // // // diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcHZCRYXXMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcHZCRYXXMapper.java index df9ab31..8099921 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcHZCRYXXMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcHZCRYXXMapper.java @@ -2,6 +2,9 @@ package com.biutag.supervisiondata.mapper.wdpc2; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcHZCRYXX; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author kami on 2024-12-06 10:23:13 @@ -9,4 +12,11 @@ import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcHZCRYXX; * @since 1.8 */ public interface WdpcHZCRYXXMapper extends BaseMapper { + + /** + * 查询火葬场剔重身份证 + * @return + */ + @Select(" select distinct id_code from wdpc_grjd_hzcryxx") + List selectDistinctIdCodes(); } diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java index a6ffb19..ca58ae4 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java @@ -11,6 +11,7 @@ import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonalControlRecord; import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonalTag; import com.biutag.supervisiondata.repository.RiskPersonalRepository; import com.biutag.supervisiondata.repository.RiskPersonalTagRepository; +import com.biutag.supervisiondata.repository.WdpcHZCRYXXRepository; import com.biutag.supervisiondata.service.RiskPersonalService; import com.biutag.supervisiondata.service.RiskPersonalTagService; import com.biutag.supervisiondata.util.IdCodeUtil; @@ -144,11 +145,26 @@ public class RiskPersonalServiceImpl implements RiskPersonalService { } } + private final WdpcHZCRYXXRepository hzcryxxRepository; + @Override public void fixed() { + List diePerson = hzcryxxRepository.getBaseMapper().selectDistinctIdCodes(); + Map map = new WeakHashMap<>(); + for (String person : diePerson) { + map.put(person, new Byte[0]); + } + List personals = repository.list(); List del = new ArrayList<>(); for (RiskPersonal personal : personals) { + if(map.get(personal.getIdCode()) != null) { + RiskPersonal delete = new RiskPersonal(); + delete.setId(personal.getId()); + delete.setDel(1); + del.add(delete); + continue; + } boolean up = false; if(personal.getAge() == -1) { try{