From 730d1944e3a13c517c77df2b0712df05645a38dd Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 06 一月 2025 16:00:58 +0800
Subject: [PATCH] chartParamList api

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java |   48 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 14 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 9931ccc..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,27 +96,32 @@
                 dto.setGroupName(dto.getMenuAndGroup().get(1));
             }
         }
+        dto.setPyModule(packService.getModelPath(dto.getPkgName()));
         mpkFileService.update(dto);
         return CommonResult.success(true);
     }
 
     @GetMapping("generat")
-    public void generat(String id, String remark,String zipFileName, HttpServletResponse response) throws IOException {
-        byte[] data = mpkFileService.generatorCode(id, remark,zipFileName);
+    public void generat(String id, String remark,String zipFileName, HttpServletResponse response) {
+        try {
+            byte[] data = mpkFileService.generatorCode(id, remark,zipFileName);
 
-        response.reset();
-        response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(zipFileName, "UTF-8") + "\"");
-        response.addHeader("Content-Length", "" + data.length);
-        response.setContentType("application/octet-stream; charset=UTF-8");
+            response.reset();
+            response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(zipFileName, "UTF-8") + "\"");
+            response.addHeader("Content-Length", "" + data.length);
+            response.setContentType("application/octet-stream; charset=UTF-8");
 
-        IOUtils.write(data, response.getOutputStream());
+            IOUtils.write(data, response.getOutputStream());
+        } catch (Exception e) {
+            throw new RuntimeException("代码生成异常",e);
+        }
     }
 
     @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);
         }
@@ -121,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