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

59
ddp/ddp-common/ddp-model/src/main/java/com/fibo/ddp/common/model/strategyx/guiderule/RuleBlock.java Normal file
View File

@@ -0,0 +1,59 @@
package com.fibo.ddp.common.model.strategyx.guiderule;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.io.Serializable;
/**
* 规则块配置表(RuleBlock)实体类
*
* @author andy.wang
* @since 2022-08-05 10:32:12
*/
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = false)
@TableName("t_rule_block")
public class RuleBlock implements Serializable {
private static final long serialVersionUID = 153524790651348062L;
@TableId(type = IdType.AUTO)
/**
* 主键：规则块id
*/
private Long id;
/**
* 规则id
*/
private Long ruleId;
/**
* 规则版本的id
*/
private Long versionId;
/**
* 存放执行结果的变量
*/
private String resultFieldEn;
/**
* 规则分数
*/
private Integer score;
/**
* 存放得分的变量
*/
private String scoreFieldEn;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改时间
*/
private Date updateTime;
}

2
ddp/ddp-common/ddp-model/src/main/java/com/fibo/ddp/common/model/strategyx/guiderule/RuleConditionInfo.java
View File

@@ -49,6 +49,8 @@ public class RuleConditionInfo
private Long versionId;//规则版本的id
private Long blockId;//规则块的id
private Long parentId;//父节点的id
private Integer conditionType;//规则节点的类型：1-关系节点，2-表达式节点

17
ddp/ddp-common/ddp-model/src/main/java/com/fibo/ddp/common/model/strategyx/guiderule/RuleInfo.java
View File

@@ -43,35 +43,18 @@ public class RuleInfo implements Serializable {
private Long organId;//组织id
private Integer engineId;
private Integer status;//状态 0 :停用 ，1 : 启用，-1：删除
private Integer type;//规则类型 0 : 系统的规则 1：组织的规则 2： 引擎的规则
private Integer isNon;//逻辑关系“非”，0：否 ，1：是
private String content;//规则具体内容
private Date created;
private Date updated;
private Integer ruleType;//0硬性拒绝规则1加减分规则
private Integer ruleAudit;
private Integer score;//得分
private String lastLogical;//逻辑关系符
private Integer difficulty;//规则难度：1-简单规则，2复杂规则
private String scriptType;//脚本类型python，js，groovy
private String resultFieldEn;//存放是否命中的字段
private String scoreFieldEn;//存放得分的字段en
@TableField(exist = false)
private String authorName;//创建人名称，需要去其他表查询
@TableField(exist = false)

12
ddp/ddp-common/ddp-model/src/main/java/com/fibo/ddp/common/model/strategyx/guiderule/RuleVersion.java
View File

@@ -37,18 +37,6 @@ public class RuleVersion implements Serializable {
* 状态：-1 删除 0停用 1启用
*/
private Integer status;
/**
* 规则结果en(命中情况)
*/
private String resultFieldEn;
/**
* 规则得分
*/
private Integer score;
/**
* 规则得分的en
*/
private String scoreFieldEn;
/**
* 组织id
*/

23
ddp/ddp-common/ddp-model/src/main/java/com/fibo/ddp/common/model/strategyx/guiderule/vo/RuleBlockVo.java Normal file
View File

@@ -0,0 +1,23 @@
package com.fibo.ddp.common.model.strategyx.guiderule.vo;
import com.fibo.ddp.common.model.strategyx.guiderule.RuleBlock;
import com.fibo.ddp.common.model.strategyx.strategyout.StrategyOutput;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.List;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Accessors
public class RuleBlockVo extends RuleBlock {
private RuleConditionVo ruleConditionVo;//规则对应的结点树
private List<StrategyOutput> strategyOutputList;//输出字段
private List<StrategyOutput> failOutputList;//失败输出字段
}

10
ddp/ddp-common/ddp-model/src/main/java/com/fibo/ddp/common/model/strategyx/guiderule/vo/RuleVersionVo.java
View File

@@ -12,9 +12,11 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
public class RuleVersionVo extends RuleVersion {
private RuleConditionVo ruleConditionVo;//规则对应的结点树
// private RuleConditionVo ruleConditionVo;//规则对应的结点树
//
// private List<StrategyOutput> strategyOutputList;//输出字段
//
// private List<StrategyOutput> failOutputList;//失败输出字段
private List<StrategyOutput> strategyOutputList;//输出字段
private List<StrategyOutput> failOutputList;//失败输出字段
private List<RuleBlockVo> ruleBlockVoList;
}

7
ddp/ddp-common/ddp-model/src/main/java/com/fibo/ddp/common/model/strategyx/guiderule/vo/RuleVo.java
View File

@@ -2,7 +2,6 @@ package com.fibo.ddp.common.model.strategyx.guiderule.vo;
import com.fibo.ddp.common.model.strategyx.guiderule.RuleInfo;
import com.fibo.ddp.common.model.strategyx.scriptrule.RuleScriptVersion;
import com.fibo.ddp.common.model.strategyx.strategyout.StrategyOutput;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -16,9 +15,9 @@ import java.util.List;
@Accessors
public class RuleVo extends RuleInfo {
private RuleConditionVo ruleConditionVo;//规则对应的结点树
private List<StrategyOutput> strategyOutputList;//输出字段
// private RuleConditionVo ruleConditionVo;//规则对应的结点树
//
// private List<StrategyOutput> strategyOutputList;//输出字段
private List<RuleVersionVo> ruleVersionList;//规则版本列表
// private List<T> ruleVersionList;//规则版本列表