diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index d881f70..e35b728 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervisiondata.common.interfaces.CompletableFutureUtil; import com.biutag.supervisiondata.config.cache.RedisDao; import com.biutag.supervisiondata.pojo.domain.TaskParamDomain; -import com.biutag.supervisiondata.pojo.entity.dwd.GBaseJJD; import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue; import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonal; -import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonalTag; -import com.biutag.supervisiondata.pojo.entity.mine.RiskTest; -import com.biutag.supervisiondata.repository.*; +import com.biutag.supervisiondata.repository.RiskModelTaskClueRepository; +import com.biutag.supervisiondata.repository.RiskPersonalRepository; +import com.biutag.supervisiondata.repository.RiskPersonalTagRepository; +import com.biutag.supervisiondata.repository.RiskTestRepository; import com.biutag.supervisiondata.service.*; import jakarta.annotation.PreDestroy; import jakarta.annotation.Resource; @@ -20,8 +20,6 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -132,6 +130,8 @@ public class ApplicationEvent { // pointService.syncControlNoPower(initDomain(List.of(48))); // pointService.syncPointCall(initDomain(List.of(50))); // pointService.syncOilBuy(initDomain(List.of(52))); + pointService.syncIsPetition(initDomain(List.of(101))); + //暂时废弃该保安 //gBaseBAService.baModelTask(initDomain(List.of(37))); //personalService.syncOrg(); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjCsMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjCsMapper.java index dbeda52..37dcc9e 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjCsMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjCsMapper.java @@ -1,7 +1,11 @@ package com.biutag.supervisiondata.mapper.wdpc; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsj; import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsjCs; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author kami on 2024-12-03 16:47:43 @@ -9,4 +13,6 @@ import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsjCs; * @since 1.8 */ public interface WdpcGrjdXfsjCsMapper extends BaseMapper { + @Select("select name,id_code from wdpc_grjd_xfsj_cs") + List selectXfMan(); } diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjMapper.java index de1c512..3a5bf3d 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcGrjdXfsjMapper.java @@ -2,6 +2,9 @@ package com.biutag.supervisiondata.mapper.wdpc; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsj; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author kami on 2024-12-03 16:47:43 @@ -9,4 +12,7 @@ import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsj; * @since 1.8 */ public interface WdpcGrjdXfsjMapper extends BaseMapper { + + @Select("select name,id_code from wdpc_grjd_xfsj") + List selectXfMan(); } diff --git a/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java b/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java index 0350a97..30e3de2 100644 --- a/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java +++ b/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java @@ -88,4 +88,5 @@ public class Default { public static final String CAR_IG ="有车因素"; + public static final String IS_PETITION = "是否上访"; } diff --git a/src/main/java/com/biutag/supervisiondata/service/PointService.java b/src/main/java/com/biutag/supervisiondata/service/PointService.java index d2133b4..a41174d 100644 --- a/src/main/java/com/biutag/supervisiondata/service/PointService.java +++ b/src/main/java/com/biutag/supervisiondata/service/PointService.java @@ -35,6 +35,9 @@ public interface PointService { */ void syncOilBuy(TaskParamDomain domain); + // 是否上访 + void syncIsPetition(TaskParamDomain domain); + void syncSecurity(TaskParamDomain domain); /** diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java index ec97084..35b6549 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -15,6 +15,7 @@ import com.biutag.supervisiondata.pojo.entity.dwd.GBaseOilBuy; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseTbDZdrylb; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseZDRY; import com.biutag.supervisiondata.pojo.entity.mine.*; +import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsj; import com.biutag.supervisiondata.repository.*; import com.biutag.supervisiondata.service.PointService; import com.biutag.supervisiondata.service.RiskModelTaskClueService; @@ -56,6 +57,10 @@ public class PointServiceImpl implements PointService { private final SupDepartMapper supDepartMapper; + private final WdpcGrjdXfsjRepository wdpcGrjdXfsjRepository; + + private final WdpcGrjdXfsjCsRepository wdpcGrjdXfsjCsRepository; + @Override public void personPullAndSave(LocalDateTime start, LocalDateTime end) { riskPersonalService.formatAndSave(getPersons(), Default.POINT_POEPLE); @@ -229,6 +234,48 @@ public class PointServiceImpl implements PointService { taskRepository.updateById(updateTask); } + @Override + public void syncIsPetition(TaskParamDomain domain) { + RiskTask task = createTask(domain.getPersons().size(), 101); + taskRepository.save(task); + + Map oldMap = domain.getOldMap(task.getModelId(), true); + Map idCode = new HashMap<>(); + List list = wdpcGrjdXfsjRepository.getBaseMapper().selectXfMan(); + log.info("模型101第一次查询结果数:{}", list.size()); + list.addAll(wdpcGrjdXfsjCsRepository.getBaseMapper().selectXfMan()); + log.info("模型101第二次查询后总结果数:{}", list.size()); + Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); + List toInsert = new ArrayList<>(); + for (WdpcGrjdXfsj xfMan : list) { + RiskPersonal personal = personalMap.get(xfMan.getIdCode()); + if (personal == null) continue; + if (idCode.get(xfMan.getIdCode()) != null) continue; + if (oldMap.get(xfMan.getIdCode()) != null) continue; + + idCode.put(xfMan.getIdCode(), 1); + ClueData data = ClueData.builder() + .name(personal.getName()) + .id(personal.getId().toString()) + .idCode(personal.getIdCode()) + .tag("上访人员") + .personId(personal.getId()) + .sourceData("发现该人员有过上访经历,增加风险分5分") + .build(); + toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); + } + if (!toInsert.isEmpty()) { + modelTaskClueService.saveClues(toInsert, Default.IS_PETITION); + } + RiskTask updateTask = new RiskTask(); + updateTask.setId(task.getId()); + updateTask.setInsertSize(toInsert.size()); + updateTask.setUpdateSize(0); + updateTask.setState(1); + updateTask.setEndTime(LocalDateTime.now()); + taskRepository.updateById(updateTask); + } + @Override public void syncDrug(TaskParamDomain domain) { RiskTask task = createTask(domain.getPersons().size(), 37);