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

Merge remote-tracking branch 'origin/master'

master
sjh 1 year ago
parent
fd684ad060 65ed8355aa
commit
da84732b0f
15 changed files with 306 additions and 337 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 88
      src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
  2. 7
      src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseSHRXXMapper.java
  3. 6
      src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java
  4. 3
      src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseZDRYMapper.java
  5. 16
      src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcPersonMapper.java
  6. 29
      src/main/java/com/biutag/supervisiondata/pojo/domain/WFSHPerson.java
  7. 21
      src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcPerson.java
  8. 15
      src/main/java/com/biutag/supervisiondata/repository/WdpcPersonRepository.java
  9. 5
      src/main/java/com/biutag/supervisiondata/service/PersonalService.java
  10. 2
      src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java
  11. 355
      src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java
  12. 64
      src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java
  13. 21
      src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
  14. 8
      src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
  15. 3
      src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java

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

@ -102,52 +102,50 @@ public class ApplicationEvent {
LocalDateTime start = LocalDateTime.of(2023, 12, 6, 0, 0, 0);
LocalDateTime end = LocalDateTime.now();
CompletableFutureUtil.runSync(() -> {
// 测试数据
// gBaseJJDService.pullDataAndSaveRedis(start, end);
// personalService.init();
// personalService.pullInvestigate();
// personalService.pullPsychosis();
// gBaseJJDService.pullAndSave(start, end);
// gBaseSHRWFRService.pullAndSave(start, end);
// petitionService.personPullAndSave(start, end);
// personalService.pullPetitionAgain();
// pointService.personPullAndSave(start, end);
// riskPersonalService.fixed();
// petitionService.petitionModelTask(initDomain(List.of(40)));
// riskTaskService.eduModelTask(initDomain(List.of(34)));
// 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)));
// riskTaskService.riskAreaModelTask(initDomain(List.of(41)));
// 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)));
// pointService.syncFatherEducation(initDomain(List.of(112)));
// pointService.syncMotherEducation(initDomain(List.of(113)));
// pointService.syncDomicileType(initDomain(List.of(114)));
pointService.syncCriminalPunishment(initDomain(List.of(115)));// 需重跑 报错 已修改
personalService.init();
personalService.pullInvestigate();
personalService.pullPsychosis();
gBaseSHRWFRService.pullAndSave(start, end);
petitionService.personPullAndSave(start, end);
personalService.pullPetitionAgain();
pointService.personPullAndSave(start, end);
gBaseJJDService.pullAndSave(start, end);
riskPersonalService.fixed();
petitionService.petitionModelTask(initDomain(List.of(40)));
riskTaskService.eduModelTask(initDomain(List.of(34)));
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)));
riskTaskService.riskAreaModelTask(initDomain(List.of(41)));
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)));
pointService.syncFatherEducation(initDomain(List.of(112)));
pointService.syncMotherEducation(initDomain(List.of(113)));
pointService.syncDomicileType(initDomain(List.of(114)));
// pointService.syncCriminalPunishment(initDomain(List.of(115)));// 需重跑 报错
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.syncFatherDie(initDomain(List.of(119)));
pointService.syncMotherDie(initDomain(List.of(120)));

7
src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseSHRXXMapper.java
Unescape View File

@ -1,6 +1,7 @@
package com.biutag.supervisiondata.mapper.dwd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.biutag.supervisiondata.pojo.domain.WFSHPerson;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseAJJBXX;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseSHRXX;
import org.apache.ibatis.annotations.Param;
@ -25,4 +26,10 @@ public interface GBaseSHRXXMapper extends BaseMapper<GBaseSHRXX> {
" where shrq between #{startTime} and #{endTime} " +
" and ajbh is not null")
List<GBaseSHRXX> selectDataToRisk(@Param("startTime")String startTime, @Param("endTime")String endTime);
@Select(" select a.ajbh as ajbh,a.xm as name,a.gmsfhm as idCode,a.lxdh as mobile ,b.badwiddm as departId, b.barq as barq from dwd_asj_zfba_shrxx a " +
" left join dwd_asj_zfba_ajjbxx b on a.ajbh = b.ajbh " +
" where a.gmsfhm is not null and a.ajbh is not null " +
" and b.barq between #{startTime} and #{endTime} ")
List<WFSHPerson> selectSHData(@Param("startTime")String startTime, @Param("endTime")String endTime);
}

6
src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java
Unescape View File

@ -1,6 +1,7 @@
package com.biutag.supervisiondata.mapper.dwd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.biutag.supervisiondata.pojo.domain.WFSHPerson;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseSHRXX;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseWFRXX;
import org.apache.ibatis.annotations.Param;
@ -26,6 +27,11 @@ public interface GBaseWFRXXMapper extends BaseMapper<GBaseWFRXX> {
" and ajbh is not null")
List<GBaseWFRXX> selectDataToRisk(@Param("startTime")String startTime, @Param("endTime")String endTime);
@Select(" select a.ajbh as ajbh,a.xm as name,a.zjhm as idCode,a.lxdh as mobile ,b.badwiddm as departId, b.barq as barq from dwd_ry_zfba_wfryxx a " +
" left join dwd_asj_zfba_ajjbxx b on a.ajbh = b.ajbh " +
" where a.zjhm is not null and a.ajbh is not null " +
" and b.barq between #{startTime} and #{endTime} ")
List<WFSHPerson> selectWFData(@Param("startTime")String startTime, @Param("endTime")String endTime);
/**
* 5年内犯罪

3
src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseZDRYMapper.java
Unescape View File

@ -86,6 +86,9 @@ public interface GBaseZDRYMapper extends BaseMapper<GBaseZDRY> {
"</script>")
List<String> syncCarUser(@Param("list")List<String> list);
@Select(" select distinct dwd_zjhm from dwd_wp_jtqbglpt_jdcjbxx where (length(dwd_zjhm) = 18 or length(dwd_zjhm) = 15) and dwd_zjlx = 'A' and ztdm is not null and ztdm not in ( 'B','K','E') ")
List<String> syncCarUser2();
/**
* 获取重点人员的组织机构
* @return 列表

16
src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcPersonMapper.java
Unescape View File

@ -0,0 +1,16 @@
package com.biutag.supervisiondata.mapper.wdpc;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcPerson;
import org.apache.ibatis.annotations.Update;
/**
* @author kami on 2024-12-11 16:35:08
* @version 0.0.1
* @since 1.8
*/
public interface WdpcPersonMapper extends BaseMapper<WdpcPerson> {
@Update("truncate table wpdc_person")
int truncateTable();
}

29
src/main/java/com/biutag/supervisiondata/pojo/domain/WFSHPerson.java
Unescape View File

@ -0,0 +1,29 @@
package com.biutag.supervisiondata.pojo.domain;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @author kami on 2024-12-11 14:17:28
* @version 0.0.1
* @since 1.8
*/
@Data
public class WFSHPerson implements Serializable {
/**
* 案件编号
*/
String ajbh;
String name;
String idCode;
String mobile;
String departId;
Date barq;
}

21
src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcPerson.java
Unescape View File

@ -0,0 +1,21 @@
package com.biutag.supervisiondata.pojo.entity.wdpc;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* @author kami on 2024-12-11 16:34:00
* @version 0.0.1
* @since 1.8
*/
@Data
@TableName("`wdpc_person`")
public class WdpcPerson {
@TableId("`id`")
Integer id;
@TableField("id_code")
String idCode;
}

15
src/main/java/com/biutag/supervisiondata/repository/WdpcPersonRepository.java
Unescape View File

@ -0,0 +1,15 @@
package com.biutag.supervisiondata.repository;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.biutag.supervisiondata.mapper.wdpc.WdpcPersonMapper;
import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcPerson;
import org.springframework.stereotype.Service;
/**
* @author kami on 2024-12-11 16:35:44
* @version 0.0.1
* @since 1.8
*/
@Service
public class WdpcPersonRepository extends ServiceImpl<WdpcPersonMapper, WdpcPerson> {
}

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

@ -49,4 +49,9 @@ public interface PersonalService {
void pullPsychosis();
void init();
/**
* 同步人员到gbase
*/
void syncPerson();
}

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

@ -8,7 +8,6 @@ import com.biutag.supervisiondata.common.utils.StreamUtil;
import com.biutag.supervisiondata.config.cache.RedisDao;
import com.biutag.supervisiondata.pojo.ClueData;
import com.biutag.supervisiondata.pojo.constants.Default;
import com.biutag.supervisiondata.pojo.constants.RedisKey;
import com.biutag.supervisiondata.pojo.database.PointOrg;
import com.biutag.supervisiondata.pojo.domain.TaskParamDomain;
import com.biutag.supervisiondata.pojo.entity.ads.GBaseSYRKXX;
@ -28,7 +27,6 @@ import com.biutag.supervisiondata.util.OrgUtil;
import com.biutag.supervisiondata.util.PatternUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cglib.core.Local;
import org.springframework.stereotype.Service;
import java.time.LocalDate;

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

@ -6,10 +6,8 @@ import com.biutag.supervisiondata.pojo.ClueData;
import com.biutag.supervisiondata.pojo.constants.Default;
import com.biutag.supervisiondata.pojo.database.PointOrg;
import com.biutag.supervisiondata.pojo.domain.TaskParamDomain;
import com.biutag.supervisiondata.pojo.domain.WFSHPerson;
import com.biutag.supervisiondata.pojo.entity.ads.GBaseSYRKXX;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseAJJBXX;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseJJD;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseSHRXX;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseWFRXX;
import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue;
import com.biutag.supervisiondata.pojo.entity.mine.RiskPersonal;
@ -53,8 +51,6 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
private final GBaseSYRKXXRepository gBaseSYRKXXRepository;
private final GBaseAJJBXXRepository ajjbxxRepository;
private final RiskPersonalService riskPersonalService;
private final GBaseZDRYRepository zdryRepository;
@ -66,10 +62,8 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
List<PointOrg> orgs = zdryRepository.getBaseMapper().selectOrg();
List<SupExternalDepart> supDeparts = externalDepartRepository.list(new LambdaQueryWrapper<SupExternalDepart>()
.select(SupExternalDepart::getExternalId, SupExternalDepart::getInternalId, SupExternalDepart::getInternalName, SupExternalDepart::getSource)
.in(SupExternalDepart::getSource, List.of("重点人员", "情指行")));
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> jqExternalDepart = amp.get("情指行").stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
.in(SupExternalDepart::getSource, List.of("情指行")));
Map<String, SupExternalDepart> externalDepart = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
Map<String, PointOrg> orgIdMap = new WeakHashMap<>();
Map<String, PointOrg> orgCodeMap = new WeakHashMap<>();
@ -78,233 +72,66 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
orgCodeMap.put(org.getDm(), org);
}
List<GBaseSHRXX> shrList = new ArrayList<>();
List<GBaseWFRXX> wxrList = new ArrayList<>();
// 统计出所有的案件编号批量查询
List<String> ajNos = new ArrayList<>();
// 手机号
List<String> mobiles = new ArrayList<>();
// 身份证
List<String> idCards = new ArrayList<>();
List<WFSHPerson> shrTmp = new ArrayList<>();
List<WFSHPerson> wfrTmp = new ArrayList<>();
// 分别拉取受害人和违法人信息
CompletableFuture.allOf(
CompletableFutureUtil.runSyncObject(() -> {
List<GBaseSHRXX> shrTmp = shrxxRepository.getBaseMapper().selectDataToRisk(start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
for (GBaseSHRXX gBaseSHRXX : shrTmp) {
if (gBaseSHRXX.getGmsfhm() != null) {
idCards.add(gBaseSHRXX.getGmsfhm());
} else if (gBaseSHRXX.getLxdh() != null) {
mobiles.add(gBaseSHRXX.getLxdh());
} else {
continue;
}
shrList.add(gBaseSHRXX);
ajNos.add(gBaseSHRXX.getAjbh());
}
}),
CompletableFutureUtil.runSyncObject(() -> {
List<GBaseWFRXX> wfrTmp = wfrxxRepository.getBaseMapper().selectDataToRisk("2019-12-06 00:00:00",
end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
for (GBaseWFRXX gBaseWFRXX : wfrTmp) {
if (gBaseWFRXX.getZjhm() != null) {
idCards.add(gBaseWFRXX.getZjhm());
} else if (gBaseWFRXX.getLxdh() != null) {
mobiles.add(gBaseWFRXX.getLxdh());
} else {
continue;
}
wxrList.add(gBaseWFRXX);
ajNos.add(gBaseWFRXX.getAjbh());
}
})
).join();
List<String> distinctAJ = ajNos.stream().distinct().toList();
// 切割 每次查10000条
List<List<String>> ajs = IntStream.range(0, (distinctAJ.size() + 9999) / 10000)
.mapToObj(i -> distinctAJ.subList(i * 10000, Math.min((i + 1) * 10000, distinctAJ.size())))
.toList();
List<String> idCards2 = idCards.stream().distinct().toList();
List<String> mobiles2 = mobiles.stream().distinct().toList();
List<GBaseAJJBXX> xxList = new ArrayList<>();
for (List<String> aj : ajs) {
xxList.addAll(ajjbxxRepository.list(new LambdaQueryWrapper<GBaseAJJBXX>()
.select(GBaseAJJBXX::getAjbh, GBaseAJJBXX::getBadwidmc, GBaseAJJBXX::getBadwiddm, GBaseAJJBXX::getBarq)
.in(GBaseAJJBXX::getAjbh, aj)));
}
// 案件转map方便提取
Map<String, GBaseAJJBXX> xxMap = xxList.stream().collect(Collectors.toMap(GBaseAJJBXX::getAjbh, Function.identity(), (oldValue, newValue) -> newValue));
// 人员信息查询
// 身份证查到的人
List<GBaseSYRKXX> sFms = new ArrayList<>();
// 手机号查到的人
List<GBaseSYRKXX> lXfs = new ArrayList<>();
CompletableFuture.allOf(
CompletableFutureUtil.runSyncObject(() -> {
List<List<String>> idCode = IntStream.range(0, (idCards2.size() + 9999) / 10000)
.mapToObj(i -> idCards2.subList(i * 10000, Math.min((i + 1) * 10000, idCards2.size())))
.toList();
int count = idCode.size();
for (List<String> arr : idCode) {
List<GBaseSYRKXX> list = gBaseSYRKXXRepository.list(new LambdaQueryWrapper<GBaseSYRKXX>()
.select(GBaseSYRKXX::getLxdh, GBaseSYRKXX::getGmsfhm, GBaseSYRKXX::getXm, GBaseSYRKXX::getXbdm, GBaseSYRKXX::getSspcsdm)
.in(GBaseSYRKXX::getGmsfhm, arr));
sFms.addAll(list);
log.info("身份证进度 | {}", --count);
}
}),
CompletableFutureUtil.runSyncObject(() -> {
List<List<String>> mobile = IntStream.range(0, (mobiles2.size() + 9999) / 10000)
.mapToObj(i -> mobiles2.subList(i * 10000, Math.min((i + 1) * 10000, mobiles2.size())))
.toList();
int count = mobile.size();
for (List<String> arr : mobile) {
List<GBaseSYRKXX> list = gBaseSYRKXXRepository.list(new LambdaQueryWrapper<GBaseSYRKXX>()
.select(GBaseSYRKXX::getLxdh, GBaseSYRKXX::getGmsfhm, GBaseSYRKXX::getXm, GBaseSYRKXX::getXbdm, GBaseSYRKXX::getSspcsdm)
.in(GBaseSYRKXX::getLxdh, arr));
lXfs.addAll(list);
log.info("手机号进度 | {}", --count);
}
})
CompletableFutureUtil.runSyncObject(() -> shrTmp.addAll(shrxxRepository.getBaseMapper().selectSHData(start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))),
CompletableFutureUtil.runSyncObject(() -> wfrTmp.addAll(wfrxxRepository.getBaseMapper().selectWFData("2019-12-06 00:00:00",
end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))))
).join();
Map<String, GBaseSYRKXX> idCodeMap = sFms.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (oldValue, newValue) -> newValue));
Map<String, List<GBaseSYRKXX>> mobileMap = lXfs.stream().collect(Collectors.groupingBy(GBaseSYRKXX::getLxdh));
List<RiskPersonal> personals = new ArrayList<>();
Map<String, List<GBaseAJJBXX>> shrMap = new HashMap<>();
for (GBaseSHRXX gBaseSHRXX : shrList) {
GBaseAJJBXX ajjbxx = xxMap.get(gBaseSHRXX.getAjbh());
if (ajjbxx == null) {
// 信息全的数据
Map<String, WFSHPerson> tmpMap = new WeakHashMap<>();
// 要补全的数据
List<String> idCodes = new ArrayList<>();
for (WFSHPerson wfshPerson : shrTmp) {
if (tmpMap.get(wfshPerson.getIdCode()) != null) {
continue;
}
GBaseSYRKXX rkxx = Optional.ofNullable(gBaseSHRXX.getGmsfhm()).map(idCodeMap::get)
.orElse(null);
if (gBaseSHRXX.getLxdh() != null && rkxx == null) {
List<GBaseSYRKXX> rkxxList = mobileMap.get(gBaseSHRXX.getLxdh());
if (rkxxList != null) {
rkxx = compare(rkxxList, gBaseSHRXX.getXm());
}
}
if (rkxx != null) {
RiskPersonal person = createPerson(Default.SHR_TAG, ajjbxx, rkxx);
if (rkxx.getSspcsdm() != null) {
PointOrg org = orgCodeMap.get(rkxx.getSspcsdm());
org = findOrg(org, orgIdMap);
if (org != null) {
SupExternalDepart depart = pointExternalDepart.get(org.getDm());
if (depart != null) {
person.setControlDepartId(depart.getInternalId());
person.setControlDepartName(depart.getInternalName());
person.setControlDepartType(DepartType.HUMAN.getType());
person.setControlTime(LocalDateTime.now());
person.setCreateTime(person.getControlTime());
}
}
}
if (person.getIdCode() != null) {
shrMap.computeIfAbsent(person.getIdCode(), k -> new ArrayList<>()).add(ajjbxx);
}
personals.add(person);
}
}
for (GBaseWFRXX gBaseWFRXX : wxrList) {
GBaseAJJBXX ajjbxx = xxMap.get(gBaseWFRXX.getAjbh());
if (ajjbxx == null) {
if (wfshPerson.getName() == null || wfshPerson.getName().isEmpty() || wfshPerson.getMobile() == null
|| wfshPerson.getMobile().isEmpty() || wfshPerson.getMobile().equals("无")) {
idCodes.add(wfshPerson.getIdCode());
continue;
}
GBaseSYRKXX rkxx = null;
if (gBaseWFRXX.getZjhm() != null) {
rkxx = idCodeMap.get(gBaseWFRXX.getZjhm());
}
if (gBaseWFRXX.getLxdh() != null && rkxx == null) {
List<GBaseSYRKXX> rkxxList = mobileMap.get(gBaseWFRXX.getLxdh());
if (rkxxList != null) {
rkxx = compare(rkxxList, gBaseWFRXX.getXm());
}
}
if (rkxx != null) {
RiskPersonal person = createPerson(Default.WFR_TAG, ajjbxx, rkxx);
if (rkxx.getSspcsdm() != null) {
PointOrg org = orgCodeMap.get(rkxx.getSspcsdm());
org = findOrg(org, orgIdMap);
if (org != null) {
SupExternalDepart depart = pointExternalDepart.get(org.getDm());
if (depart != null) {
person.setControlDepartId(depart.getInternalId());
person.setControlDepartName(depart.getInternalName());
person.setControlDepartType(DepartType.HUMAN.getType());
person.setControlTime(LocalDateTime.now());
person.setCreateTime(person.getControlTime());
}
}
}
shrMap.computeIfAbsent(person.getIdCode(), k -> new ArrayList<>()).add(ajjbxx);
personals.add(person);
}
tmpMap.put(wfshPerson.getIdCode(), wfshPerson);
}
for (RiskPersonal personal : personals) {
if (personal.getControlDepartType() != null && personal.getControlDepartType() >= DepartType.HUMAN.getType()) {
for (WFSHPerson wfshPerson : wfrTmp) {
if (tmpMap.get(wfshPerson.getIdCode()) != null) {
continue;
}
List<GBaseAJJBXX> tmp = shrMap.get(personal.getIdCode());
if (tmp == null || tmp.isEmpty()) {
if (wfshPerson.getName() == null || wfshPerson.getName().isEmpty() || wfshPerson.getMobile() == null
|| wfshPerson.getMobile().isEmpty() || wfshPerson.getMobile().equals("无")) {
idCodes.add(wfshPerson.getIdCode());
continue;
}
GBaseAJJBXX jjx = null;
for (GBaseAJJBXX gBaseAJJBXX : tmp) {
if (jjx == null) {
jjx = gBaseAJJBXX;
continue;
}
try {
LocalDateTime time = gBaseAJJBXX.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
if (time.isAfter(jjx.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime())) {
jjx = gBaseAJJBXX;
}
} catch (Exception e) {
log.info("报警时间处理异常");
}
}
if (jjx == null || jjx.getBadwiddm() == null) {
personal.setControlDepartId(null);
personal.setControlDepartName(null);
personal.setControlTime(null);
personal.setControlDepartType(null);
continue;
}
PointOrg org = orgCodeMap.get(jjx.getBadwiddm());
org = findOrg(org, orgIdMap);
SupExternalDepart depart = Optional.ofNullable(org).map(PointOrg::getDm).map(jqExternalDepart::get).orElse(null);
if (depart == null) {
personal.setControlDepartId(null);
personal.setControlDepartName(null);
personal.setControlTime(null);
personal.setControlDepartType(null);
continue;
}
personal.setControlDepartId(depart.getInternalId());
personal.setControlDepartName(depart.getInternalName());
personal.setControlDepartType(DepartType.OTHER.getType());
// 如果有报警时间，暂时填报警时间 处理标签回正
try {
LocalDateTime time = jjx.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
personal.setCreateTime(time);
personal.setControlTime(time);
} catch (Exception e) {
personal.setCreateTime(LocalDateTime.now());
log.info("报警时间处理异常");
}
tmpMap.put(wfshPerson.getIdCode(), wfshPerson);
}
List<String> idCards = idCodes.stream().distinct().toList();
List<List<String>> idCode = IntStream.range(0, (idCards.size() + 9999) / 10000)
.mapToObj(i -> idCards.subList(i * 10000, Math.min((i + 1) * 10000, idCards.size())))
.toList();
log.info("获取补全违法人和受害人:{}", idCode.size());
List<GBaseSYRKXX> xxList = new ArrayList<>();
int count = idCode.size();
for (List<String> arr : idCode) {
xxList.addAll(gBaseSYRKXXRepository.list(new LambdaQueryWrapper<GBaseSYRKXX>()
.select(GBaseSYRKXX::getLxdh, GBaseSYRKXX::getGmsfhm, GBaseSYRKXX::getXm, GBaseSYRKXX::getXbdm, GBaseSYRKXX::getSspcsdm)
.in(GBaseSYRKXX::getGmsfhm, arr)));
log.info("身份证进度 | {}", --count);
}
log.info("人数: {}", personals.size());
riskPersonalService.formatAndSave(personals, Default.BIG_TAG_SHWFR);
Map<String, GBaseSYRKXX> idCodeMap = xxList.stream().collect(Collectors.toMap(GBaseSYRKXX::getGmsfhm, Function.identity(), (oldValue, newValue) -> newValue));
List<RiskPersonal> toInsert1 = createInsertData(Default.WFR_TAG, wfrTmp, tmpMap, idCodeMap, orgCodeMap, orgIdMap, externalDepart);
List<RiskPersonal> toInsert2 = createInsertData(Default.SHR_TAG, shrTmp, tmpMap, idCodeMap, orgCodeMap, orgIdMap, externalDepart);
log.info("违法人数: {}", toInsert1.size());
riskPersonalService.formatAndSave(toInsert1, Default.WFR_TAG);
log.info("受害人数: {}", toInsert2.size());
riskPersonalService.formatAndSave(toInsert2, Default.SHR_TAG);
}
private final RiskTaskRepository taskRepository;
@ -585,33 +412,75 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
return info;
}
RiskPersonal createPerson(String tag, GBaseAJJBXX ajjbxx, GBaseSYRKXX rkxx) {
RiskPersonal createPerson(WFSHPerson person, GBaseSYRKXX xx, String tag) {
RiskPersonal personal = new RiskPersonal();
personal.setIdCode(rkxx.getGmsfhm());
personal.setName(rkxx.getXm());
personal.setMobileNumber(rkxx.getLxdh());
personal.setControlDepartId(ajjbxx.getBadwiddm());
personal.setControlDepartName(ajjbxx.getBadwidmc());
personal.setGender(IdCodeUtil.idCard2Gender(rkxx.getGmsfhm()));
if (personal.getGender() == null) {
personal.setGender(rkxx.getXbdm());
}
personal.setControlDepartType(DepartType.OTHER.getType());
// 如果有报警时间，暂时填报警时间 处理标签回正
try {
LocalDateTime time = ajjbxx.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
personal.setCreateTime(time);
personal.setControlTime(time);
} catch (Exception e) {
personal.setCreateTime(LocalDateTime.now());
log.info("报警时间处理异常");
personal.setIdCode(person.getIdCode());
if (xx != null) {
personal.setName(xx.getXm());
personal.setMobileNumber(xx.getLxdh());
personal.setControlTime(LocalDateTime.now());
} else {
personal.setName(person.getName());
personal.setName(person.getMobile());
try {
personal.setControlTime(person.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
} catch (Exception e) {
log.error("案件日期转换异常");
}
}
personal.setGender(IdCodeUtil.idCard2Gender(person.getIdCode()));
personal.setAge(Optional.ofNullable(IdCodeUtil.idCard2Age(personal.getIdCode(), LocalDate.now())).orElse(-1));
// 这里暂时将小标签放到预览属性 处理标签回正
personal.setCreateTime(LocalDateTime.now());
personal.setTags(tag);
return personal;
}
List<RiskPersonal> createInsertData(String tag, List<WFSHPerson> list, Map<String, WFSHPerson> tmpMap, Map<String, GBaseSYRKXX> idCodeMap,
Map<String, PointOrg> orgCodeMap, Map<String, PointOrg> orgIdMap, Map<String, SupExternalDepart> externalDepart) {
Map<String, SupExternalDepart> departMap = new WeakHashMap<>();
Map<String, Byte[]> exist = new WeakHashMap<>();
List<RiskPersonal> toInsert = new ArrayList<>();
for (WFSHPerson person : list) {
if (exist.get(person.getIdCode()) != null) {
continue;
}
WFSHPerson result = tmpMap.get(person.getIdCode());
RiskPersonal personal;
String departId;
if (result != null) {
personal = createPerson(result, null, tag);
personal.setControlDepartType(DepartType.OTHER.getType());
departId = result.getDepartId();
} else {
GBaseSYRKXX xx = idCodeMap.get(person.getIdCode());
personal = createPerson(person, xx, tag);
personal.setControlDepartType(DepartType.HUMAN.getType());
departId = xx.getSspcsdm();
}
if (departId == null) {
toInsert.add(personal);
continue;
}
SupExternalDepart depart = departMap.get(departId);
if (depart == null) {
PointOrg org = orgCodeMap.get(departId);
org = findOrg(org, orgIdMap);
if (org != null) {
depart = externalDepart.get(org.getDm());
departMap.put(departId, depart);
}
}
if (depart != null) {
personal.setControlDepartId(depart.getInternalId());
personal.setControlDepartName(depart.getInternalName());
}
toInsert.add(personal);
exist.put(person.getIdCode(), new Byte[0]);
}
return toInsert;
}
PointOrg findOrg(PointOrg org, Map<String, PointOrg> orgIdMap) {
if (org == null) {
return null;

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

@ -9,6 +9,7 @@ import com.biutag.supervisiondata.pojo.entity.ads.GBaseSYRKXX;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseJJD;
import com.biutag.supervisiondata.pojo.entity.dwd.GBaseZDRY;
import com.biutag.supervisiondata.pojo.entity.mine.*;
import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcPerson;
import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcGrjdJsbry;
import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsj;
import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsjCs;
@ -125,7 +126,7 @@ public class PersonalServiceImpl implements PersonalService {
cache.put(item.getBjrzjhm(), new Byte[0]);
if (syrkxx != null) {
RiskPersonal personal = createPerson(syrkxx, item.getBjsj(), now, end, Default.BIG_TAG_JJD);
if(personal != null) {
if (personal != null) {
personals.add(personal);
}
}
@ -135,16 +136,16 @@ public class PersonalServiceImpl implements PersonalService {
if (!idCards.isEmpty()) {
String[] arr = idCards.split(",");
for (String s : arr) {
if(cache.get(s) != null) {
if (cache.get(s) != null) {
continue;
}
GBaseSYRKXX xx = idCodeMap.get(s);
if(xx == null) {
if (xx == null) {
continue;
}
cache.put(xx.getGmsfhm(), new Byte[0]);
RiskPersonal personal = createPerson(xx, item.getBjsj(), now, end, Default.BIG_TAG_JJD);
if(personal == null) {
if (personal == null) {
continue;
}
personals.add(personal);
@ -156,7 +157,7 @@ public class PersonalServiceImpl implements PersonalService {
if (syrkxx != null) {
cache.put(syrkxx.getGmsfhm(), new Byte[0]);
RiskPersonal personal = createPerson(syrkxx, item.getBjsj(), now, end, Default.BIG_TAG_JJD);
if(personal == null) {
if (personal == null) {
continue;
}
personals.add(personal);
@ -240,7 +241,7 @@ public class PersonalServiceImpl implements PersonalService {
Contradiction contradiction = map.get(syrkxx.getGmsfhm());
RiskPersonal personal = createPerson(syrkxx, Optional.of(contradiction).map(Contradiction::getMaxTime)
.orElse(null), now.toLocalDate(), now, Default.BIG_TAG_SHWFR);
if(personal != null) {
if (personal != null) {
personals.add(personal);
}
@ -294,8 +295,8 @@ public class PersonalServiceImpl implements PersonalService {
Date nowDate = new Date();
for (GBaseSYRKXX xx : xxList) {
if (map.get(xx.getGmsfhm()) == null) {
RiskPersonal personal =createPerson(xx, nowDate, today, now, Default.BIG_TAG_PETITION);
if(personal != null) {
RiskPersonal personal = createPerson(xx, nowDate, today, now, Default.BIG_TAG_PETITION);
if (personal != null) {
personals.add(personal);
}
map.put(xx.getGmsfhm(), new Byte[0]);
@ -335,7 +336,7 @@ public class PersonalServiceImpl implements PersonalService {
orgCodeMap.put(org.getDm(), org);
}
Map<String, SupExternalDepart> supExternalDepartMap = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val,old) -> val));
Map<String, SupExternalDepart> supExternalDepartMap = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
List<GBaseSYRKXX> xxList = new ArrayList<>(getByIdCode(idCards2));
// 去重
@ -348,17 +349,17 @@ public class PersonalServiceImpl implements PersonalService {
for (GBaseSYRKXX xx : xxList) {
if (map.get(xx.getGmsfhm()) == null) {
RiskPersonal personal = createPerson(xx, nowDate, today, now, Default.BIG_TAG_PETITION);
if(personal == null) {
if (personal == null) {
continue;
}
SupExternalDepart depart = hope.get(xx.getSspcsdm());
if(depart == null) {
if (depart == null) {
personal.setMobileNumber(xx.getLxdh());
PointOrg org = orgCodeMap.get(xx.getSspcsdm());
org = OrgUtil.findOrg(org, orgIdMap);
depart = Optional.ofNullable(org).map(PointOrg::getDm).map(supExternalDepartMap::get).orElse(null);
}
if(depart != null) {
if (depart != null) {
hope.put(xx.getSspcsdm(), depart);
personal.setControlDepartId(depart.getInternalId());
personal.setControlDepartName(depart.getInternalName());
@ -374,11 +375,11 @@ public class PersonalServiceImpl implements PersonalService {
riskPersonalService.saveDistinct(personals);
}
private final WdpcRyLgXXRepository lgXXRepository;
private final WdpcRyLgXXRepository lgXXRepository;
@Override
public void pullInvestigate() {
List<WdpcRyLgXX> xxList = lgXXRepository.list(new LambdaQueryWrapper<WdpcRyLgXX>().select(WdpcRyLgXX::getXm,WdpcRyLgXX::getSfzh,WdpcRyLgXX::getGxdwmc,WdpcRyLgXX::getGxdwbh,WdpcRyLgXX::getLxdh));
List<WdpcRyLgXX> xxList = lgXXRepository.list(new LambdaQueryWrapper<WdpcRyLgXX>().select(WdpcRyLgXX::getXm, WdpcRyLgXX::getSfzh, WdpcRyLgXX::getGxdwmc, WdpcRyLgXX::getGxdwbh, WdpcRyLgXX::getLxdh));
LocalDate now = LocalDate.now();
List<RiskPersonal> personals = new ArrayList<>();
for (WdpcRyLgXX wdpcRyLgXX : xxList) {
@ -396,7 +397,7 @@ public class PersonalServiceImpl implements PersonalService {
person.setTags(Default.INVESTIGATE_FOUR);
personals.add(person);
}
if(!personals.isEmpty()) {
if (!personals.isEmpty()) {
riskPersonalService.saveDistinct(personals);
}
}
@ -431,13 +432,13 @@ public class PersonalServiceImpl implements PersonalService {
orgCodeMap.put(org.getDm(), org);
}
Map<String, SupExternalDepart> supExternalDepartMap = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val,old) -> val));
Map<String, SupExternalDepart> supExternalDepartMap = supDeparts.stream().collect(Collectors.toMap(SupExternalDepart::getExternalId, Function.identity(), (val, old) -> val));
Map<String, Byte[]> map = new WeakHashMap<>();
List<RiskPersonal> personals = new ArrayList<>();
Map<String, SupExternalDepart> hope = new WeakHashMap<>();
for (WdpcGrjdJsbry ry : jsbryList) {
if(map.get(ry.getIdCode()) != null) {
if (map.get(ry.getIdCode()) != null) {
continue;
}
map.put(ry.getIdCode(), new Byte[0]);
@ -452,15 +453,15 @@ public class PersonalServiceImpl implements PersonalService {
person.setCreateTime(LocalDateTime.now());
person.setControlTime(LocalDateTime.now());
person.setControlDepartType(DepartType.OTHER.getType());
if(xx != null) {
if (xx != null) {
SupExternalDepart depart = hope.get(xx.getSspcsdm());
if(depart == null) {
if (depart == null) {
person.setMobileNumber(xx.getLxdh());
PointOrg org = orgCodeMap.get(xx.getSspcsdm());
org = OrgUtil.findOrg(org, orgIdMap);
depart = Optional.ofNullable(org).map(PointOrg::getDm).map(supExternalDepartMap::get).orElse(null);
}
if(depart != null) {
if (depart != null) {
hope.put(xx.getSspcsdm(), depart);
person.setControlDepartId(depart.getInternalId());
person.setControlDepartName(depart.getInternalName());
@ -470,7 +471,7 @@ public class PersonalServiceImpl implements PersonalService {
person.setTags(Default.PSYCHOSIS_TAG);
personals.add(person);
}
if(!personals.isEmpty()) {
if (!personals.isEmpty()) {
riskPersonalService.saveDistinct(personals);
}
}
@ -487,6 +488,27 @@ public class PersonalServiceImpl implements PersonalService {
riskTestRepository.getBaseMapper().truncateTable();
}
private final WdpcPersonRepository wdpcPersonRepository;
private final RiskPersonalRepository personalRepository;
@Override
public void syncPerson() {
wdpcPersonRepository.getBaseMapper().truncateTable();
List<RiskPersonal> personals = personalRepository.list(new LambdaQueryWrapper<RiskPersonal>()
.select(RiskPersonal::getIdCode, RiskPersonal::getIdCode)
.eq(RiskPersonal::getDel, 0));
List<WdpcPerson> personList = new ArrayList<>();
for (RiskPersonal personal : personals) {
WdpcPerson person = new WdpcPerson();
person.setId(personal.getId());
person.setIdCode(personal.getIdCode());
personList.add(person);
}
wdpcPersonRepository.saveBatch(personList, 10000);
}
/**
* 通过身份证号查询实有人口
*

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

@ -289,8 +289,7 @@ public class PetitionServiceImpl implements PetitionService {
@Override
public void petitionModelTask(TaskParamDomain domain) {
RiskTask task = createTask(domain.getPersons().size(), 40);
riskTaskRepository.save(task);
RiskTask task = riskTaskRepository.create(domain.getPersons().size(), 40);
LocalDateTime time = LocalDateTime.now().minusMonths(12);
List<DataPetition12337> pList1 = new ArrayList<>();
@ -392,14 +391,7 @@ public class PetitionServiceImpl implements PetitionService {
log.info("公安信访数据: {}", toInsert.size());
riskModelTaskClueService.saveClues(toInsert, Default.MAIL_IG);
}
RiskTask updateTask = new RiskTask();
updateTask.setId(task.getId());
updateTask.setInsertSize(toInsert.size());
updateTask.setUpdateSize(0);
updateTask.setState(1);
updateTask.setEndTime(LocalDateTime.now());
riskTaskRepository.updateById(updateTask);
riskTaskRepository.updateTask(task.getId(), toInsert.size(), 0);
}
GBaseSYRKXX compare(List<GBaseSYRKXX> infos, String name) {
@ -424,15 +416,6 @@ public class PetitionServiceImpl implements PetitionService {
return info;
}
RiskTask createTask(Integer size, Integer modelId) {
RiskTask task = new RiskTask();
task.setModelId(modelId);
task.setStartTime(LocalDateTime.now());
task.setState(0);
task.setScanSize(size);
return task;
}
RiskModelTaskClue createClue(Integer modelId, Integer score, Integer taskId, ClueData data) {
RiskModelTaskClue clue = new RiskModelTaskClue();
clue.setModelId(modelId);

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

@ -1931,12 +1931,8 @@ public class PointServiceImpl implements PointService {
@Override
public void syncCarUser(TaskParamDomain domain) {
int count = domain.getIdCards().size();
List<String> carUsers = new ArrayList<>();
for (List<String> idCard : domain.getIdCards()) {
carUsers.addAll(zdryRepository.getBaseMapper().syncCarUser(idCard));
log.info("车主进度：{}", --count);
}
List<String> carUsers = zdryRepository.getBaseMapper().syncCarUser2();
log.info("车主数量：{}", carUsers.size());
RiskTask task = createTask(carUsers.size(), 53);
taskRepository.save(task);

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

@ -107,7 +107,8 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService {
// BigDecimal weight = new BigDecimal(Double.toString(riskScoreRule.getWeight()));
// n2 = n2.multiply(weight).divide(new BigDecimal("100"), 2, RoundingMode.UP);
Double ruleScore = temp.stream().mapToDouble(RiskModelTaskClue::getScoreResult).sum();
BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore, riskScoreRule.getScore())));
BigDecimal rScore = new BigDecimal(riskScoreRule.getScore().toString()).multiply(new BigDecimal(weight));
BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore, rScore.doubleValue())));
score=score.add(n2);
}
// BigDecimal ruleScore = new BigDecimal(Double.toString(rule.getScore()));

Write Preview
Loading…
Cancel
Save