liutongsz/fibo-rule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from andybbc/master

Browse Source 
规则块配置
This commit is contained in:
FiboAI
2022-08-09 11:24:52 +08:00
committed by GitHub
parent ce3e68dccc e906595a34
commit b19129e7d9
20 changed files with 333 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/enginex/risk/impl/EngineNodeServiceImpl.java
View File

@@ -598,7 +598,6 @@ public class EngineNodeServiceImpl extends ServiceImpl<EngineNodeMapper, EngineN
case 3:
scriptRuleVersionIds.add(ruleVersionId);
break;
}
}
List<RuleSetNodeResultParam> ruleSetNodeResultParams = new ArrayList<>();
@@ -610,9 +609,9 @@ public class EngineNodeServiceImpl extends ServiceImpl<EngineNodeMapper, EngineN
for (RuleInfo rule : ruleList) {
ruleMap.put(rule.getId(),rule);
if (rule.getDifficulty()==null||rule.getDifficulty()==1){
String resultEn = rule.getResultFieldEn();
String scoreEn = rule.getScoreFieldEn();
ruleSetNodeResultParams.add(new RuleSetNodeResultParam(rule.getId(),1,null,resultEn,scoreEn,rule.getCode(),rule.getName()));
// String resultEn = rule.getResultFieldEn();
// String scoreEn = rule.getScoreFieldEn();
// ruleSetNodeResultParams.add(new RuleSetNodeResultParam(rule.getId(),1,null,resultEn,scoreEn,rule.getCode(),rule.getName()));
}
}
}
@@ -622,10 +621,10 @@ public class EngineNodeServiceImpl extends ServiceImpl<EngineNodeMapper, EngineN
List<RuleVersion> ruleVersionList = ruleVersionService.listByIds(complexRuleVersionIds);
if (CollectionUtils.isNotEmpty(ruleVersionList)){
for (RuleVersion ruleVersion : ruleVersionList) {
String resultEn = ruleVersion.getResultFieldEn();
String scoreEn = ruleVersion.getScoreFieldEn();
RuleInfo rule = ruleMap.get(ruleVersion.getRuleId());
ruleSetNodeResultParams.add(new RuleSetNodeResultParam(ruleVersion.getRuleId(),2,ruleVersion.getId(),resultEn,scoreEn,rule.getCode(),rule.getName()));
// String resultEn = ruleVersion.getResultFieldEn();
// String scoreEn = ruleVersion.getScoreFieldEn();
// RuleInfo rule = ruleMap.get(ruleVersion.getRuleId());
// ruleSetNodeResultParams.add(new RuleSetNodeResultParam(ruleVersion.getRuleId(),2,ruleVersion.getId(),resultEn,scoreEn,rule.getCode(),rule.getName()));
}
}
}

19
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/guiderule/RuleBlockService.java Normal file
View File

@@ -0,0 +1,19 @@
package com.fibo.ddp.common.service.strategyx.guiderule;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fibo.ddp.common.model.strategyx.guiderule.RuleBlock;
import java.util.List;
/**
* 规则块配置表(RuleBlock)表服务接口
*
* @author andy.wang
* @since 2022-08-05 10:32:22
*/
public interface RuleBlockService extends IService<RuleBlock> {
List<RuleBlock> listObjectsByVersionId(Long versionId);
boolean removeObjects(Long ruleId, Long versionId);
}

6
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/guiderule/RuleConditionService.java
View File

@@ -16,9 +16,9 @@ public interface RuleConditionService extends IService<RuleConditionInfo> {
* @param ruleConditionVo 实例对象
* @return 实例对象
*/
RuleConditionVo insertRuleCondition(RuleConditionVo ruleConditionVo, Long ruleId);
RuleConditionVo insertRuleCondition(RuleConditionVo ruleConditionVo, Long ruleId, Long blockId);
RuleConditionVo updateRuleCondition(Long ruleId, RuleConditionVo ruleConditionVo);
RuleConditionVo updateRuleCondition(Long ruleId, Long blockId, RuleConditionVo ruleConditionVo);
boolean deleteRuleCondition(Long ruleId, Long versionId);
@@ -28,7 +28,7 @@ public interface RuleConditionService extends IService<RuleConditionInfo> {
List<RuleConditionInfo> disassemble(RuleConditionVo vo, Long ruleId, boolean needTempId);
// runner
RuleConditionVo queryByVersionId(Long versionId);
RuleConditionVo queryByBlockId(Long blockId);
List<String> queryFieldEnByVersionIds(List<Long> versionIds);
}

35
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/guiderule/impl/RuleBlockServiceImpl.java Normal file
View File

@@ -0,0 +1,35 @@
package com.fibo.ddp.common.service.strategyx.guiderule.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fibo.ddp.common.dao.strategyx.guiderule.RuleBlockMapper;
import com.fibo.ddp.common.model.strategyx.guiderule.RuleBlock;
import com.fibo.ddp.common.service.strategyx.guiderule.RuleBlockService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 规则块配置表(RuleBlock)表服务实现类
*
* @author andy.wang
* @since 2022-08-05 10:32:25
*/
@Service
public class RuleBlockServiceImpl extends ServiceImpl<RuleBlockMapper, RuleBlock> implements RuleBlockService {
@Override
public List<RuleBlock> listObjectsByVersionId(Long versionId) {
LambdaQueryWrapper<RuleBlock> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(RuleBlock::getVersionId, versionId);
return list(queryWrapper);
}
@Override
public boolean removeObjects(Long ruleId, Long versionId) {
LambdaQueryWrapper<RuleBlock> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(RuleBlock::getRuleId, ruleId);
queryWrapper.eq(RuleBlock::getVersionId, versionId);
return this.remove(queryWrapper);
}
}

32
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/guiderule/impl/RuleConditionServiceImpl.java
View File

@@ -68,22 +68,15 @@ public class RuleConditionServiceImpl extends ServiceImpl<RuleConditionInfoMappe
// }
@Override
public RuleConditionVo queryByVersionId(Long versionId) {
if (versionId == null) {
public RuleConditionVo queryByBlockId(Long blockId) {
if (blockId == null) {
return null;
}
//构造查询条件，查询条件列表
RuleConditionVo result = null;
List<RuleConditionInfo> ruleConditionInfoList = null;
if(Constants.switchFlag.ON.equals(cacheSwitch)){
String key = RedisUtils.getForeignKey(TableEnum.T_RULE_CONDITION, versionId);
ruleConditionInfoList = redisManager.getByForeignKey(key, RuleConditionInfo.class);
} else {
LambdaQueryWrapper<RuleConditionInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(RuleConditionInfo::getVersionId, versionId);
ruleConditionInfoList = ruleConditionInfoMapper.selectList(queryWrapper);
}
LambdaQueryWrapper<RuleConditionInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(RuleConditionInfo::getBlockId, blockId);
List<RuleConditionInfo> ruleConditionInfoList = this.list(queryWrapper);
//组装为需要的树形结构
if (ruleConditionInfoList != null) {
@@ -100,7 +93,7 @@ public class RuleConditionServiceImpl extends ServiceImpl<RuleConditionInfoMappe
*/
@Override
@Transactional
public RuleConditionVo insertRuleCondition(RuleConditionVo ruleConditionVo, Long ruleId) {
public RuleConditionVo insertRuleCondition(RuleConditionVo ruleConditionVo, Long ruleId, Long blockId) {
if (ruleConditionVo == null || ruleId == null) {
return null;
}
@@ -113,6 +106,7 @@ public class RuleConditionServiceImpl extends ServiceImpl<RuleConditionInfoMappe
List<RuleConditionInfo> list = this.disassemble(ruleConditionVo, ruleId, true);
for (RuleConditionInfo info : list) {
info.setVersionId(versionId);
info.setBlockId(blockId);
}
//找出唯一根节点
RuleConditionInfo root = null;
@@ -138,19 +132,13 @@ public class RuleConditionServiceImpl extends ServiceImpl<RuleConditionInfoMappe
*/
@Override
@Transactional
public RuleConditionVo updateRuleCondition(Long ruleId, RuleConditionVo ruleConditionVo) {
public RuleConditionVo updateRuleCondition(Long ruleId, Long blockId, RuleConditionVo ruleConditionVo) {
if (ruleId == null) {
return null;
}
//删除一个规则下的所有条件
boolean delete = this.deleteRuleCondition(ruleId,ruleConditionVo.getVersionId());
RuleConditionVo ruleCondition = null;
if (!delete) {
ruleCondition = this.queryByVersionId(ruleConditionVo.getVersionId());
}
//插入条件树
if ((delete || ruleCondition == null) && ruleConditionVo != null) {
RuleConditionVo insertResult = this.insertRuleCondition(ruleConditionVo, ruleId);
if (ruleConditionVo != null) {
RuleConditionVo insertResult = this.insertRuleCondition(ruleConditionVo, ruleId, blockId);
return insertResult;
}
return null;

16
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/guiderule/impl/RuleServiceImpl.java
View File

@@ -119,7 +119,6 @@ public class RuleServiceImpl extends ServiceImpl<RuleInfoMapper, RuleInfo> imple
return pageInfo;
}
@Override
@Transactional
public RuleVo insertRuleInfo(RuleVo vo) {
@@ -268,21 +267,6 @@ public class RuleServiceImpl extends ServiceImpl<RuleInfoMapper, RuleInfo> imple
//加入状态信息
vo.setType(RuleConst.TYPE_ORGAN);
vo.setStatus(RuleConst.STATUS_ENABLED);
//加入规则类型
if (vo == null || vo.getRuleAudit() == null) {
throw new ApiException(ErrorCodeEnum.PARAMS_EXCEPTION.getCode(), ErrorCodeEnum.PARAMS_EXCEPTION.getMessage());
}
switch (vo.getRuleAudit()) {
case RuleConst.RULE_AUDIT_TERMINATION:
vo.setRuleType(RuleConst.RULE_TYPE_TERMINATION);
break;
case RuleConst.RULE_AUDIT_SCORING:
vo.setRuleType(RuleConst.RULE_TYPE_SCORING);
break;
default:
vo.setRuleType(RuleConst.RULE_TYPE_TERMINATION);
}
return vo;
}

142
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/guiderule/impl/RuleVersionServiceImpl.java
View File

@@ -9,14 +9,17 @@ import com.fibo.ddp.common.dao.datax.datamanage.FieldMapper;
import com.fibo.ddp.common.dao.strategyx.guiderule.RuleVersionMapper;
import com.fibo.ddp.common.model.authx.system.SysUser;
import com.fibo.ddp.common.model.common.requestParam.StatusParam;
import com.fibo.ddp.common.model.strategyx.guiderule.RuleBlock;
import com.fibo.ddp.common.model.strategyx.guiderule.RuleConditionInfo;
import com.fibo.ddp.common.model.strategyx.guiderule.RuleVersion;
import com.fibo.ddp.common.model.strategyx.guiderule.vo.RuleBlockVo;
import com.fibo.ddp.common.model.strategyx.guiderule.vo.RuleConditionVo;
import com.fibo.ddp.common.model.strategyx.guiderule.vo.RuleVersionVo;
import com.fibo.ddp.common.model.strategyx.strategyout.StrategyOutput;
import com.fibo.ddp.common.service.common.SessionManager;
import com.fibo.ddp.common.service.redis.RedisManager;
import com.fibo.ddp.common.service.redis.RedisUtils;
import com.fibo.ddp.common.service.strategyx.guiderule.RuleBlockService;
import com.fibo.ddp.common.service.strategyx.guiderule.RuleConditionService;
import com.fibo.ddp.common.service.strategyx.guiderule.RuleVersionService;
import com.fibo.ddp.common.service.strategyx.strategyout.StrategyOutputService;
@@ -43,6 +46,8 @@ public class RuleVersionServiceImpl extends ServiceImpl<RuleVersionMapper, RuleV
@Autowired
private RuleVersionMapper versionMapper;
@Autowired
private RuleBlockService ruleBlockService;
@Autowired
private RuleConditionService conditionService;
@Autowired
private StrategyOutputService outputService;
@@ -88,13 +93,23 @@ public class RuleVersionServiceImpl extends ServiceImpl<RuleVersionMapper, RuleV
return result;
}
BeanUtils.copyProperties(ruleVersion, result);
//查询ruleCondition组装成树形结构
RuleConditionVo ruleConditionVo = conditionService.queryByVersionId(id);
List<StrategyOutput> strategyOutputList = outputService.queryByTactics(new StrategyOutput(id, StrategyType.COMPLEX_RULE, StrategyType.OutType.SUCCESS_OUT));
List<StrategyOutput> failOutputList = outputService.queryByTactics(new StrategyOutput(id, StrategyType.COMPLEX_RULE, StrategyType.OutType.FAIL_OUT));
result.setRuleConditionVo(ruleConditionVo);
result.setStrategyOutputList(strategyOutputList);
result.setFailOutputList(failOutputList);
List<RuleBlock> ruleBlockList = ruleBlockService.listObjectsByVersionId(id);
List<RuleBlockVo> ruleBlockVoList = new ArrayList<>();
for(RuleBlock ruleBlock : ruleBlockList){
RuleBlockVo ruleBlockVo = new RuleBlockVo();
BeanUtils.copyProperties(ruleBlock, ruleBlockVo);
//查询ruleCondition组装成树形结构
RuleConditionVo ruleConditionVo = conditionService.queryByBlockId(ruleBlock.getId());
List<StrategyOutput> strategyOutputList = outputService.queryByTactics(new StrategyOutput(ruleBlock.getId(), StrategyType.COMPLEX_RULE, StrategyType.OutType.SUCCESS_OUT));
List<StrategyOutput> failOutputList = outputService.queryByTactics(new StrategyOutput(ruleBlock.getId(), StrategyType.COMPLEX_RULE, StrategyType.OutType.FAIL_OUT));
ruleBlockVo.setRuleConditionVo(ruleConditionVo);
ruleBlockVo.setStrategyOutputList(strategyOutputList);
ruleBlockVo.setFailOutputList(failOutputList);
ruleBlockVoList.add(ruleBlockVo);
}
result.setRuleBlockVoList(ruleBlockVoList);
return result;
}
@@ -132,31 +147,33 @@ public class RuleVersionServiceImpl extends ServiceImpl<RuleVersionMapper, RuleV
@Override
public List<String> queryFieldEnByVersionId(Long versionId) {
Set<String> fieldEns= new HashSet<>();
Set<Long> fieldIds= new HashSet<>();
RuleConditionVo ruleConditionVo = conditionService.queryByVersionId(versionId);
List<RuleConditionInfo> ruleConditionInfoList = conditionService.disassemble(ruleConditionVo, versionId, false);
for (RuleConditionInfo info : ruleConditionInfoList) {
if (info.getFieldEn()!=null&&info.getFieldType()!=1&&!info.getFieldEn().startsWith("%")){
if (info.getFieldEn().contains(".")){
fieldEns.add(info.getFieldEn().split("\\.")[0]);
Set<String> fieldEns = new HashSet<>();
Set<Long> fieldIds = new HashSet<>();
List<RuleBlock> ruleBlockList = ruleBlockService.listObjectsByVersionId(versionId);
for (RuleBlock ruleBlock : ruleBlockList) {
RuleConditionVo ruleConditionVo = conditionService.queryByBlockId(ruleBlock.getId());
List<RuleConditionInfo> ruleConditionInfoList = conditionService.disassemble(ruleConditionVo, ruleBlock.getRuleId(), false);
for (RuleConditionInfo info : ruleConditionInfoList) {
if (info.getFieldEn() != null && info.getFieldType() != 1 && !info.getFieldEn().startsWith("%")) {
if (info.getFieldEn().contains(".")) {
fieldEns.add(info.getFieldEn().split("\\.")[0]);
} else {
fieldEns.add(info.getFieldEn());
}
} else if (info.getFieldId() != null) {
fieldIds.add(info.getFieldId());
}
else {
fieldEns.add(info.getFieldEn());
}
}else if(info.getFieldId()!=null){
fieldIds.add(info.getFieldId());
}
if (info.getVariableType()!=null){
if (info.getVariableType()==2&&info.getFieldValue()!=null&&!info.getFieldValue().contains("%")){
fieldEns.add(info.getFieldValue());
}else if (info.getVariableType()==3){
fieldEns.addAll(CustomValueUtils.getFieldEnSet(info.getFieldValue()));
if (info.getVariableType() != null) {
if (info.getVariableType() == 2 && info.getFieldValue() != null && !info.getFieldValue().contains("%")) {
fieldEns.add(info.getFieldValue());
} else if (info.getVariableType() == 3) {
fieldEns.addAll(CustomValueUtils.getFieldEnSet(info.getFieldValue()));
}
}
}
}
for (Long fieldId : fieldIds) {
String fieldName= fieldMapper.findFieldNameById(fieldId);
String fieldName = fieldMapper.findFieldNameById(fieldId);
fieldEns.add(fieldName);
}
return new ArrayList<>(fieldEns);
@@ -201,21 +218,33 @@ public class RuleVersionServiceImpl extends ServiceImpl<RuleVersionMapper, RuleV
}
return false;
}
@Transactional
public boolean addVersionDetail(RuleVersionVo version){
RuleConditionVo ruleConditionVo = version.getRuleConditionVo();
ruleConditionVo.setVersionId(version.getId());
//添加条件信息
conditionService.insertRuleCondition(ruleConditionVo,version.getRuleId());
//添加输出字段
List<StrategyOutput> strategyOutputList = version.getStrategyOutputList();
if (strategyOutputList !=null&& strategyOutputList.size()>0){
outputService.insertTacticsOutput(version.getId(), strategyOutputList);
}
List<StrategyOutput> failOutputList = version.getFailOutputList();
if (failOutputList!=null&&failOutputList.size()>0){
outputService.insertTacticsOutput(version.getId(),failOutputList );
List<RuleBlockVo> ruleBlockVoList = version.getRuleBlockVoList();
for (RuleBlockVo ruleBlockVo : ruleBlockVoList){
RuleBlock ruleBlock = new RuleBlock();
BeanUtils.copyProperties(ruleBlockVo, ruleBlock);
ruleBlock.setRuleId(version.getRuleId());
ruleBlock.setVersionId(version.getId());
ruleBlockService.save(ruleBlock);
RuleConditionVo ruleConditionVo = ruleBlockVo.getRuleConditionVo();
ruleConditionVo.setVersionId(version.getId());
ruleConditionVo.setBlockId(ruleBlock.getId());
//添加条件信息
conditionService.insertRuleCondition(ruleConditionVo,version.getRuleId(), ruleBlock.getId());
//添加输出字段
List<StrategyOutput> strategyOutputList = ruleBlockVo.getStrategyOutputList();
if (strategyOutputList !=null&& strategyOutputList.size()>0){
outputService.insertTacticsOutput(ruleBlock.getId(), strategyOutputList);
}
List<StrategyOutput> failOutputList = ruleBlockVo.getFailOutputList();
if (failOutputList!=null&&failOutputList.size()>0){
outputService.insertTacticsOutput(ruleBlock.getId(),failOutputList );
}
}
return true;
}
@@ -232,23 +261,46 @@ public class RuleVersionServiceImpl extends ServiceImpl<RuleVersionMapper, RuleV
@Override
@Transactional
public boolean updateVersion(RuleVersionVo version) {
Long ruleId = version.getRuleId();
Long versionId = version.getId();
if (versionId==null){
return false;
}
SysUser loginSysUser = SessionManager.getLoginAccount();
version.setUpdateUserId(loginSysUser.getUserId());
//修改版本主表
// 1. 修改版本主表
versionMapper.updateById(version);
//修改条件表
conditionService.updateRuleCondition(version.getRuleId(),version.getRuleConditionVo());
//修改策略输出
outputService.updateTacticsOutput(versionId,version.getStrategyOutputList(),version.getFailOutputList(), StrategyType.COMPLEX_RULE);
// 2. 删除原版本下所有子表数据
// 删除所有规则块
ruleBlockService.removeObjects(ruleId, versionId);
// 删除所有条件
conditionService.deleteRuleCondition(ruleId, versionId);
// 删除所有策略输出（需找出原来的所有块，然后逐一删除）
List<RuleBlock> oldRuleBlockList = ruleBlockService.listObjectsByVersionId(versionId);
for(RuleBlock ruleBlock : oldRuleBlockList){
StrategyOutput strategyOutput = new StrategyOutput(ruleBlock.getId(), StrategyType.COMPLEX_RULE);
outputService.deleteByTactics(strategyOutput);
}
// 3. 插入新版本下子表数据
List<RuleBlockVo> ruleBlockVoList = version.getRuleBlockVoList();
for(RuleBlockVo ruleBlockVo : ruleBlockVoList){
// 修改规则块配置表
ruleBlockVo.setRuleId(ruleId);
ruleBlockVo.setVersionId(versionId);
ruleBlockService.save(ruleBlockVo);
Long blockId = ruleBlockVo.getId();
//修改条件表
conditionService.updateRuleCondition(ruleId, blockId, ruleBlockVo.getRuleConditionVo());
//修改策略输出
outputService.updateTacticsOutput(blockId,ruleBlockVo.getStrategyOutputList(),ruleBlockVo.getFailOutputList(), StrategyType.COMPLEX_RULE);
}
this.saveSnapshot(versionId);
return true;
}
@Override
@Transactional
public boolean updateStatus(StatusParam statusParam) {

5
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/strategyout/impl/StrategyOutputServiceImpl.java
View File

@@ -107,11 +107,6 @@ public class StrategyOutputServiceImpl extends ServiceImpl<StrategyOutputMapper,
@Transactional
@Override
public boolean updateTacticsOutput(Long tacticsId, List<StrategyOutput> successList, List<StrategyOutput> failList, String tacticsType) {
StrategyOutput strategyOutput = new StrategyOutput(tacticsId, tacticsType);
boolean delete = this.deleteByTactics(strategyOutput);
if (!delete && this.queryByTactics(strategyOutput).size() != 0) {
return false;
}
if (successList != null && !successList.isEmpty()) {
this.insertTacticsOutput(tacticsId, successList, StrategyType.OutType.SUCCESS_OUT);
}