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

衍生指标优化及bugfix

Browse Source
This commit is contained in:
杜刚
2025-02-14 15:08:43 +08:00
parent 2d4ddc2857
commit 5b41070529
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/datax/runner/impl/CommonServiceImpl.java
View File

@@ -75,14 +75,22 @@ public class CommonServiceImpl implements CommonService {
} }
SessionData sessionData = RunnerSessionManager.getSession(); SessionData sessionData = RunnerSessionManager.getSession();
Long organId = sessionData.getOrganId(); Long organId = sessionData.getOrganId();
List<Field> fieldList = fieldService.findFieldByIdsbyorganId(organId, ids); List<Field> fieldList = fieldService.findFieldByIdsbyorganId(organId, ids);
List<Field> list = new ArrayList<>(); List<Field> list = new ArrayList<>();
ids = new ArrayList<>(); ids = new ArrayList<>();
for (int i = 0; i < fieldList.size(); i++) { for (int i = 0; i < fieldList.size(); i++) {
if (fieldList.get(i).getIsDerivative() == 1) { if (fieldList.get(i).getIsDerivative() == 1) {
ids.addAll(StringUtil.toLongList(fieldList.get(i).getOrigFieldId())); ids.addAll(StringUtil.toLongList(fieldList.get(i).getOrigFieldId()));
} else }
list.add(fieldList.get(i));
// 20250214 bugfix ， 这个不能放在 else分支里 ！！！
// 否则后面取不到值 ！！！！！！
list.add(fieldList.get(i));
} }
if (ids.size() > 0) { if (ids.size() > 0) {
List<Field> lists = fieldService.findFieldByIdsbyorganId(organId, ids); List<Field> lists = fieldService.findFieldByIdsbyorganId(organId, ids);

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

@@ -98,7 +98,7 @@ public class RiskEngineBusinessImpl implements RiskEngineBusiness {
logger.info("请求参数，paramJson: {}", JSONObject.toJSONString(paramJson)); logger.info("请求参数，paramJson: {}", JSONObject.toJSONString(paramJson));
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
JSONArray resultJson = new JSONArray(); JSONArray resultJson = new JSONArray();
Map<String, Map<String, Object>> featureMaps = new ConcurrentHashMap<>(); // Map<String, Map<String, Object>> featureMaps = new ConcurrentHashMap<>();
Long organId = Long.valueOf(paramJson.get("organId").toString()); Long organId = Long.valueOf(paramJson.get("organId").toString());
Long engineId = Long.valueOf(paramJson.get("engineId").toString()); Long engineId = Long.valueOf(paramJson.get("engineId").toString());
//获取引擎信息 //获取引擎信息
@@ -124,13 +124,18 @@ public class RiskEngineBusinessImpl implements RiskEngineBusiness {
//返回输出结果 //返回输出结果
Map<String, Object> outMap = new ConcurrentHashMap<>(); Map<String, Object> outMap = new ConcurrentHashMap<>();
// 记录执行前全量指标 // 记录执行前全量指标
featureMaps.put("before", inputParam); // featureMaps.put("before", inputParam);
logger.info("recursionEngineNode_before_inputParam="+inputParam);
//节点执行方法 //节点执行方法
recursionEngineNode(inputParam, engineNodeMap.get(engineNode.getNextNodes()), engineNodeMap, outMap); recursionEngineNode(inputParam, engineNodeMap.get(engineNode.getNextNodes()), engineNodeMap, outMap);
logger.info("recursionEngineNode_after_inputParam="+inputParam);
jsonObject.put("status", "0x0000"); jsonObject.put("status", "0x0000");
jsonObject.put("msg", "执行成功"); jsonObject.put("msg", "执行成功");
//记录执行后的全量指标 //记录执行后的全量指标
featureMaps.put("after", inputParam); // featureMaps.put("after", inputParam);
paramJson.put("versionId", engineNode.getVersionId()); paramJson.put("versionId", engineNode.getVersionId());
// featureRecordService.recordAllFeature(featureMaps, engine, paramJson); // featureRecordService.recordAllFeature(featureMaps, engine, paramJson);