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

Compare commits

base: liutongsz:c35000738c2a3d52f78e9d0429ebb1bd21bc8b93
Branches Tags
liutongsz:feature/初版/base liutongsz:fibo-rule-h5
...
compare: liutongsz:feature/初版/base
Branches Tags
liutongsz:feature/初版/base liutongsz:fibo-rule-h5

10 Commits
c35000738c ... feature/初版

Author SHA1 Message Date
杜刚
9baf7220b9 开始 > 分组 > 聚合 > 决策选项 聚合之后节点不会执行问题bugfix 2025-04-27 14:16:18 +08:00
杜刚
9ba4c9a98d 决策引擎接口 决策流监控数据写入 2025-03-25 14:29:14 +08:00
杜刚
90f055b7eb 表结构增量更新sql整理 2025-03-04 16:29:17 +08:00
杜刚
b629bcb059 新增决策表问题 待确认问题处理 ，不改字段映射 ，新增字段 2025-03-04 16:24:18 +08:00
杜刚
4646cd6424 新增决策表 待确认问题 2025-03-04 16:11:23 +08:00
杜刚
f1f84fc4b2 新增决策表bugfix 2025-03-04 16:11:07 +08:00
shizy
86f41c849f 修复决策新增因为实体类字段与数据库字段名称映射失败导致的报错 2025-02-19 15:51:52 +08:00
shizy
7eaa7de140 修复数字决策平台-引擎管理-引擎列表 点击引擎名称跳转因地址错误出现的403报错 2025-02-18 15:43:46 +08:00
刘通
afcf60ef4b Merge remote-tracking branch 'origin/feature/初版/base' into feature/初版/base 2025-02-18 15:03:36 +08:00
刘通
7cf69bb30c 左侧文件夹之前注释，现在放开 2025-02-18 15:03:24 +08:00
8 changed files with 68 additions and 9 deletions
Expand all files Collapse all files

8
bugs/note.txt
View File

@@ -15,3 +15,11 @@ ALTER TABLE t_machine_learning_models MODIFY COLUMN model_field varchar(4096) NO
优化点：
数据中心 / 接口源 / 接口新建 修改 查看 请求地址 输入框加长
com.fibo.ddp.common.model.strategyx.decisiontable.DecisionTablesResult
TODO 注意 添加决策表 时 实际对应的字段是 ro 和 colum ,待确认 ！！！

6
ddp/ddp-common/ddp-model/src/main/java/com/fibo/ddp/common/model/strategyx/decisiontable/DecisionTablesResult.java
View File

@@ -1,6 +1,7 @@
package com.fibo.ddp.common.model.strategyx.decisiontable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
@@ -29,8 +30,13 @@ public class DecisionTablesResult implements Serializable {
private Long versionId;//决策表版本id
// 注意 添加决策表 时 实际对应的字段是 ro 和 colum ,待确认 ！！！
// 先注释 ， 数据库表加字段 解决
// @TableField(value = "rowss")
private Integer ro;//行数
// @TableField(value = "columnss")
private Integer colum;//列数
private String resultValue;//结果集二维数组

20
ddp/ddp-enginex/risk-engine/src/main/java/com/fibo/ddp/enginex/riskengine/runner/business/impl/RiskEngineBusinessImpl.java
View File

@@ -223,7 +223,12 @@ public class RiskEngineBusinessImpl implements RiskEngineBusiness {
resultSet.setOutput(JSONObject.toJSONString(tmpJsonObject));
resultSetMapper.insertResultSet(resultSet);
Integer resultId = resultSet.getId();
// this.monitorDecisionFlow(inputParam, engine, engineVersion, engineNodeList, outMap, paramJson, resultId);
// 20250325 去掉注释 ，写入监控表
try {
this.monitorDecisionFlow(inputParam, engine, engineVersion, engineNodeList, outMap, paramJson, resultId);
}catch(Exception e){
logger.error("monitorDecisionFlow_error", e);
}
// 正常返回结果回调
decisionCallback(engine.getCallbackUrl(), paramJson, result);
}
@@ -318,11 +323,16 @@ public class RiskEngineBusinessImpl implements RiskEngineBusiness {
nextEngineNode = engineNodeMap.get(outMap.get("nextNode"));
outMap.remove("nextNode");
}
if (nextEngineNode != null && nextEngineNode.getNodeType() == NodeTypeEnum.AGGREGATION.getValue()) {
// 会导致 开始 > 分组 > 聚合 > 决策选项 不会执行 ，先注释掉 20250427
// if (nextEngineNode != null && nextEngineNode.getNodeType() == NodeTypeEnum.AGGREGATION.getValue()) {
// 并行节点后面的分支为多线程执行，执行到聚合节点则结束
resultNode = nextEngineNode;
} else {
//resultNode = nextEngineNode;
//} else {
// resultNode = recursionEngineNode(inputParam, nextEngineNode, engineNodeMap, outMap);
//}
// 20250427 之前的逻辑 会导致 开始 > 分组 > 聚合 > 决策选项 不会执行 ， 使用以下代码
if (nextEngineNode != null){
resultNode = recursionEngineNode(inputParam, nextEngineNode, engineNodeMap, outMap);
}
}

4
ddp/ddp-monitor/src/main/java/com/fibo/ddp/monitor/controller/decisionflow/MonitorController.java
View File

@@ -47,7 +47,9 @@ public class MonitorController {
Integer pageNo = param.get("pageNo") == null ? 1 : Integer.valueOf(param.get("pageNo").toString());
Integer pageSize = param.get("pageSize") == null ? 10 : Integer.valueOf(param.get("pageSize").toString());
PageHelper.startPage(pageNo, pageSize);
List<EngineResultSet> resultSets = MonitorCenterFactory.getMonitorCenterServiceImp(MonitorStorageType.HBase).getEngineResultSetBySegment(param);
// MonitorStorageType.HBase
// 20250325 MonitorStorageType.Mysql
List<EngineResultSet> resultSets = MonitorCenterFactory.getMonitorCenterServiceImp(MonitorStorageType.Mysql).getEngineResultSetBySegment(param);
PageInfo<EngineResultSet> pageInfo = new PageInfo<>(resultSets);
HashMap<String, Object> modelMap = new HashMap<>();
modelMap.put("pager", pageInfo);

4
h5-datax-manager/src/components/common/cont.vue
View File

@@ -2,7 +2,7 @@
<template>
<div class="cont_cont">
<!-- <div class="cont_left" v-loading="leftloading">
<div class="cont_left" v-loading="leftloading">
<div class="cont_header">
<p class="cont_header_title">{{title}}</p>
<p class="cont_header_subtitle">{{title}}</p>
@@ -14,7 +14,7 @@
@updatafilelist="updatafilelist" @delectFun="delectFun">
</fileHome>
</div>
</div> -->
</div>
<div
class="cont_right"
v-loading="contloading"

2
h5-enginex-manager/src/components/page/EngineListV2.vue
View File

@@ -214,7 +214,7 @@
// 表格中点击
engineDisplay: function(id) {
//alert(id);
let h5Path = '';
let h5Path = '/enginex';
window.localStorage.setItem("engineId", id);
bus.$emit('EngineSwitchover',id)

2
sql/ddp-2.0.sql
View File

@@ -481,6 +481,8 @@ CREATE TABLE `t_decision_tables_result` (
`version_id` int(11) NOT NULL DEFAULT '0' COMMENT '决策表版本id',
`rows` int(11) DEFAULT NULL COMMENT '行数',
`columns` int(11) DEFAULT NULL COMMENT '列数',
`ro` int(11) DEFAULT NULL COMMENT '行数new',
`colum` int(11) DEFAULT NULL COMMENT '列数new',
`result_value` longtext COMMENT '结果集二维数组',
`create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',

31
sql/update.sql Normal file
View File

@@ -0,0 +1,31 @@
create table t_list_db_version(
id int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
list_db_id int(11) NOT NULL,
version_code varchar(255) DEFAULT NULL,
description varchar(4096) DEFAULT NULL,
result_field_en varchar(255) DEFAULT NULL,
status int(4) DEFAULT NULL,
table_column varchar(1024) DEFAULT NULL,
match_type int(4) DEFAULT NULL,
query_type int(4) DEFAULT NULL,
query_field varchar(255) DEFAULT NULL ,
organ_id int(11) NOT NULL DEFAULT '0' COMMENT '组织id',
create_user_id int(11) NOT NULL DEFAULT '0' COMMENT '创建者id',
update_user_id int(11) NOT NULL DEFAULT '0' COMMENT '修改者id',
create_time datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建日期',
update_time datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改日期',
snapshot json DEFAULT NULL COMMENT '名单库版本配置快照',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
ALTER TABLE t_machine_learning_models MODIFY COLUMN model_field varchar(4096) NOT NULL DEFAULT '' COMMENT '模型解析字段';
ALTER TABLE t_decision_tables_result ADD COLUMN `ro` int DEFAULT NULL COMMENT '行数';
ALTER TABLE t_decision_tables_result ADD COLUMN `colum` int DEFAULT NULL COMMENT '列数';