From 5b41070529be08f658fb573c53d1f188324c8f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=88=9A?= <53732908@qq.com> Date: Fri, 14 Feb 2025 15:08:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8D=E7=94=9F=E6=8C=87=E6=A0=87=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8F=8Abugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/datax/runner/impl/CommonServiceImpl.java | 12 ++++++++++-- .../runner/business/impl/RiskEngineBusinessImpl.java | 11 ++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/datax/runner/impl/CommonServiceImpl.java b/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/datax/runner/impl/CommonServiceImpl.java index 9531212..2f09dbf 100644 --- a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/datax/runner/impl/CommonServiceImpl.java +++ b/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/datax/runner/impl/CommonServiceImpl.java @@ -75,14 +75,22 @@ public class CommonServiceImpl implements CommonService { } SessionData sessionData = RunnerSessionManager.getSession(); Long organId = sessionData.getOrganId(); + List fieldList = fieldService.findFieldByIdsbyorganId(organId, ids); + List list = new ArrayList<>(); + ids = new ArrayList<>(); + for (int i = 0; i < fieldList.size(); i++) { if (fieldList.get(i).getIsDerivative() == 1) { 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) { List lists = fieldService.findFieldByIdsbyorganId(organId, ids); diff --git a/ddp/ddp-enginex/risk-engine/src/main/java/com/fibo/ddp/enginex/riskengine/runner/business/impl/RiskEngineBusinessImpl.java b/ddp/ddp-enginex/risk-engine/src/main/java/com/fibo/ddp/enginex/riskengine/runner/business/impl/RiskEngineBusinessImpl.java index ee89727..80f0966 100644 --- a/ddp/ddp-enginex/risk-engine/src/main/java/com/fibo/ddp/enginex/riskengine/runner/business/impl/RiskEngineBusinessImpl.java +++ b/ddp/ddp-enginex/risk-engine/src/main/java/com/fibo/ddp/enginex/riskengine/runner/business/impl/RiskEngineBusinessImpl.java @@ -98,7 +98,7 @@ public class RiskEngineBusinessImpl implements RiskEngineBusiness { logger.info("请求参数,paramJson: {}", JSONObject.toJSONString(paramJson)); JSONObject jsonObject = new JSONObject(); JSONArray resultJson = new JSONArray(); - Map> featureMaps = new ConcurrentHashMap<>(); + // Map> featureMaps = new ConcurrentHashMap<>(); Long organId = Long.valueOf(paramJson.get("organId").toString()); Long engineId = Long.valueOf(paramJson.get("engineId").toString()); //获取引擎信息 @@ -124,13 +124,18 @@ public class RiskEngineBusinessImpl implements RiskEngineBusiness { //返回输出结果 Map 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); + + logger.info("recursionEngineNode_after_inputParam="+inputParam); + jsonObject.put("status", "0x0000"); jsonObject.put("msg", "执行成功"); //记录执行后的全量指标 - featureMaps.put("after", inputParam); + // featureMaps.put("after", inputParam); paramJson.put("versionId", engineNode.getVersionId()); // featureRecordService.recordAllFeature(featureMaps, engine, paramJson);