diff --git a/src/main/java/com/biutag/supervisiondata/service/RiskTaskService.java b/src/main/java/com/biutag/supervisiondata/service/RiskTaskService.java index 7990f02..7149f05 100644 --- a/src/main/java/com/biutag/supervisiondata/service/RiskTaskService.java +++ b/src/main/java/com/biutag/supervisiondata/service/RiskTaskService.java @@ -1,11 +1,6 @@ package com.biutag.supervisiondata.service; import com.biutag.supervisiondata.pojo.domain.TaskParamDomain; -import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue; -import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonal; - -import java.util.List; -import java.util.Map; /** * @author kami on 2024-11-11 14:14:32 diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java index 097d0aa..47cc142 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.biutag.supervisiondata.common.interfaces.CompletableFutureUtil; import com.biutag.supervisiondata.pojo.ClueData; -import com.biutag.supervisiondata.pojo.ClueInfo; import com.biutag.supervisiondata.pojo.constants.Default; import com.biutag.supervisiondata.pojo.database.PointOrg; import com.biutag.supervisiondata.pojo.domain.FightMan; @@ -638,12 +637,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { log.info("新增线索 | {}", toInsert.size()); riskModelTaskClueService.saveClues(toInsert, Default.FIGHT_MUCH_IG); } - - RiskTask endTask = endTask(task.getId()); - endTask.setInsertSize(toInsert.size()); - endTask.setUpdateSize(toUpdates.size()); - endTask.setUpdateSize(0); - riskTaskRepository.updateById(endTask); + riskTaskRepository.updateTask(task.getId(), toInsert.size(), toUpdates.size()); } /** @@ -674,13 +668,28 @@ public class RiskTaskServiceImpl implements RiskTaskService { toHidden.add(hidden); } // 符合条件但是又没有旧数据 | 新增 - if (age >= 16 && age <= 34) { - RiskModelTaskClue clue = createClue(task.getModelId(), 1, person, task.getId(), "年龄处于16岁至34岁之间", "该人员年龄为"+age+",属于16岁至34岁之间,增加风险分1分"); + if (age >= 16 && age <= 24) { + RiskModelTaskClue clue = createClue(task.getModelId(), 1, person, task.getId(), "年龄处于16岁至24岁之间", "该人员年龄为"+age+",属于16岁至24岁之间,增加风险分1分"); + taskClue.add(clue); + continue; + } + if (age >= 25 && age <= 34) { + RiskModelTaskClue clue = createClue(task.getModelId(), 3, person, task.getId(), "年龄处于25岁至34岁之间", "该人员年龄为"+age+",属于25岁至34岁之间,增加风险分3分"); taskClue.add(clue); continue; } if (age >= 35 && age <= 55) { - RiskModelTaskClue clue = createClue(task.getModelId(), 2, person, task.getId(), "年龄处于35岁至55岁之间", "该人员年龄为"+age+",属于35岁至55岁之间,增加风险分2分"); + RiskModelTaskClue clue = createClue(task.getModelId(), 5, person, task.getId(), "年龄处于35岁至55岁之间", "该人员年龄为"+age+",属于35岁至55岁之间,增加风险分5分"); + taskClue.add(clue); + continue; + } + if (age >= 56 && age <= 65) { + RiskModelTaskClue clue = createClue(task.getModelId(), 3, person, task.getId(), "年龄处于56岁至66岁之间", "该人员年龄为"+age+",属于56岁至66岁之间,增加风险分3分"); + taskClue.add(clue); + continue; + } + if (age >= 66 && age <= 75) { + RiskModelTaskClue clue = createClue(task.getModelId(), 1, person, task.getId(), "年龄处于66岁至75岁之间", "该人员年龄为"+age+",属于66岁至75岁之间,增加风险分1分"); taskClue.add(clue); } } @@ -688,13 +697,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { if(!toHidden.isEmpty()) { clueRepository.updateBatchById(toHidden); } - RiskTask ageUpdate = new RiskTask(); - ageUpdate.setId(task.getId()); - ageUpdate.setUpdateSize(toHidden.size()); - ageUpdate.setInsertSize(taskClue.size()); - ageUpdate.setState(1); - ageUpdate.setEndTime(LocalDateTime.now()); - riskTaskRepository.updateById(ageUpdate); + riskTaskRepository.updateTask(task.getId(), taskClue.size(), toHidden.size()); } /** @@ -718,13 +721,8 @@ public class RiskTaskServiceImpl implements RiskTaskService { RiskModelTaskClue clue = createClue(32, 5, person, task.getId(), "男性", "该人员性别为男性,增加风险分5分"); taskClue.add(clue); } - RiskTask genderUpdate = new RiskTask(); - genderUpdate.setId(task.getId()); - genderUpdate.setUpdateSize(0); - genderUpdate.setInsertSize(taskClue.size()); - genderUpdate.setState(1); - genderUpdate.setEndTime(LocalDateTime.now()); riskModelTaskClueService.saveClues(taskClue, Default.GENDER_IG); + riskTaskRepository.updateTask(task.getId(), taskClue.size(), 0); } RiskModelTaskClue createClue(Integer modelId, Integer score, RiskPersonal person, Integer taskId, String reason, String data) {