From 3e18d4bfbf2c657b08b21512c2d884cc9d59df7b Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 14 十月 2024 16:29:49 +0800
Subject: [PATCH] 模型运行

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java |   83 ++++++++++++++++++++++++++---------------
 1 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java
index c46b3df..84d5eb6 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java
@@ -13,6 +13,7 @@
 import com.iailab.framework.common.util.date.DateUtils;
 import com.iailab.framework.common.util.object.ConvertUtils;
 import com.iailab.framework.security.core.util.SecurityFrameworkUtils;
+import com.iailab.framework.tenant.core.context.TenantContextHolder;
 import com.iailab.module.infra.api.config.ConfigApi;
 import com.iailab.module.model.mpk.common.MdkConstant;
 import com.iailab.module.model.mpk.common.utils.DllUtils;
@@ -24,6 +25,7 @@
 import com.iailab.module.model.mpk.dto.ProjectPackageHistoryDTO;
 import com.iailab.module.model.mpk.entity.GeneratorCodeHistoryEntity;
 import com.iailab.module.model.mpk.entity.MpkFileEntity;
+import com.iailab.module.model.mpk.entity.ProjectPackageHistoryEntity;
 import com.iailab.module.model.mpk.entity.ProjectPackageHistoryModelEntity;
 import com.iailab.module.model.mpk.service.*;
 import lombok.extern.slf4j.Slf4j;
@@ -72,11 +74,6 @@
 
     @Value("${mpk.bak-resources}")
     private String mpkResources;
-
-    /*@PostConstruct
-    public void init() {
-        mpkBakFilePath = configApi.getConfigValueByKey("mpkBakFilePath").getCheckedData();
-    }*/
 
     @Override
     public PageData<MpkFileDTO> page(Map<String, Object> params) {
@@ -133,6 +130,12 @@
         entity.setCreateDate(new Date());
         insert(entity);
         modelMethodService.insertList(dto.getModelMethods(), entity.getId());
+
+        // 替换环境变量MDK_PKGS下的py文件
+        String mdkPkgs = System.getenv("MDK_PKGS");
+        String pyFilePath = mdkPkgs + File.separator + entity.getPyModule().replace(".", File.separator) + File.separator + entity.getPyName() + ".pyd";
+        FileUtil.mkParentDirs(pyFilePath);
+        FileUtil.copy(entity.getFilePath(), pyFilePath, true);
     }
 
     @Override
@@ -144,6 +147,12 @@
         updateById(entity);
         modelMethodService.deleteModelMethod(entity.getId());
         modelMethodService.insertList(dto.getModelMethods(), entity.getId());
+
+        // 替换环境变量MDK_PKGS下的py文件
+        String mdkPkgs = System.getenv("MDK_PKGS");
+        String pyFilePath = mdkPkgs + File.separator + entity.getPyModule().replace(".", File.separator) + File.separator + entity.getPyName() + ".pyd";
+        FileUtil.mkParentDirs(pyFilePath);
+        FileUtil.copy(entity.getFilePath(), pyFilePath, true);
     }
 
     @Override
@@ -178,6 +187,10 @@
 
     @Override
     public byte[] generatorCode(String id, String remark, String zipFileName) {
+        Long tenantId = TenantContextHolder.getTenantId();
+        // 备份文件 租户隔离
+        String mpkTenantBakFilePath = mpkBakFilePath + File.separator + tenantId;
+
         MpkFileDTO entity = baseDao.get(id);
         //生成代码
         //设置velocity资源加载器
@@ -241,7 +254,7 @@
         String dllSavePath = dirPath.getAbsolutePath() + File.separator + MdkConstant.LIBS + File.separator + "IAIL.MDK.Mid.Jni.dll";
         createDllFile(dirPath.getAbsolutePath(),cppFilePaths,dllSavePath);
         //备份dll文件,用于后续运行
-        String dllBakPath = mpkBakFilePath + File.separator + MdkConstant.DLL + File.separator + entity.getPyName() + ".dll";
+        String dllBakPath = mpkTenantBakFilePath + File.separator + MdkConstant.DLL + File.separator + entity.getPyName() + ".dll";
         FileUtil.mkParentDirs(dllBakPath);
         FileUtil.copy(dllSavePath, dllBakPath, true);
 
@@ -261,11 +274,11 @@
         // 打jar包
         String jarSavePath = pkgJar(dirPath.getAbsolutePath());
         //备份jar文件,用于后续运行
-        String jarBakPath = mpkBakFilePath + File.separator + MdkConstant.JAR + File.separator + entity.getPyName() + ".jar";
+        String jarBakPath = mpkTenantBakFilePath + File.separator + MdkConstant.JAR + File.separator + entity.getPyName() + ".jar";
         FileUtil.mkParentDirs(dllBakPath);
         FileUtil.copy(jarSavePath, jarBakPath, true);
         // 打zip包
-        String zipPath = mpkBakFilePath + File.separator + zipFileName;
+        String zipPath = mpkTenantBakFilePath + File.separator + zipFileName;
         ZipUtil.zip(dirPath.getAbsolutePath(), zipPath);
         byte[] bytes = FileUtil.readBytes(zipPath);
 
@@ -291,6 +304,10 @@
     @Override
     @DSTransactional(rollbackFor = Exception.class)
     public byte[] packageModel(List<String> ids, String projectId, String projectName, String zipFileName, String logs, String version) throws IOException, InterruptedException {
+        Long tenantId = TenantContextHolder.getTenantId();
+        // 备份文件 租户隔离
+        String mpkTenantBakFilePath = mpkBakFilePath + File.separator + tenantId;
+
         List<MpkFileDTO> entities = baseDao.selectByIds(ids);
 
         //模板数据
@@ -376,7 +393,7 @@
         //备份dll,发布时使用
         File dllFile = new File(dllSavePath);
         if (dllFile.exists()) {
-            File dllBakFile = new File(mpkBakFilePath + File.separator + projectId + MdkConstant.SPLIT + historyId + ".dll");
+            File dllBakFile = new File(mpkBakFilePath + File.separator + MdkConstant.PROJECT_UNPUBLISH + File.separator + projectId + MdkConstant.SPLIT + historyId + ".dll");
             FileUtil.copy(dllFile, dllBakFile, true);
         }else {
             log.error("dll文件不存在,无法备份。" + dllSavePath);
@@ -400,30 +417,30 @@
         //备份jar包,发布时使用
         File jarFile = new File(jarSavePath);
         if (jarFile.exists()) {
-            File jarBakFile = new File(mpkBakFilePath + File.separator + projectId + MdkConstant.SPLIT + historyId + ".jar");
+            File jarBakFile = new File(mpkBakFilePath + File.separator + MdkConstant.PROJECT_UNPUBLISH + File.separator + projectId + MdkConstant.SPLIT + historyId + ".jar");
             FileUtil.copy(jarFile, jarBakFile, true);
         }else {
             log.error("jar文件不存在,无法备份。" + jarSavePath);
         }
 
         // 本次更新日志
-        ProjectPackageHistoryDTO dto = new ProjectPackageHistoryDTO();
-        dto.setId(historyId);
-        dto.setProjectId(projectId);
-        dto.setFileName(zipFileName);
-        dto.setLog(logs);
-        dto.setVersion(version);
-        dto.setModelNames(entities.stream().map(MpkFileDTO::getPyName).collect(Collectors.joining(",")));
-        dto.setCreateTime(new Date());
+        ProjectPackageHistoryEntity projectPackageHistoryEntity = new ProjectPackageHistoryEntity();
+        projectPackageHistoryEntity.setId(historyId);
+        projectPackageHistoryEntity.setProjectId(projectId);
+        projectPackageHistoryEntity.setFileName(zipFileName);
+        projectPackageHistoryEntity.setLog(logs);
+        projectPackageHistoryEntity.setVersion(version);
+        projectPackageHistoryEntity.setModelNames(entities.stream().map(MpkFileDTO::getPyName).collect(Collectors.joining(",")));
+        projectPackageHistoryEntity.setCreateTime(new Date());
         // 生成更新日志
-        createLog(projectId, projectName, dirPath.getAbsolutePath(), dto, version);
+        createLog(projectId, projectName, dirPath.getAbsolutePath(), projectPackageHistoryEntity, version);
         // 打zip包
-        String zipPath = mpkBakFilePath + File.separator + zipFileName;
+        String zipPath = mpkTenantBakFilePath + File.separator + zipFileName;
         ZipUtil.zip(dirPath.getAbsolutePath(), zipPath);
         byte[] bytes = FileUtil.readBytes(zipPath);
         // 记录打包日志
-        dto.setFilePath(zipPath);
-        projectPackageHistoryService.save(dto);
+        projectPackageHistoryEntity.setFilePath(zipPath);
+        projectPackageHistoryService.insert(projectPackageHistoryEntity);
         // 插入打包历史-模型关联表
         List<ProjectPackageHistoryModelEntity> historyModelList = new ArrayList<>(entities.size());
         entities.forEach(e -> {
@@ -442,7 +459,7 @@
             }
             historyModelList.add(entity);
         });
-        projectPackageHistoryModelService.insertBatch(historyModelList);
+        projectPackageHistoryModelService.insertList(historyModelList);
         // 删除临时文件
         FileUtils.deleteDirectory(dirPath);
         return bytes;
@@ -472,7 +489,11 @@
 
     @Override
     public Map<String, String> savePyFile(MultipartFile file) throws IOException {
-        File dir = new File(mpkBakFilePath);
+        Long tenantId = TenantContextHolder.getTenantId();
+        // 备份文件 租户隔离
+        String mpkTenantBakFilePath = mpkBakFilePath + File.separator + tenantId;
+
+        File dir = new File(mpkTenantBakFilePath);
         if (!dir.exists()) {
             dir.mkdirs();
         }
@@ -497,8 +518,8 @@
         String projectId = (String) params.get("projectId");
 
         // 判断新的dll和jar文件是否存在
-        String jarFileBakPath = mpkBakFilePath + File.separator + projectId + MdkConstant.SPLIT + historyId + ".jar";
-        String dllFileBakPath = mpkBakFilePath + File.separator + projectId + MdkConstant.SPLIT + historyId + ".dll";
+        String jarFileBakPath = mpkBakFilePath + File.separator + MdkConstant.PROJECT_UNPUBLISH + File.separator + projectId + MdkConstant.SPLIT + historyId + ".jar";
+        String dllFileBakPath = mpkBakFilePath + File.separator + MdkConstant.PROJECT_UNPUBLISH + File.separator + projectId + MdkConstant.SPLIT + historyId + ".dll";
         if (!FileUtil.exist(jarFileBakPath)) {
             throw new RuntimeException("jar文件不存在," + jarFileBakPath);
         }
@@ -542,16 +563,16 @@
         return CommonResult.success();
     }
 
-    private void createLog(String projectId, String projectName, String dirPath, ProjectPackageHistoryDTO dto, String version) throws IOException {
+    private void createLog(String projectId, String projectName, String dirPath, ProjectPackageHistoryEntity projectPackageHistoryEntity, String version) {
         Map<String, Object> map = new HashMap<>();
         map.put("projectId", projectId);
-        List<ProjectPackageHistoryDTO> list = projectPackageHistoryService.list(map);
-        list.add(dto);
+        List<ProjectPackageHistoryEntity> list = projectPackageHistoryService.list(map);
+        list.add(projectPackageHistoryEntity);
         // 按照日期分组再排序
-        HashMap<String, List<ProjectPackageHistoryDTO>> dataMap = list.stream().collect(
+        HashMap<String, List<ProjectPackageHistoryEntity>> dataMap = list.stream().collect(
                 Collectors.groupingBy(e -> DateUtils.format(e.getCreateTime(), DateUtils.DATE_PATTERN_POINT),
                         LinkedHashMap::new,
-                        Collectors.collectingAndThen(Collectors.toList(), e -> e.stream().sorted(Comparator.comparing(ProjectPackageHistoryDTO::getCreateTime)).collect(Collectors.toList()))));
+                        Collectors.collectingAndThen(Collectors.toList(), e -> e.stream().sorted(Comparator.comparing(ProjectPackageHistoryEntity::getCreateTime)).collect(Collectors.toList()))));
 
         Map<String, Object> data = new HashMap<>();
         data.put("dataMap", dataMap);

--
Gitblit v1.9.3