From d79c5f396b23520e6370e9d9b6abc31938a0e83f Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 18:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java
index 69f6930..7b19755 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java
@@ -38,6 +38,7 @@
import java.util.*;
import java.util.stream.Collectors;
+import static com.iailab.framework.common.exception.enums.GlobalErrorCodeConstants.NOT_GENERAT;
import static com.iailab.framework.common.pojo.CommonResult.error;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -72,11 +73,13 @@
try {
File jarFile = new File(mpkTenantBakFilePath + File.separator + MdkConstant.JAR + File.separator + dto.getPyName() + ".jar");
if (!jarFile.exists()) {
- throw new RuntimeException("jar包不存在，请先生成代码。jarPath:" + jarFile.getAbsolutePath());
+ log.error("jar包不存在，请先生成代码。jarPath:" + jarFile.getAbsolutePath());
+ return CommonResult.error(NOT_GENERAT.getCode(),NOT_GENERAT.getMsg());
}
File dllFile = new File(mpkTenantBakFilePath + File.separator + MdkConstant.DLL + File.separator + dto.getPyName() + ".dll");
if (!dllFile.exists()) {
- throw new RuntimeException("dll文件不存在，请先生成代码。dllPath:" + dllFile.getAbsolutePath());
+ log.error("dll文件不存在，请先生成代码。dllPath:" + dllFile.getAbsolutePath());
+ return CommonResult.error(NOT_GENERAT.getCode(),NOT_GENERAT.getMsg());
}
// 加载jar包
classLoader = DllUtils.loadJar(jarFile.getAbsolutePath());
@@ -104,8 +107,10 @@
return error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),"请重新导入模型参数");
}
JSONArray jsonArray = JSON.parseArray(cache.get(uuid));
- double[][] data = new double[jsonArray.size()][jsonArray.getJSONArray(0).size()];
+
+ double[][] data = new double[jsonArray.size()][];
for (int j = 0; j < jsonArray.size(); j++) {
+ data[j] = new double[jsonArray.getJSONArray(j).size()];
for (int k = 0; k < jsonArray.getJSONArray(j).size(); k++) {
data[j][k] = jsonArray.getJSONArray(j).getDoubleValue(k);
}
@@ -150,7 +155,6 @@
DllUtils.unloadDll(classLoader);
DllUtils.unloadJar(classLoader);
}
- System.gc();
}
}
--
Gitblit v1.9.3