开始 > 分组 > 聚合 > 决策选项 聚合之后节点不会执行问题bugfix

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

@@ -30,11 +30,13 @@ public class DecisionTablesResult implements Serializable {
 
     private Long versionId;//决策表版本id
 
-    //  TODO 注意  添加决策表 时  实际对应的字段是 ro 和   colum ,待确认 ！！！
-    @TableField(value = "rowss")
+    //   注意  添加决策表 时  实际对应的字段是 ro 和   colum ,待确认 ！！！
+
+    // 先注释 ， 数据库表加字段 解决 
+    // @TableField(value = "rowss")
     private Integer ro;//行数
 
-    @TableField(value = "columnss")
+    // @TableField(value = "columnss")
     private Integer colum;//列数
 
     private String resultValue;//结果集二维数组

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

@@ -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);
                 }
             }

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

@@ -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);

sql/update.sql

@@ -1,4 +1,30 @@
 
+
+
+
+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 '列数';