From ce910c8cec901b061317d4ccc6373c2b03cdfbf6 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 24 十月 2024 17:41:06 +0800
Subject: [PATCH] 1、修改应用菜单权限等，增加根据应用id查询该应用下的二级菜单，并且转成一级菜单展示 2、数据采集模块增加大华和海康摄像头的sdk工具及相关代码 3、移除data和model模块iailab-common-biz-data-permission依赖重复，解决打包报错的bug 4、data-biz模块左右openscada依赖都需要排除bcprov-jdk15on，否则会导致打包报错 5、其它相关修改
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java
index 7b47923..41246be 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java
@@ -15,6 +15,7 @@
import com.iailab.module.model.mdk.sample.SampleConstructor;
import com.iailab.module.model.mdk.sample.dto.SampleData;
import com.iailab.module.model.mdk.vo.PredictResultVO;
+import com.iailab.module.model.mpk.common.utils.DllUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -80,16 +81,26 @@
log.info(String.valueOf(jsonObjParam2Values));
//IAILMDK.run
- HashMap<String, Object> modelResult = IAILMDK.run(newModelBean, param2Values);
+// HashMap<String, Object> modelResult = IAILMDK.run(newModelBean, param2Values);
+ HashMap<String, Object> modelResult = DllUtils.run(newModelBean, param2Values, predictModel.getMpkprojectid());
//打印结果
JSONObject jsonObjResult = new JSONObject();
- jsonObjResult.put("result", result);
+ jsonObjResult.put("result", modelResult);
log.info(String.valueOf(jsonObjResult));
MmModelResultstrEntity modelResultstr = mmModelResultstrService.getInfo(predictModel.getResultstrid());
log.info("模型计算完成：modelId=" + modelId + result);
- double[][] temp = (double[][]) modelResult.get(modelResultstr.getResultstr());
- result.setPredictMatrix(temp);
+ if (modelResult.containsKey(modelResultstr.getResultstr())) {
+ Double[][] temp = (Double[][]) modelResult.get(modelResultstr.getResultstr());
+ double[][] temp1 = new double[temp.length][temp[0].length];
+ for (int i = 0; i < temp.length; i++) {
+ for (int j = 0; j < temp[i].length; j++) {
+ temp1[i][j] = temp[i][j].doubleValue();
+ }
+ }
+ result.setPredictMatrix(temp1);
+ }
+ result.setModelResult(modelResult);
result.setPredictTime(predictTime);
} catch (Exception ex) {
log.error("IAILModel对象构造失败，modelId=" + modelId);
--
Gitblit v1.9.3