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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
master
sjh 1 year ago
parent
9c80d9a25e 33a77cf81b
commit
86872fab86
10 changed files with 191 additions and 144 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. 27
      src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
  2. 49
      src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java
  3. 51
      src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java
  4. 44
      src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java
  5. 2
      src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java
  6. 8
      src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java
  7. 8
      src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
  8. 78
      src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
  9. 27
      src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java
  10. 5
      src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java

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

@ -113,6 +113,33 @@ public class ApplicationEvent {
// riskPersonalService.fixed(); // riskPersonalService.fixed();
// personalService.syncPerson(); // 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))); // petitionService.petitionModelTask(initDomain(List.of(40)));
// riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); // riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41)));
// riskTaskService.eduModelTask(initDomain(List.of(34))); // riskTaskService.eduModelTask(initDomain(List.of(34)));

49
src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java
Unescape View File

@ -67,7 +67,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
log.info("总条数 | {}条", result.size()); log.info("总条数 | {}条", result.size());
List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>() List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
.select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource) .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
.in(SupExternalDepart::getSource, List.of("重点人员", "情指行"))); .in(SupExternalDepart::getSource, List.of("重点人员", "情指行")));
Map<String, List<SupExternalDepart>> amp = supDeparts.stream().collect(Collectors.groupingBy(SupExternalDepart::getSource)); Map<String, List<SupExternalDepart>> amp = supDeparts.stream().collect(Collectors.groupingBy(SupExternalDepart::getSource));
Map<String, SupExternalDepart> pointExternalDepart = amp.get("重点人员").stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val)); Map<String, SupExternalDepart> pointExternalDepart = amp.get("重点人员").stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
@ -186,7 +186,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
SupExternalDepart depart = pointExternalDepart.get(org.getDm()); SupExternalDepart depart = pointExternalDepart.get(org.getDm());
if (depart != null) { if (depart != null) {
personal.setControlDepartId(depart.getInternalId()); personal.setControlDepartId(depart.getInternalId());
personal.setControlDepartName(depart.getInternalName()); personal.setControlDepartName(depart.getInternalShortName());
personal.setControlDepartType(DepartType.HUMAN.getType()); personal.setControlDepartType(DepartType.HUMAN.getType());
personal.setControlTime(LocalDateTime.now()); personal.setControlTime(LocalDateTime.now());
personal.setCreateTime(personal.getControlTime()); personal.setCreateTime(personal.getControlTime());
@ -240,7 +240,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
} }
hope.put(tmp.getGxdwdm(), depart); hope.put(tmp.getGxdwdm(), depart);
personal.setControlDepartId(depart.getInternalId()); personal.setControlDepartId(depart.getInternalId());
personal.setControlDepartName(depart.getInternalName()); personal.setControlDepartName(depart.getInternalShortName());
personal.setControlDepartType(DepartType.OTHER.getType()); personal.setControlDepartType(DepartType.OTHER.getType());
// 如果有报警时间，暂时填报警时间 处理标签回正 // 如果有报警时间，暂时填报警时间 处理标签回正
try { try {
@ -416,39 +416,42 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
continue; continue;
} }
jjdList = jjdList.stream().filter(StreamUtil.distinctByKey(GBaseJJD::getJjdbh)).toList(); jjdList = jjdList.stream().filter(StreamUtil.distinctByKey(GBaseJJD::getJjdbh)).toList();
List<RiskModelTaskClue> olds = Optional.ofNullable(personOldMap.get(person.getIdCode())).orElse(new ArrayList<>()); List<RiskModelTaskClue> olds = personOldMap.get(person.getIdCode());
Map<String, RiskModelTaskClue> oldMap = olds.stream().collect(Collectors.toMap(RiskModelTaskClue::getCaseIds, Function.identity(), (val, old) -> val)); if(olds != null) {
// 是否类型只有一个
continue;
}
LocalDateTime eventTime = null;
StringBuilder sb = new StringBuilder("该人员存在"+jjdList.size()+"起平台涉警事件警情，相关警情接警单编号为：");
for (GBaseJJD gBaseJJD : jjdList) { for (GBaseJJD gBaseJJD : jjdList) {
if (oldMap.get(BhUtil.jjdBh(gBaseJJD.getJjdbh())) != null) { sb.append(gBaseJJD.getJjdbh()).append("，");
try {
LocalDateTime tmp = gBaseJJD.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
if(eventTime == null) {
eventTime = tmp;
continue; continue;
} }
if (eventTime.isBefore(tmp)) {
eventTime = tmp;
}
} catch (Exception ignored) {
}
}
ClueData data = ClueData.builder() ClueData data = ClueData.builder()
.name(person.getName()) .name(person.getName())
.id(BhUtil.jjdBh(gBaseJJD.getJjdbh())) .id("ptsjsj")
.idCode(person.getIdCode()) .idCode(person.getIdCode())
.tag("平台涉警事件") .tag("平台涉警事件")
.sourceData(sb.substring(0, sb.length()-1))
.eventTime(Optional.ofNullable(eventTime).orElse(LocalDateTime.now()))
.personId(person.getId()) .personId(person.getId())
.build(); .build();
StringBuilder sb = new StringBuilder("该人员存在平台涉警事件警情，接警单编号：" + gBaseJJD.getJjdbh());
if (gBaseJJD.getBjnr() != null && !gBaseJJD.getBjnr().isEmpty()) {
sb.append("，报警内容；" + gBaseJJD.getBjnr());
}
if (gBaseJJD.getCjqk() != null && !gBaseJJD.getCjqk().isEmpty()) {
sb.append("，处警情况；" + gBaseJJD.getCjqk());
}
data.setSourceData(sb.toString());
try {
data.setEventTime(gBaseJJD.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
} catch (Exception ignored) {
data.setEventTime(LocalDateTime.now());
}
toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
} }
}
log.info("保存袭警数据：{}", toInsert.size()); log.info("保存袭警数据：{}", toInsert.size());
if (!toInsert.isEmpty()) { if (!toInsert.isEmpty()) {
clueService.saveClues(toInsert, Default.WF_IG); clueService.saveClues(toInsert, "B28平台涉警事件");
} }
taskRepository.updateTask(task.getId(), toInsert.size(), 0); taskRepository.updateTask(task.getId(), toInsert.size(), 0);
} }

51
src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java
Unescape View File

@ -61,7 +61,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
public void pullAndSave(LocalDateTime start, LocalDateTime end) { public void pullAndSave(LocalDateTime start, LocalDateTime end) {
List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg(); List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg();
List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>() List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
.select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource) .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
.in(SupExternalDepart::getSource, List.of("情指行"))); .in(SupExternalDepart::getSource, List.of("情指行")));
Map<String, SupExternalDepart> externalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val)); Map<String, SupExternalDepart> externalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
@ -150,7 +150,6 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
List<RiskModelTaskClue> oldList = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>()); List<RiskModelTaskClue> oldList = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>());
// 按人分 // 按人分
Map<String, List<RiskModelTaskClue>> personOldMap = oldList.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode)); Map<String, List<RiskModelTaskClue>> personOldMap = oldList.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode));
Map<String, List<GBaseWFRXX>> wfrMap = xxList.stream().collect(Collectors.groupingBy(GBaseWFRXX::getZjhm)); Map<String, List<GBaseWFRXX>> wfrMap = xxList.stream().collect(Collectors.groupingBy(GBaseWFRXX::getZjhm));
List<RiskModelTaskClue> toInsert = new ArrayList<>(); List<RiskModelTaskClue> toInsert = new ArrayList<>();
@ -160,29 +159,53 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
if (wfxxList == null) { if (wfxxList == null) {
continue; continue;
} }
List<RiskModelTaskClue> olds = Optional.ofNullable(personOldMap.get(person.getIdCode())).orElse(new ArrayList<>()); List<RiskModelTaskClue> olds = personOldMap.get(person.getIdCode());
Map<String, RiskModelTaskClue> oldMap = olds.stream().collect(Collectors.toMap(RiskModelTaskClue::getCaseIds, Function.identity(), (val, old) -> val)); // 是否只有一个
if(olds!=null) {
continue;
}
StringBuilder zm = new StringBuilder();
StringBuilder aj = new StringBuilder();
LocalDateTime eventTime = null;
for (GBaseWFRXX xx : wfxxList) { for (GBaseWFRXX xx : wfxxList) {
if (oldMap.get(BhUtil.ajBh(xx.getAjbh())) != null) { if(zm.indexOf(xx.getSxzm()+",") == -1) {
zm.append(xx.getSxzm()).append(",");
}
if(aj.indexOf(xx.getAjbh()+",") == -1) {
aj.append(xx.getAjbh()).append(",");
}
try {
LocalDateTime tmp = xx.getLrsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
if(eventTime == null) {
eventTime = tmp;
continue; continue;
} }
if(eventTime.isBefore(tmp)) {
eventTime = tmp;
}
} catch (Exception ignored) {
}
}
StringBuilder tmp = new StringBuilder("该人员");
if(zm.length() > 0) {
tmp.append("因：").append(zm.substring(0, zm.length()-1));
}
tmp.append(" 已被打击处理过");
if(aj.length() > 0) {
tmp.append("具体案件编号：").append(aj.substring(0, aj.length()-1));
}
ClueData data = ClueData.builder() ClueData data = ClueData.builder()
.name(person.getName()) .name(person.getName())
.id(BhUtil.ajBh(xx.getAjbh())) .id("isPoint")
.idCode(person.getIdCode()) .idCode(person.getIdCode())
.tag("已被打击处理") .tag("已被打击处理")
.personId(person.getId()) .personId(person.getId())
.sourceData("该人员因" + xx.getSxzm() + "被打击处理，案件编号：" + xx.getAjbh()) .sourceData(tmp.toString())
.eventTime(Optional.ofNullable(eventTime).orElse(LocalDateTime.now()))
.build(); .build();
try {
data.setEventTime(xx.getLrsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
} catch (Exception ignored) {
data.setEventTime(LocalDateTime.now());
}
toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
} }
}
if (!toInsert.isEmpty()) { if (!toInsert.isEmpty()) {
clueService.saveClues(toInsert, "B24被打击处理"); clueService.saveClues(toInsert, "B24被打击处理");
} }

44
src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java
Unescape View File

@ -3,10 +3,12 @@ package com.biutag.supervisiondata.service.impl;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.biutag.supervisiondata.common.interfaces.CompletableFutureUtil; import com.biutag.supervisiondata.common.interfaces.CompletableFutureUtil;
import com.biutag.supervisiondata.common.utils.StreamUtil;
import com.biutag.supervisiondata.pojo.ClueData; import com.biutag.supervisiondata.pojo.ClueData;
import com.biutag.supervisiondata.pojo.constants.Default; import com.biutag.supervisiondata.pojo.constants.Default;
import com.biutag.supervisiondata.pojo.domain.TaskParamDomain; import com.biutag.supervisiondata.pojo.domain.TaskParamDomain;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseAJJBXX; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseAJJBXX;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseJJD;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseWFRXX; import com.biutag.supervisiondata.pojo.entity.dwd.GBaseWFRXX;
import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue; import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue;
import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonal; import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonal;
@ -183,45 +185,57 @@ public class HabitServiceImpl implements HabitService {
Map<String, List<GBaseWFRXX>> wfrMap = wfrList.stream().filter(it -> it.getZjhm() != null).collect(Collectors.groupingBy(GBaseWFRXX::getZjhm)); Map<String, List<GBaseWFRXX>> wfrMap = wfrList.stream().filter(it -> it.getZjhm() != null).collect(Collectors.groupingBy(GBaseWFRXX::getZjhm));
// 案件信息 // 案件信息
Map<String, GBaseAJJBXX> ajMap = targetAjList.stream().collect(Collectors.toMap(GBaseAJJBXX::getAjbh, Function.identity(), (oldValue, newValue) -> newValue)); Map<String, GBaseAJJBXX> ajMap = targetAjList.stream().collect(Collectors.toMap(GBaseAJJBXX::getAjbh, Function.identity(), (oldValue, newValue) -> newValue));
List<RiskModelTaskClue> oldList = Optional.ofNullable(domain.getMap().get(36)).orElse(new ArrayList<>()); List<RiskModelTaskClue> oldList = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>());
// 人员的旧线索 // 人员的旧线索
Map<String, List<RiskModelTaskClue>> clueMap = oldList.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode)); Map<String, List<RiskModelTaskClue>> clueMap = oldList.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode));
List<RiskModelTaskClue> clues; List<RiskModelTaskClue> clues;
Map<String, RiskModelTaskClue> clueTmpMap;
// 创建新数据 // 创建新数据
List<RiskModelTaskClue> toInsert = new ArrayList<>(); List<RiskModelTaskClue> toInsert = new ArrayList<>();
log.info("开始遍历人员", wfrMap.size()); log.info("开始遍历人员", wfrMap.size());
for (RiskPersonal person : domain.getPersons()) { for (RiskPersonal person : domain.getPersons()) {
List<GBaseWFRXX> wfTmp = Optional.ofNullable(wfrMap.get(person.getIdCode())).orElse(new ArrayList<>()); List<GBaseWFRXX> wfTmp = Optional.ofNullable(wfrMap.get(person.getIdCode())).orElse(new ArrayList<>());
wfTmp = wfTmp.stream().filter(StreamUtil.distinctByKey(GBaseWFRXX::getAjbh)).toList();
if(wfTmp.isEmpty()){
continue;
}
// 该人员旧的线索 // 该人员旧的线索
clues = Optional.ofNullable(clueMap.get(person.getIdCode())).orElse(new ArrayList<>()); clues = clueMap.get(person.getIdCode());
clueTmpMap = clues.stream().collect(Collectors.toMap(RiskModelTaskClue::getCaseIds, Function.identity(), (oldValue, newValue) -> newValue)); if(clues != null) {
continue;
}
StringBuilder sb = new StringBuilder("结合案件信息和违法人信息相关数据，发现该人员有"+wfTmp.size()+"起"+tag+"相关案件，相关案件编号为：");
LocalDateTime eventTime = null;
for (GBaseWFRXX gBaseWFRXX : wfTmp) { for (GBaseWFRXX gBaseWFRXX : wfTmp) {
GBaseAJJBXX aj = ajMap.get(gBaseWFRXX.getAjbh()); GBaseAJJBXX aj = ajMap.get(gBaseWFRXX.getAjbh());
if (aj == null) { if (aj == null) {
continue; continue;
} }
// 通过案件编号获取查看是否有入库记录 sb.append(gBaseWFRXX.getAjbh()).append(",");
if (clueTmpMap.get(BhUtil.ajBh(aj.getAjbh())) != null) { try {
LocalDateTime tmp = aj.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
if(eventTime == null) {
eventTime = tmp;
continue; continue;
} }
// 没有旧记录 if(eventTime.isBefore(tmp)) {
eventTime = tmp;
}
} catch (Exception e) {
}
}
ClueData data = ClueData.builder() ClueData data = ClueData.builder()
.id(aj.getAjbh()) .id("habit")
.name(person.getName()) .name(person.getName())
.idCode(person.getIdCode()) .idCode(person.getIdCode())
.tag(tag) .tag(tag)
.personId(person.getId()) .personId(person.getId())
.sourceData("结合案件信息和违法人信息相关数据，发现该人员有："+aj.getAjlbmc()+"类型的案件，案件编号为："+aj.getAjbh()+"，存在"+tag) .sourceData(sb.substring(0, sb.length()-1))
.eventTime(Optional.ofNullable(eventTime).orElse(LocalDateTime.now()))
.build(); .build();
try {
data.setEventTime(aj.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
} catch (Exception e) {
log.error("报案日期转LocalDateTime异常");
}
toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
} }
}
return toInsert; return toInsert;
} }

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

@ -872,7 +872,7 @@ public class ModelClueServiceImpl implements ModelClueService {
newModelClue.setNegativeIdEx(""); newModelClue.setNegativeIdEx("");
newModelClue.setInvolvePoliceName((String) map.get("USERNAME")); newModelClue.setInvolvePoliceName((String) map.get("USERNAME"));
newModelClue.setInvolveDepartName((String) map.get("orgname")); newModelClue.setInvolveDepartName((String) map.get("orgname"));
SupExternalDepart supExternalDepart = supExternalDepartRepository.getOne(new LambdaQueryWrapper<SupExternalDepart>().eq(SupExternalDepart::getInternalName, map.get("orgname")).last("LIMIT 1")); SupExternalDepart supExternalDepart = supExternalDepartRepository.getOne(new LambdaQueryWrapper<SupExternalDepart>().eq(SupExternalDepart::getInternalShortName, map.get("orgname")).last("LIMIT 1"));
if (supExternalDepart != null) { if (supExternalDepart != null) {
if (supExternalDepart.getInternalId() != null) { if (supExternalDepart.getInternalId() != null) {
newModelClue.setInvolveDepartId(supExternalDepart.getInternalId()); newModelClue.setInvolveDepartId(supExternalDepart.getInternalId());

8
src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java
Unescape View File

@ -327,7 +327,7 @@ public class PersonalServiceImpl implements PersonalService {
.toList(); .toList();
List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>() List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
.select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource) .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
.eq(SupExternalDepart::getSource, "重点人员")); .eq(SupExternalDepart::getSource, "重点人员"));
List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg(); List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg();
@ -364,7 +364,7 @@ public class PersonalServiceImpl implements PersonalService {
if (depart != null) { if (depart != null) {
hope.put(xx.getSspcsdm(), depart); hope.put(xx.getSspcsdm(), depart);
personal.setControlDepartId(depart.getInternalId()); personal.setControlDepartId(depart.getInternalId());
personal.setControlDepartName(depart.getInternalName()); personal.setControlDepartName(depart.getInternalShortName());
personal.setControlDepartType(DepartType.HUMAN.getType()); personal.setControlDepartType(DepartType.HUMAN.getType());
} else { } else {
personal.setControlDepartId(null); personal.setControlDepartId(null);
@ -423,7 +423,7 @@ public class PersonalServiceImpl implements PersonalService {
Map<String, GBaseSYRKXX> xxMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (val, old) -> val)); Map<String, GBaseSYRKXX> xxMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (val, old) -> val));
List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>() List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
.select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource) .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
.eq(SupExternalDepart::getSource, "重点人员")); .eq(SupExternalDepart::getSource, "重点人员"));
List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg(); List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg();
@ -466,7 +466,7 @@ public class PersonalServiceImpl implements PersonalService {
if (depart != null) { if (depart != null) {
hope.put(xx.getSspcsdm(), depart); hope.put(xx.getSspcsdm(), depart);
person.setControlDepartId(depart.getInternalId()); person.setControlDepartId(depart.getInternalId());
person.setControlDepartName(depart.getInternalName()); person.setControlDepartName(depart.getInternalShortName());
person.setControlDepartType(DepartType.HUMAN.getType()); person.setControlDepartType(DepartType.HUMAN.getType());
} }
} }

8
src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
Unescape View File

@ -67,7 +67,7 @@ public class PetitionServiceImpl implements PetitionService {
List<String> mobiles = new ArrayList<>(); List<String> mobiles = new ArrayList<>();
List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>() List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
.select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource) .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
.eq(SupExternalDepart::getSource, "重点人员")); .eq(SupExternalDepart::getSource, "重点人员"));
Map<String, SupExternalDepart> jqExternalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val)); Map<String, SupExternalDepart> jqExternalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
@ -209,7 +209,7 @@ public class PetitionServiceImpl implements PetitionService {
SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null); SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null);
if (depart != null) { if (depart != null) {
personal.setControlDepartId(depart.getInternalId()); personal.setControlDepartId(depart.getInternalId());
personal.setControlDepartName(depart.getInternalName()); personal.setControlDepartName(depart.getInternalShortName());
personal.setControlDepartType(DepartType.HUMAN.getType()); personal.setControlDepartType(DepartType.HUMAN.getType());
personal.setControlTime(LocalDateTime.now()); personal.setControlTime(LocalDateTime.now());
} }
@ -240,7 +240,7 @@ public class PetitionServiceImpl implements PetitionService {
SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null); SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null);
if (depart != null) { if (depart != null) {
personal.setControlDepartId(depart.getInternalId()); personal.setControlDepartId(depart.getInternalId());
personal.setControlDepartName(depart.getInternalName()); personal.setControlDepartName(depart.getInternalShortName());
personal.setControlDepartType(DepartType.HUMAN.getType()); personal.setControlDepartType(DepartType.HUMAN.getType());
personal.setControlTime(LocalDateTime.now()); personal.setControlTime(LocalDateTime.now());
} }
@ -277,7 +277,7 @@ public class PetitionServiceImpl implements PetitionService {
SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null); SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null);
if (depart != null) { if (depart != null) {
personal.setControlDepartId(depart.getInternalId()); personal.setControlDepartId(depart.getInternalId());
personal.setControlDepartName(depart.getInternalName()); personal.setControlDepartName(depart.getInternalShortName());
personal.setControlDepartType(DepartType.HUMAN.getType()); personal.setControlDepartType(DepartType.HUMAN.getType());
personal.setControlTime(LocalDateTime.now()); personal.setControlTime(LocalDateTime.now());
} }

78
src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
Unescape View File

@ -58,8 +58,6 @@ public class PointServiceImpl implements PointService {
private final RiskTaskRepository taskRepository; private final RiskTaskRepository taskRepository;
private final SupDepartMapper supDepartMapper;
private final WdpcGrjdXfsjRepository wdpcGrjdXfsjRepository; private final WdpcGrjdXfsjRepository wdpcGrjdXfsjRepository;
private final WdpcGrjdXfsjCsRepository wdpcGrjdXfsjCsRepository; private final WdpcGrjdXfsjCsRepository wdpcGrjdXfsjCsRepository;
@ -103,8 +101,7 @@ public class PointServiceImpl implements PointService {
@Override @Override
public void syncScore(TaskParamDomain domain) { public void syncScore(TaskParamDomain domain) {
List<RiskPersonal> persons = getPersons(); List<RiskPersonal> persons = getPersons();
RiskTask task = createTask(persons.size(), 43); RiskTask task = taskRepository.create(persons.size(), 43);
taskRepository.save(task);
List<RiskModelTaskClue> clues = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>()); List<RiskModelTaskClue> clues = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>());
Map<String, List<RiskModelTaskClue>> oldClueMap = clues.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode)); Map<String, List<RiskModelTaskClue>> oldClueMap = clues.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode));
@ -114,48 +111,31 @@ public class PointServiceImpl implements PointService {
for (Map.Entry<String, List<RiskPersonal>> entry : map.entrySet()) { for (Map.Entry<String, List<RiskPersonal>> entry : map.entrySet()) {
List<RiskModelTaskClue> olds = oldClueMap.get(entry.getKey()); List<RiskModelTaskClue> olds = oldClueMap.get(entry.getKey());
if (olds == null) { // 是否类型只存在一条
if (olds != null) {
continue;
}
List<RiskPersonal> personals = entry.getValue().stream().filter(StreamUtil.distinctByKey(RiskPersonal::getTags)).toList(); List<RiskPersonal> personals = entry.getValue().stream().filter(StreamUtil.distinctByKey(RiskPersonal::getTags)).toList();
StringBuilder sb = new StringBuilder();
// 全部增加 // 全部增加
for (RiskPersonal personal : personals) { for (RiskPersonal personal : personals) {
toInsert.add(createClue(task.getModelId(), 5, task.getId(), ClueData.builder() sb.append(personal.getTags()).append(",");
.tag("重点人员")
.name(personal.getName())
.idCode(personal.getIdCode())
.eventTime(Optional.ofNullable(personal.getControlTime()).orElse(LocalDateTime.now()))
.departId(personal.getControlDepartId())
.departName(personal.getControlDepartName())
.sourceData("该人员存在标签：" + personal.getTags() + "，属于重点人员")
.build()));
} }
if(sb.isEmpty()){
continue; continue;
} }
Map<String, RiskModelTaskClue> clueMap = olds.stream().collect(Collectors.toMap(RiskModelTaskClue::getRiskReason, Function.identity(), (oldValue, newValue) -> newValue));
List<RiskPersonal> personals = entry.getValue().stream().filter(StreamUtil.distinctByKey(RiskPersonal::getTags)).toList();
for (RiskPersonal personal : personals) {
if (clueMap.get(personal.getTags()) == null) {
toInsert.add(createClue(task.getModelId(), 5, task.getId(), ClueData.builder() toInsert.add(createClue(task.getModelId(), 5, task.getId(), ClueData.builder()
.tag("重点人员") .tag("重点人员")
.name(personal.getName()) .name(personals.getFirst().getName())
.idCode(personal.getIdCode()) .idCode(personals.getFirst().getIdCode())
.eventTime(Optional.ofNullable(personal.getControlTime()).orElse(LocalDateTime.now())) .eventTime(Optional.ofNullable(personals.getFirst().getControlTime()).orElse(LocalDateTime.now()))
.departId(personal.getControlDepartId()) .sourceData("该人员存在标签：" +sb.substring(0,sb.length()-1) + "，属于重点人员")
.departName(personal.getControlDepartName())
.sourceData("该人员存在标签：" + personal.getTags() + "，属于重点人员")
.build())); .build()));
} }
}
}
if (!toInsert.isEmpty()) { if (!toInsert.isEmpty()) {
modelTaskClueService.saveClues(toInsert, "是否是重点人员"); modelTaskClueService.saveClues(toInsert, "是否是重点人员");
} }
RiskTask updateTask = new RiskTask(); taskRepository.updateTask(task.getId(), toInsert.size(), 0);
updateTask.setId(task.getId());
updateTask.setInsertSize(toInsert.size());
updateTask.setUpdateSize(0);
updateTask.setState(1);
updateTask.setEndTime(LocalDateTime.now());
taskRepository.updateById(updateTask);
} }
private final WdpcGrjdZblxRepository zblxRepository; private final WdpcGrjdZblxRepository zblxRepository;
@ -176,6 +156,7 @@ public class PointServiceImpl implements PointService {
List<RiskModelTaskClue> olds = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>()); List<RiskModelTaskClue> olds = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>());
Map<String, List<RiskModelTaskClue>> personMap = olds.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode)); Map<String, List<RiskModelTaskClue>> personMap = olds.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode));
List<RiskModelTaskClue> toInsert = new ArrayList<>(); List<RiskModelTaskClue> toInsert = new ArrayList<>();
Map<String, List<RiskModelTaskClue>> mapPerson = new WeakHashMap<>();
for (GBaseZDRY ry : list) { for (GBaseZDRY ry : list) {
RiskPersonal person = personalMap.get(ry.getSfzh()); RiskPersonal person = personalMap.get(ry.getSfzh());
if(person==null) { if(person==null) {
@ -206,9 +187,12 @@ public class PointServiceImpl implements PointService {
} catch (Exception e) { } catch (Exception e) {
data.setEventTime(LocalDateTime.now()); data.setEventTime(LocalDateTime.now());
} }
toInsert.add(createClue(task.getModelId(), zblx.getScore().intValue(), task.getId(), data)); mapPerson.computeIfAbsent(person.getIdCode(), k -> new ArrayList<>()).add(createClue(task.getModelId(), zblx.getScore().intValue(), task.getId(), data));
} }
} }
for (Map.Entry<String, List<RiskModelTaskClue>> entry : mapPerson.entrySet()) {
toInsert.addAll(entry.getValue().stream().filter(StreamUtil.distinctByKey(RiskModelTaskClue::getRiskReason)).toList());
}
if (!toInsert.isEmpty()) { if (!toInsert.isEmpty()) {
log.info("保存重点人员标签 {}", toInsert.size()); log.info("保存重点人员标签 {}", toInsert.size());
modelTaskClueService.saveClues(toInsert, "列管原因"); modelTaskClueService.saveClues(toInsert, "列管原因");
@ -218,8 +202,7 @@ public class PointServiceImpl implements PointService {
@Override @Override
public void syncViolence(TaskParamDomain domain) { public void syncViolence(TaskParamDomain domain) {
RiskTask task = createTask(domain.getPersons().size(), 44); RiskTask task = taskRepository.create(domain.getPersons().size(), 44);
taskRepository.save(task);
Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (oldValue, newValue) -> newValue)); Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (oldValue, newValue) -> newValue));
List<Violence> list = zdryRepository.getBaseMapper().syncViolencePerson(); List<Violence> list = zdryRepository.getBaseMapper().syncViolencePerson();
@ -269,19 +252,12 @@ public class PointServiceImpl implements PointService {
if (!toInsert.isEmpty()) { if (!toInsert.isEmpty()) {
modelTaskClueService.saveClues(toInsert, Default.VIOLENCE_IG); modelTaskClueService.saveClues(toInsert, Default.VIOLENCE_IG);
} }
RiskTask updateTask = new RiskTask(); taskRepository.updateTask(task.getId(), toInsert.size(), 0);
updateTask.setId(task.getId());
updateTask.setInsertSize(toInsert.size());
updateTask.setUpdateSize(0);
updateTask.setState(1);
updateTask.setEndTime(LocalDateTime.now());
taskRepository.updateById(updateTask);
} }
@Override @Override
public void syncKillSelf(TaskParamDomain domain) { public void syncKillSelf(TaskParamDomain domain) {
RiskTask task = createTask(domain.getPersons().size(), 46); RiskTask task = taskRepository.create(domain.getPersons().size(), 46);
taskRepository.save(task);
Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (oldValue, newValue) -> newValue)); Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (oldValue, newValue) -> newValue));
List<Extreme> list = zdryRepository.getBaseMapper().syncKillSelf(); List<Extreme> list = zdryRepository.getBaseMapper().syncKillSelf();
List<RiskModelTaskClue> olds = Optional.ofNullable(domain.getMap().get(task.getId())).orElse(new ArrayList<>()); List<RiskModelTaskClue> olds = Optional.ofNullable(domain.getMap().get(task.getId())).orElse(new ArrayList<>());
@ -319,13 +295,7 @@ public class PointServiceImpl implements PointService {
if (!toInsert.isEmpty()) { if (!toInsert.isEmpty()) {
modelTaskClueService.saveClues(toInsert, Default.KILL_IG); modelTaskClueService.saveClues(toInsert, Default.KILL_IG);
} }
RiskTask updateTask = new RiskTask(); taskRepository.updateTask(task.getId(), toInsert.size(), 0);
updateTask.setId(task.getId());
updateTask.setInsertSize(toInsert.size());
updateTask.setUpdateSize(0);
updateTask.setState(1);
updateTask.setEndTime(LocalDateTime.now());
taskRepository.updateById(updateTask);
} }
@Override @Override
@ -2111,7 +2081,7 @@ public class PointServiceImpl implements PointService {
List<GBaseTbDZdrylb> lbList = zdrylbRepository.list(new LambdaQueryWrapper<GBaseTbDZdrylb>() List<GBaseTbDZdrylb> lbList = zdrylbRepository.list(new LambdaQueryWrapper<GBaseTbDZdrylb>()
.select(GBaseTbDZdrylb::getCode, GBaseTbDZdrylb::getDefine)); .select(GBaseTbDZdrylb::getCode, GBaseTbDZdrylb::getDefine));
List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>() List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
.select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource) .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
.eq(SupExternalDepart::getSource, "重点人员")); .eq(SupExternalDepart::getSource, "重点人员"));
List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg(); List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg();
@ -2183,7 +2153,7 @@ public class PointServiceImpl implements PointService {
personal.setIdCode(ry.getSfzh()); personal.setIdCode(ry.getSfzh());
personal.setName(ry.getXm()); personal.setName(ry.getXm());
personal.setControlDepartName(depart.getInternalName()); personal.setControlDepartName(depart.getInternalShortName());
personal.setControlDepartId(depart.getInternalId()); personal.setControlDepartId(depart.getInternalId());
try { try {
personal.setControlTime(LocalDateTime.parse(ry.getJlbgsj(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); personal.setControlTime(LocalDateTime.parse(ry.getJlbgsj(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));

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

@ -49,11 +49,6 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService {
if(idCodes != null && !idCodes.isEmpty()) { if(idCodes != null && !idCodes.isEmpty()) {
queryWrapper.in(RiskPersonal::getIdCode, idCodes); queryWrapper.in(RiskPersonal::getIdCode, idCodes);
} }
if(weight != null && !weight.equals("1")) {
Double we = Optional.ofNullable(weight).map(Double::valueOf).orElse(1.0);
int result = riskModelTaskClueRepository.getBaseMapper().updateScoreResult(we);
log.info("修改分数");
}
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<>());
@ -68,6 +63,21 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService {
List<RiskModelTaskClue> clues = riskModelTaskClueRepository.list(new LambdaQueryWrapper<RiskModelTaskClue>() List<RiskModelTaskClue> clues = riskModelTaskClueRepository.list(new LambdaQueryWrapper<RiskModelTaskClue>()
.select(RiskModelTaskClue::getIdCode, RiskModelTaskClue::getModelId, RiskModelTaskClue::getScore, RiskModelTaskClue::getScoreResult) .select(RiskModelTaskClue::getIdCode, RiskModelTaskClue::getModelId, RiskModelTaskClue::getScore, RiskModelTaskClue::getScoreResult)
.eq(RiskModelTaskClue::getDel, 0)); .eq(RiskModelTaskClue::getDel, 0));
log.info("1、修改每项得分\n2、修改人员总分");
log.info("1、计算分项倍分");
List<RiskModelTaskClue> updates = new ArrayList<>();
if(weight != null && !weight.equals("1")) {
for (RiskModelTaskClue clue : clues) {
RiskModelTaskClue update = new RiskModelTaskClue();
update.setId(clue.getId());
update.setScoreResult(new BigDecimal(clue.getScoreCalc().toString()).multiply(new BigDecimal(weight)).divide(new BigDecimal("1"), 2, RoundingMode.HALF_UP).doubleValue());
updates.add(update);
clue.setScoreResult(update.getScoreResult());
}
log.info("1、修改每项得分");
riskModelTaskClueRepository.updateBatchById(updates);
}
Map<String, Map<Integer, List<RiskModelTaskClue>>> clueMap = new HashMap<>(); Map<String, Map<Integer, List<RiskModelTaskClue>>> clueMap = new HashMap<>();
for (RiskModelTaskClue clue : clues) { for (RiskModelTaskClue clue : clues) {
@ -105,15 +115,15 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService {
// BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore.doubleValue(), riskScoreRule.getScore()))); // BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore.doubleValue(), riskScoreRule.getScore())));
// //
// BigDecimal weight = new BigDecimal(Double.toString(riskScoreRule.getWeight())); // BigDecimal weight = new BigDecimal(Double.toString(riskScoreRule.getWeight()));
// n2 = n2.multiply(weight).divide(new BigDecimal("100"), 2, RoundingMode.UP); // n2 = n2.multiply(weight).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
Double ruleScore = temp.stream().mapToDouble(RiskModelTaskClue::getScoreResult).sum(); Double ruleScore = temp.stream().mapToDouble(RiskModelTaskClue::getScoreResult).sum();
BigDecimal rScore = new BigDecimal(riskScoreRule.getScore().toString()).multiply(new BigDecimal(weight)); BigDecimal rScore = new BigDecimal(riskScoreRule.getScore().toString()).multiply(new BigDecimal(weight)).divide(new BigDecimal("1"), 2, RoundingMode.HALF_UP);
BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore, rScore.doubleValue()))); BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore, rScore.doubleValue())));
score=score.add(n2); score=score.add(n2);
} }
// BigDecimal ruleScore = new BigDecimal(Double.toString(rule.getScore())); // BigDecimal ruleScore = new BigDecimal(Double.toString(rule.getScore()));
// BigDecimal weight = new BigDecimal(Double.toString(rule.getWeight())); // BigDecimal weight = new BigDecimal(Double.toString(rule.getWeight()));
// score = score.multiply(weight).divide(ruleScore, 2, RoundingMode.UP); // score = score.multiply(weight).divide(ruleScore, 2, RoundingMode.HALF_UP);
total = total.add(score); total = total.add(score);
} }
//二次改造 //二次改造
@ -135,6 +145,7 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService {
log.info("已完成打分: {},共计:{}", count,size); log.info("已完成打分: {},共计:{}", count,size);
} }
} }
personalRepository.updateBatchById(toUpdates, 10000); personalRepository.updateBatchById(toUpdates, 10000);
} }
} }

5
src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java
Unescape View File

@ -112,7 +112,6 @@ public class RiskTaskServiceImpl implements RiskTaskService {
"大学"; "大学";
case "硕士研究生毕业", "研究生教育", "研究生班肄业" -> "大学以上"; case "硕士研究生毕业", "研究生教育", "研究生班肄业" -> "大学以上";
default -> null; default -> null;
}; };
if (edu == null) { if (edu == null) {
continue; continue;
@ -403,7 +402,7 @@ public class RiskTaskServiceImpl implements RiskTaskService {
Map<String, GBaseSYRKXX> syrkxxMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (oldValue, newValue) -> newValue)); Map<String, GBaseSYRKXX> syrkxxMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (oldValue, newValue) -> newValue));
List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>() List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
.select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource) .select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalShortName, SupExternalDepart::getSource)
.eq(SupExternalDepart::getSource, "重点人员")); .eq(SupExternalDepart::getSource, "重点人员"));
Map<String, SupExternalDepart> jqExternalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val)); Map<String, SupExternalDepart> jqExternalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
@ -628,7 +627,7 @@ public class RiskTaskServiceImpl implements RiskTaskService {
SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(item -> jqExternalDepart.get(item)).orElse(null); SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(item -> jqExternalDepart.get(item)).orElse(null);
if (depart != null) { if (depart != null) {
person.setControlDepartId(depart.getInternalId()); person.setControlDepartId(depart.getInternalId());
person.setControlDepartName(depart.getInternalName()); person.setControlDepartName(depart.getInternalShortName());
person.setControlDepartType(DepartType.HUMAN.getType()); person.setControlDepartType(DepartType.HUMAN.getType());
person.setControlTime(LocalDateTime.now()); person.setControlTime(LocalDateTime.now());
} }

Write Preview
Loading…
Cancel
Save