supervision
/
supervision-data
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改打分

master
kami 1 year ago
parent
8a97bb58bf
commit
e4b5601561
6 changed files with 68 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
  2. 1
      src/main/java/com/biutag/supervisiondata/mapper/mine/RiskScoreRuleMapper.java
  3. 6
      src/main/java/com/biutag/supervisiondata/rest/ApiController.java
  4. 2
      src/main/java/com/biutag/supervisiondata/service/RiskScoreRuleService.java
  5. 1
      src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java
  6. 6
      src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java

118
src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
Unescape View File

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

1
src/main/java/com/biutag/supervisiondata/mapper/mine/RiskScoreRuleMapper.java
Unescape View File

@ -20,6 +20,7 @@ public interface RiskScoreRuleMapper extends BaseMapper<RiskScoreRule> {
" <foreach collection='list' separator=',' item='item'> " + " <foreach collection='list' separator=',' item='item'> " +
" #{item}" + " #{item}" +
" </foreach>" + " </foreach>" +
" ) " +
"</script>") "</script>")
List<ScoreRule> selectRuleByModelId(@Param("list")List<Integer> list); List<ScoreRule> selectRuleByModelId(@Param("list")List<Integer> list);
} }

6
src/main/java/com/biutag/supervisiondata/rest/ApiController.java
Unescape View File

@ -38,7 +38,7 @@ public class ApiController {
private final ModelClueService modelClueService; private final ModelClueService modelClueService;
@GetMapping("/score") @GetMapping("/score")
public RS<Void> score(String idCodes) { public RS<Void> score(String idCodes, String weight) {
if(LocalLock.scoreLock){ if(LocalLock.scoreLock){
return RS.error("正在进行中"); return RS.error("正在进行中");
} }
@ -46,9 +46,9 @@ public class ApiController {
CompletableFutureUtil.runSync(() -> { CompletableFutureUtil.runSync(() -> {
try { try {
if(idCodes == null) { if(idCodes == null) {
riskScoreRuleService.runScore(new ArrayList<>()); riskScoreRuleService.runScore(new ArrayList<>(), weight);
} else { } else {
riskScoreRuleService.runScore(List.of(idCodes.split(","))); riskScoreRuleService.runScore(List.of(idCodes.split(",")), weight);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("", e); log.error("", e);

2
src/main/java/com/biutag/supervisiondata/service/RiskScoreRuleService.java
Unescape View File

@ -9,5 +9,5 @@ import java.util.List;
*/ */
public interface RiskScoreRuleService { public interface RiskScoreRuleService {
void runScore(List<String> idCodes); void runScore(List<String> idCodes,String weight);
} }

1
src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java
Unescape View File

@ -56,7 +56,6 @@ public class MarriageServiceImpl implements MarriageService {
LocalDateTime yearsDate = LocalDateTime.now().minusYears(1); LocalDateTime yearsDate = LocalDateTime.now().minusYears(1);
RiskTask task = riskTaskRepository.create(data.size(), 39); RiskTask task = riskTaskRepository.create(data.size(), 39);
RiskTask task2 = riskTaskRepository.create(data.size(), 51); RiskTask task2 = riskTaskRepository.create(data.size(), 51);
riskTaskRepository.saveBatch(List.of(task,task2));
Map<String, WdpcGrjdHyqkb> dataMap = data.stream().collect(Collectors.toMap(WdpcGrjdHyqkb::getIdCode, Function.identity(), (val, old) -> val)); Map<String, WdpcGrjdHyqkb> dataMap = data.stream().collect(Collectors.toMap(WdpcGrjdHyqkb::getIdCode, Function.identity(), (val, old) -> val));
log.info("开始查询结婚数据：{}", domain.getIdCards().size()); log.info("开始查询结婚数据：{}", domain.getIdCards().size());

6
src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java
Unescape View File

@ -43,13 +43,15 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService {
private final RiskModelTaskClueRepository riskModelTaskClueRepository; private final RiskModelTaskClueRepository riskModelTaskClueRepository;
@Override @Override
public void runScore(List<String> idCodes) { public void runScore(List<String> idCodes, String weight) {
LambdaQueryWrapper<RiskPersonal> queryWrapper = new LambdaQueryWrapper<RiskPersonal>() LambdaQueryWrapper<RiskPersonal> queryWrapper = new LambdaQueryWrapper<RiskPersonal>()
.select(RiskPersonal::getIdCode, RiskPersonal::getId, RiskPersonal::getRickScore); .select(RiskPersonal::getIdCode, RiskPersonal::getId, RiskPersonal::getRickScore);
if(idCodes != null && !idCodes.isEmpty()) { if(idCodes != null && !idCodes.isEmpty()) {
queryWrapper.in(RiskPersonal::getIdCode, idCodes); queryWrapper.in(RiskPersonal::getIdCode, idCodes);
} }
BigDecimal we = new BigDecimal(Optional.ofNullable(weight).orElse("1"));
List<RiskPersonal> riskPersonals = personalRepository.list(queryWrapper); List<RiskPersonal> riskPersonals = personalRepository.list(queryWrapper);
List<RiskScoreRule> rules = riskScoreRuleRepository.list(new LambdaQueryWrapper<>()); List<RiskScoreRule> rules = riskScoreRuleRepository.list(new LambdaQueryWrapper<>());
@ -115,7 +117,7 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService {
if(person.getRickScore().compareTo(total.doubleValue()) != 0) { if(person.getRickScore().compareTo(total.doubleValue()) != 0) {
update = new RiskPersonal(); update = new RiskPersonal();
update.setId(person.getId()); update.setId(person.getId());
update.setRickScore(total.doubleValue()); update.setRickScore(total.multiply(we).doubleValue());
toUpdates.add(update); toUpdates.add(update);
} }
if(total.doubleValue() <= 0.0) { if(total.doubleValue() <= 0.0) {

Write Preview
Loading…
Cancel
Save