From b131f033c12459b718565cab504f762c25642d2d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 15:23:08 +0800
Subject: [PATCH] 模型运行
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java | 90 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 72 insertions(+), 18 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 8d75179..7b75ee9 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
@@ -1,5 +1,7 @@
package com.iailab.module.model.mpk.controller.admin;
+import cn.hutool.cache.CacheUtil;
+import cn.hutool.cache.impl.FIFOCache;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.iail.utils.RSAUtils;
@@ -11,6 +13,7 @@
import com.iailab.module.model.mpk.common.utils.Readtxt;
import com.iailab.module.model.mpk.dto.MdkDTO;
import com.iailab.module.model.mpk.dto.MdkRunDTO;
+import com.iailab.module.model.mpk.dto.MethodSettingDTO;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -24,6 +27,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.UUID;
import static com.iailab.framework.common.pojo.CommonResult.error;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -40,6 +44,8 @@
@Value("${mpk.bak-file-path}")
private String mpkBakFilePath;
+ // 先进先出缓存
+ private static FIFOCache<String, String> cache = CacheUtil.newFIFOCache(100);
/**
* @description: 模型测试运行
@@ -76,16 +82,19 @@
System.out.println("runTime=" + System.currentTimeMillis());
try {
- List<String> datas = dto.getDatas();
+ List<String> uuids = dto.getUuids();
- int paramLength = dto.getHasModel() ? datas.size() + 2 : datas.size() + 1;
+ int paramLength = dto.getHasModel() ? uuids.size() + 2 : uuids.size() + 1;
Object[] paramsValueArray = new Object[paramLength];
Class<?>[] paramsArray = new Class[paramLength];
try {
- for (int i = 0; i < datas.size(); i++) {
- String json = datas.get(i);
- JSONArray jsonArray = JSON.parseArray(json);
+ for (int i = 0; i < uuids.size(); i++) {
+ String uuid = uuids.get(i);
+ if (!cache.containsKey(uuid)) {
+ return error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),"请重新导入模型参数");
+ }
+ JSONArray jsonArray = JSON.parseArray(cache.get(uuid));
double[][] data = new double[jsonArray.size()][jsonArray.getJSONArray(0).size()];
for (int j = 0; j < jsonArray.size(); j++) {
for (int k = 0; k < jsonArray.getJSONArray(j).size(); k++) {
@@ -97,17 +106,26 @@
}
} catch (Exception e) {
e.printStackTrace();
- return error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),"参数错误，请检查！");
+ return error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),"模型参数错误，请检查！");
}
- if (dto.getHasModel()) {
- paramsValueArray[datas.size()] = dto.getModel();
- paramsValueArray[datas.size() + 1] = dto.getModelSettings();
- paramsArray[datas.size()] = HashMap.class;
- paramsArray[datas.size() + 1] = HashMap.class;
- }else {
- paramsValueArray[datas.size()] = dto.getModelSettings();
- paramsArray[datas.size()] = HashMap.class;
+ try {
+ if (dto.getModelSettings().stream().noneMatch(e -> e.getSettingKey().equals(MdkConstant.PY_FILE_KEY))) {
+ return error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),"模型设置参数缺少必要信息【" + MdkConstant.PY_FILE_KEY + "】,请重新上传模型！");
+ }
+
+ if (dto.getHasModel()) {
+ paramsValueArray[uuids.size()] = dto.getModel();
+ paramsValueArray[uuids.size() + 1] = handleModelSettings(dto.getModelSettings());
+ paramsArray[uuids.size()] = HashMap.class;
+ paramsArray[uuids.size() + 1] = HashMap.class;
+ }else {
+ paramsValueArray[uuids.size()] = handleModelSettings(dto.getModelSettings());
+ paramsArray[uuids.size()] = HashMap.class;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),"模型设置错误，请检查！");
}
HashMap result = (HashMap) clazz.getDeclaredMethod(dto.getMethodName(), paramsArray).invoke(clazz.newInstance(), paramsValueArray);
@@ -122,6 +140,37 @@
}
System.gc();
}
+ }
+
+ private HashMap<String, Object> handleModelSettings(List<MethodSettingDTO> modelSettings) {
+ HashMap<String, Object> resultMap = null;
+ try {
+ resultMap = new HashMap<>(modelSettings.size());
+ for (MethodSettingDTO modelSetting : modelSettings) {
+ switch (modelSetting.getValueType()) {
+ case "int":
+ resultMap.put(modelSetting.getSettingKey(), Integer.valueOf(modelSetting.getSettingValue()));
+ break;
+ case "string":
+ resultMap.put(modelSetting.getSettingKey(), modelSetting.getSettingValue());
+ break;
+ case "decimal":
+ resultMap.put(modelSetting.getSettingKey(), Double.valueOf(modelSetting.getSettingValue()));
+ break;
+ case "decimalArray":
+ JSONArray jsonArray = JSON.parseArray(modelSetting.getSettingValue());
+ double[] doubles = new double[jsonArray.size()];
+ for (int i = 0; i < jsonArray.size(); i++) {
+ doubles[i] = Double.valueOf(String.valueOf(jsonArray.get(i)));
+ }
+ resultMap.put(modelSetting.getSettingKey(), doubles);
+ break;
+ }
+ }
+ } catch (NumberFormatException e) {
+ throw new RuntimeException("模型参数有误，请检查！！！");
+ }
+ return resultMap;
}
/**
@@ -152,18 +201,23 @@
return CommonResult.error(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"模型运行失败！");
}
}
- return CommonResult.success();
+ return CommonResult.success("");
}
@PostMapping("/import")
@Operation(summary = "导入参数")
- public CommonResult<List<String>> importExcel(@RequestParam("file") MultipartFile file) throws Exception {
+ public CommonResult<List<HashMap<String,Object>>> importExcel(@RequestParam("file") MultipartFile file) throws Exception {
List<double[][]> datas = Readtxt.readMethodExcel(file);
- List<String> result = new ArrayList<>();
+ List<HashMap<String,Object>> result = new ArrayList<>();
if (!CollectionUtils.isEmpty(datas)) {
for (double[][] data : datas) {
if (data.length > 0) {
- result.add(JSON.toJSONString(data));
+ HashMap<String,Object> map = new HashMap<>();
+ String uuid = UUID.randomUUID().toString();
+ map.put("uuid",uuid);
+ map.put("data",JSON.toJSONString(data));
+ cache.put(uuid,JSON.toJSONString(data));
+ result.add(map);
}
}
}
--
Gitblit v1.9.3