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/MpkFileController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java
index f7c2e75..382c140 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java
@@ -4,8 +4,10 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.module.model.mpk.dto.MpkFileDTO;
import com.iailab.module.model.mpk.service.MpkFileService;
+import com.iailab.module.model.mpk.service.PackService;
import io.swagger.v3.oas.annotations.Operation;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
@@ -30,6 +32,9 @@
@Autowired
private MpkFileService mpkFileService;
+ @Autowired
+ private PackService packService;
+
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("@ss.hasPermission('mpk:file:query')")
@@ -43,16 +48,20 @@
public CommonResult<MpkFileDTO> info(@PathVariable("id") String id) {
MpkFileDTO schedule = mpkFileService.get(id);
List<String> menuAndGroup = new ArrayList<>();
- menuAndGroup.add(schedule.getMenuName());
- menuAndGroup.add(schedule.getGroupName());
+ if (StringUtils.isNotBlank(schedule.getMenuName())) {
+ menuAndGroup.add(schedule.getMenuName());
+ }
+ if (StringUtils.isNotBlank(schedule.getGroupName())) {
+ menuAndGroup.add(schedule.getGroupName());
+ }
schedule.setMenuAndGroup(menuAndGroup);
return success(schedule);
}
@PreAuthorize("@ss.hasPermission('mpk:file:query')")
@GetMapping("list")
- public CommonResult<List<MpkFileDTO>> list() {
- List<MpkFileDTO> list = mpkFileService.list(new HashMap<>());
+ public CommonResult<List<MpkFileDTO>> list(@RequestParam Map<String, Object> params) {
+ List<MpkFileDTO> list = mpkFileService.list(params);
return success(list);
}
@@ -66,6 +75,7 @@
dto.setGroupName(dto.getMenuAndGroup().get(1));
}
}
+ dto.setPyModule(packService.getModelPath(dto.getPkgName()));
mpkFileService.save(dto);
return CommonResult.success(true);
}
@@ -86,6 +96,7 @@
dto.setGroupName(dto.getMenuAndGroup().get(1));
}
}
+ dto.setPyModule(packService.getModelPath(dto.getPkgName()));
mpkFileService.update(dto);
return CommonResult.success(true);
}
@@ -107,10 +118,10 @@
}
@GetMapping("packageModel")
- public void packageModel(String ids ,String projectId,String log ,String projectName,String version,String zipFileName,HttpServletResponse response) throws IOException {
+ public void packageModel(String projectId,String log ,String projectName,String version,String zipFileName,HttpServletResponse response) throws IOException {
byte[] data;
try {
- data = mpkFileService.packageModel(Arrays.asList(ids.split(",")),projectId,projectName,zipFileName,log,version);
+ data = mpkFileService.packageModel(projectId,projectName,zipFileName,log,version);
} catch (InterruptedException e) {
throw new RuntimeException("模型打包失败",e);
}
@@ -125,8 +136,13 @@
@PostMapping("/upload")
@Operation(summary = "python文件上传")
- public CommonResult<Map<String,String>> importExcel(@RequestParam("file") MultipartFile file) throws Exception {
+ public CommonResult<Map<String,String>> upload(@RequestParam("file") MultipartFile file) throws Exception {
Map<String,String> result = mpkFileService.savePyFile(file);
return success(result);
}
+
+ @PostMapping("/publish")
+ public CommonResult<String> publish(@RequestBody Map<String, Object> params) {
+ return mpkFileService.publish(params);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3