From f9f00ea4bde7cff5798d03fbc06913b7d854d158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E9=80=9A?= <lewis.liu@farben.com.cn>
Date: Tue, 11 Feb 2025 16:11:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E5=AD=A6=E4=B9=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PMMLExecutor/impl/PMMLExecutorRFImpl.java        | 12 +++++++++---
 .../strategyx/listlibrary/impl/ListDbServiceImp.java |  2 +-
 ddp/pom.xml                                          |  9 +++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/aimodel/PMMLExecutor/impl/PMMLExecutorRFImpl.java b/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/aimodel/PMMLExecutor/impl/PMMLExecutorRFImpl.java
index f027731..b237b4d 100644
--- a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/aimodel/PMMLExecutor/impl/PMMLExecutorRFImpl.java
+++ b/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/aimodel/PMMLExecutor/impl/PMMLExecutorRFImpl.java
@@ -24,6 +24,7 @@ public class PMMLExecutorRFImpl implements PMMLExecutor {
     @Override
     public Evaluator loadPmml(String filePath) {
 //        String filePath = "D:\\models\\model_RF.pmml";
+        Evaluator modelEvaluator = null;
         PMML pmml = new PMML();
         InputStream inputStream = null;
 
@@ -52,10 +53,15 @@ public class PMMLExecutorRFImpl implements PMMLExecutor {
             }
         }
 
+        /*ModelEvaluatorFactory modelEvaluatorFactory = ModelEvaluatorFactory.newInstance();
+        Evaluator evaluator = modelEvaluatorFactory.newModelEvaluator(pmml,pmml.getModels().get(0));
+        pmml = null;*/
+        ModelEvaluatorBuilder modelEvaluatorBuilder = new ModelEvaluatorBuilder(pmml);
         ModelEvaluatorFactory modelEvaluatorFactory = ModelEvaluatorFactory.newInstance();
-        Evaluator evaluator = modelEvaluatorFactory.newModelEvaluator(pmml);
-        pmml = null;
-        return evaluator;
+        modelEvaluatorBuilder.setModelEvaluatorFactory(modelEvaluatorFactory);
+        modelEvaluator = modelEvaluatorBuilder.build();
+        modelEvaluator.verify();
+        return modelEvaluator;
     }
 
     @Override
diff --git a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/listlibrary/impl/ListDbServiceImp.java b/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/listlibrary/impl/ListDbServiceImp.java
index f829a96..2e66e9d 100644
--- a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/listlibrary/impl/ListDbServiceImp.java
+++ b/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/listlibrary/impl/ListDbServiceImp.java
@@ -231,7 +231,7 @@ public class ListDbServiceImp extends ServiceImpl<ListDbMapper, ListDb> implemen
 		ListDb listDb = listDbMapper.selectById(id);
 		String tableName = "organ" + "_" + listDb.getOrganId() + "_" + listDb.getListType() + "_" + id;
 		// 插入多行数据 insertOne into  user_info (user_account,user_name,user_age,user_class) values ('00001', '张三 ','20','计算机系'), ('00002', '李四','19','计算机系');
-		String sqlStr = "insertOne into " + tableName + "(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, user_id) values ";
+		String sqlStr = "insert into " + tableName + "(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, user_id) values ";
 
 		// 只取第一个Sheet页
 		sheet = workbook.getSheetAt(0);
diff --git a/ddp/pom.xml b/ddp/pom.xml
index 7e59203..7af3eb6 100644
--- a/ddp/pom.xml
+++ b/ddp/pom.xml
@@ -247,13 +247,18 @@
         <dependency>
             <groupId>org.jpmml</groupId>
             <artifactId>pmml-evaluator</artifactId>
-            <version>1.4.1</version>
+            <version>1.5.11</version>
         </dependency>
         <dependency>
             <groupId>org.jpmml</groupId>
             <artifactId>pmml-evaluator-extension</artifactId>
-            <version>1.4.1</version>
+            <version>1.5.11</version>
         </dependency>
+        <!--<dependency>
+            <groupId>org.jpmml</groupId>
+            <artifactId>pmml-model</artifactId>
+            <version>1.7.1</version>
+        </dependency>-->
 
         <!-- swagger -->
         <dependency>