From 94c169d9c7809ae78927608ef55c61d24459fdab Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 12 十二月 2024 10:47:59 +0800
Subject: [PATCH] 项目打包bug

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MethodSettingServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MethodSettingServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MethodSettingServiceImpl.java
index 8867eeb..882ab0b 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MethodSettingServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MethodSettingServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.iailab.framework.common.service.impl.BaseServiceImpl;
 import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.module.model.mpk.common.MdkConstant;
 import com.iailab.module.model.mpk.dao.MethodSettingDao;
 import com.iailab.module.model.mpk.dto.MethodSettingDTO;
 import com.iailab.module.model.mpk.entity.MethodSettingEntity;
@@ -30,11 +31,13 @@
     @Override
     public void insertList(List<MethodSettingDTO> list, String MethodId) {
         List<MethodSettingEntity> entityList = ConvertUtils.sourceToTarget(list, MethodSettingEntity.class);
+        // pyFile排第一
+        entityList.sort((e1,e2) -> e1.getSettingKey().equals(MdkConstant.PY_FILE_KEY) ? -1 : e2.getSettingKey().equals(MdkConstant.PY_FILE_KEY) ? 1 : 0);
         for(int i = 0; i < entityList.size(); i++){
             MethodSettingEntity entity = entityList.get(i);
             if (StringUtils.isNotBlank(entity.getValue())){
                 // 去掉空格
-                entity.setValue(entity.getValue().trim().replace("\\s+", ""));
+                entity.setValue(entity.getValue().trim().replaceAll("\\s+", ""));
             }
             entity.setId(UUID.randomUUID().toString());
             entity.setMethodId(MethodId);

--
Gitblit v1.9.3