From cb8e9ee0e914650ecd978cfe53a7459a797f04a9 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Tue, 28 Nov 2023 10:35:09 +0800
Subject: [PATCH 01/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../framework/form/dao/mapper/FormMapper.java |  2 ++
 .../framework/form/dao/mapper/FormMapper.xml  |  8 +++++
 .../FrameworkImportExportHandlerType.java     |  6 ++++
 .../dao/mapper/IntegrationMapper.java         |  2 ++
 .../dao/mapper/IntegrationMapper.xml          | 23 +++++++++++++++
 .../matrix/dao/mapper/MatrixMapper.java       |  2 ++
 .../matrix/dao/mapper/MatrixMapper.xml        | 15 ++++++++++
 .../notify/dao/mapper/NotifyMapper.java       |  6 ++--
 .../notify/dao/mapper/NotifyMapper.xml        | 14 +++++++++
 .../scheduler/core/SchedulerManager.java      | 29 ++++++++-----------
 10 files changed, 88 insertions(+), 19 deletions(-)

diff --git a/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.java b/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.java
index 8db504b31..862b879a8 100644
--- a/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.java
+++ b/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.java
@@ -47,6 +47,8 @@ public interface FormMapper {
 
     FormVo getFormByUuid(String formUuid);
 
+    FormVo getFormByName(String formName);
+
     FormVersionVo getFormVersionByUuid(String formVersionUuid);
 
     List<FormVersionVo> getFormVersionByFormUuid(String formUuid);
diff --git a/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.xml b/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.xml
index 057982f3c..888660967 100644
--- a/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.xml
+++ b/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.xml
@@ -212,6 +212,14 @@ limitations under the License.
         WHERE `uuid` = #{value}
     </select>
 
+    <select id="getFormByName" parameterType="java.lang.String" resultType="neatlogic.framework.form.dto.FormVo">
+        SELECT `uuid`,
+               `name`,
+               `is_active` AS isActive
+        FROM `form`
+        WHERE `name` = #{value}
+    </select>
+
     <select id="getFormVersionByFormUuid" parameterType="java.lang.String"
             resultType="neatlogic.framework.form.dto.FormVersionVo">
         SELECT `uuid`,
diff --git a/src/main/java/neatlogic/framework/importexport/constvalue/FrameworkImportExportHandlerType.java b/src/main/java/neatlogic/framework/importexport/constvalue/FrameworkImportExportHandlerType.java
index 9123e2b3d..8b0383403 100644
--- a/src/main/java/neatlogic/framework/importexport/constvalue/FrameworkImportExportHandlerType.java
+++ b/src/main/java/neatlogic/framework/importexport/constvalue/FrameworkImportExportHandlerType.java
@@ -21,6 +21,12 @@ import neatlogic.framework.util.$;
 
 public enum FrameworkImportExportHandlerType implements ImportExportHandlerType {
     FILE("file", "common.attachment"),
+    INTEGRATION("integration", "集成"),
+    FORM("form", "表单"),
+    MATRIX("matrix", "矩阵"),
+    NOTIFY_POLICY("notifyPolicy", "通知策略"),
+    CMDB_CI("cmdbCi", "配置项模型"),
+    AUTOEXEC_COMBOP("autoexecCombop", "组合工具"),
     ;
 
     private String value;
diff --git a/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.java b/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.java
index cd903b659..d6514d88c 100644
--- a/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.java
+++ b/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.java
@@ -30,6 +30,8 @@ public interface IntegrationMapper {
 
     IntegrationVo getIntegrationByUuid(String uuid);
 
+    IntegrationVo getIntegrationByName(String name);
+
     int checkIntegrationExists(String uuid);
 
     List<IntegrationVo> searchIntegration(IntegrationVo integrationVo);
diff --git a/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.xml b/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.xml
index 69fd5ce3d..b11198a34 100644
--- a/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.xml
+++ b/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.xml
@@ -87,6 +87,21 @@ limitations under the License.
 		uuid = #{value}
 	</select>
 
+	<select id="getIntegrationByName" parameterType="java.lang.String" resultType="neatlogic.framework.integration.dto.IntegrationVo">
+		SELECT
+			`uuid`,
+			`name`,
+			`url`,
+			`handler`,
+			`method`,
+			is_active AS isActive,
+			`config`
+		FROM
+			`integration`
+		WHERE
+			`name` = #{value}
+	</select>
+
 	<select id="checkIntegrationExists" parameterType="java.lang.String" resultType="int">
 		SELECT COUNT(`uuid`) FROM `integration` WHERE `uuid` = #{value}
 	</select>
@@ -246,6 +261,14 @@ limitations under the License.
 		NOW(3),
 		#{fcu}
 		)
+		ON DUPLICATE KEY UPDATE
+		 `name` = #{name},
+		 `url` = #{url},
+		 `handler` = #{handler},
+		 `method` = #{method},
+		 `config` = #{configStr},
+		 `lcd` = NOW(3),
+		 `lcu` = #{lcu}
 	</insert>
 
 	<insert id="insertIntegrationAudit" parameterType="neatlogic.framework.integration.dto.IntegrationAuditVo">
diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.java b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.java
index 5b11ee360..b4dd76424 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.java
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.java
@@ -13,6 +13,8 @@ public interface MatrixMapper {
 
     MatrixVo getMatrixByUuid(String uuid);
 
+    MatrixVo getMatrixByLabel(String label);
+
     int checkMatrixIsExists(String uuid);
 
     int checkMatrixNameIsRepeat(MatrixVo matrixVo);
diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.xml b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.xml
index fa3a34eba..18bdbdb59 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.xml
@@ -17,6 +17,21 @@
 		WHERE `uuid` = #{uuid}
 	</select>
 
+	<select id="getMatrixByLabel" parameterType="String" resultType="neatlogic.framework.matrix.dto.MatrixVo">
+		SELECT
+			`id`,
+			`uuid`,
+			`name`,
+			`label`,
+			`type`,
+			`fcu`,
+			`fcd`,
+			`lcu`,
+			`lcd`
+		FROM `matrix`
+		WHERE `label` = #{value}
+	</select>
+
 	<select id="checkMatrixIsExists" parameterType="java.lang.String" resultType="int">
 		SELECT COUNT(`uuid`) FROM `matrix` WHERE `uuid` = #{uuid}
 	</select>
diff --git a/src/main/java/neatlogic/framework/notify/dao/mapper/NotifyMapper.java b/src/main/java/neatlogic/framework/notify/dao/mapper/NotifyMapper.java
index aa671082c..dd9e27250 100644
--- a/src/main/java/neatlogic/framework/notify/dao/mapper/NotifyMapper.java
+++ b/src/main/java/neatlogic/framework/notify/dao/mapper/NotifyMapper.java
@@ -1,16 +1,18 @@
 package neatlogic.framework.notify.dao.mapper;
 
-import java.util.List;
-
 import neatlogic.framework.common.dto.ValueTextVo;
 import neatlogic.framework.notify.dto.NotifyPolicyVo;
 
+import java.util.List;
+
  public interface NotifyMapper {
 
 	 NotifyPolicyVo getNotifyPolicyById(Long id);
 
 	 NotifyPolicyVo getNotifyPolicyByName(String name);
 
+	 List<NotifyPolicyVo> getNotifyPolicyListByName(String name);
+
 	 List<NotifyPolicyVo> getNotifyPolicyListByIdList(List<Long> idList);
 
 	 int checkNotifyPolicyNameIsRepeat(NotifyPolicyVo notifyPolicyVo);
diff --git a/src/main/java/neatlogic/framework/notify/dao/mapper/NotifyMapper.xml b/src/main/java/neatlogic/framework/notify/dao/mapper/NotifyMapper.xml
index 3483c68cb..dc7bdfced 100644
--- a/src/main/java/neatlogic/framework/notify/dao/mapper/NotifyMapper.xml
+++ b/src/main/java/neatlogic/framework/notify/dao/mapper/NotifyMapper.xml
@@ -34,6 +34,20 @@
 	Limit 1
 	</select>
 
+	<select id="getNotifyPolicyListByName" parameterType="java.lang.String" resultType="neatlogic.framework.notify.dto.NotifyPolicyVo">
+		SELECT
+			`id`,
+			`name`,
+			`is_default` AS isDefault,
+			`handler`,
+			`fcd`,
+			`fcu`,
+			`lcd`,
+			`lcu`
+		FROM `notify_policy`
+		WHERE `name` = #{value}
+	</select>
+
 	<select id="getNotifyPolicyListByIdList" parameterType="java.lang.Long" resultType="neatlogic.framework.notify.dto.NotifyPolicyVo">
 	SELECT
 	`id`,
diff --git a/src/main/java/neatlogic/framework/scheduler/core/SchedulerManager.java b/src/main/java/neatlogic/framework/scheduler/core/SchedulerManager.java
index 06af43eb2..3c1cbf502 100644
--- a/src/main/java/neatlogic/framework/scheduler/core/SchedulerManager.java
+++ b/src/main/java/neatlogic/framework/scheduler/core/SchedulerManager.java
@@ -20,20 +20,16 @@ import neatlogic.framework.applicationlistener.core.ModuleInitializedListenerBas
 import neatlogic.framework.asynchronization.thread.NeatLogicThread;
 import neatlogic.framework.asynchronization.threadlocal.TenantContext;
 import neatlogic.framework.asynchronization.threadlocal.UserContext;
-import neatlogic.framework.asynchronization.threadpool.CachedThreadPool;
 import neatlogic.framework.bootstrap.NeatLogicWebApplicationContext;
 import neatlogic.framework.common.RootComponent;
 import neatlogic.framework.common.constvalue.SystemUser;
 import neatlogic.framework.dao.mapper.TenantMapper;
 import neatlogic.framework.dto.TenantVo;
-import neatlogic.framework.dto.module.ModuleGroupVo;
 import neatlogic.framework.scheduler.dao.mapper.SchedulerMapper;
 import neatlogic.framework.scheduler.dto.JobClassVo;
 import neatlogic.framework.scheduler.dto.JobLockVo;
 import neatlogic.framework.scheduler.dto.JobObject;
 import neatlogic.framework.scheduler.dto.JobStatusVo;
-import neatlogic.framework.util.$;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.*;
 import org.slf4j.Logger;
@@ -42,7 +38,6 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @RootComponent
 public class SchedulerManager extends ModuleInitializedListenerBase {
@@ -214,18 +209,18 @@ public class SchedulerManager extends ModuleInitializedListenerBase {
                 publicJobClassList.add(jobClassVo);
             }
         }
-        if (CollectionUtils.isNotEmpty(tmpJobHandlerList)) {
-            System.out.println("⚡" + $.t("common.startloadschedulejob", context.getModuleId()));
-            for (TenantVo tenantVo : tenantList) {
-                TenantContext.get().switchTenant(tenantVo.getUuid()).setUseDefaultDatasource(false);
-                List<ModuleGroupVo> activeModuleGroupList = TenantContext.get().getActiveModuleGroupList();
-                TenantContext.get().switchTenant(tenantVo.getUuid()).setUseDefaultDatasource(true);
-                if (activeModuleGroupList.stream().map(ModuleGroupVo::getGroup).collect(Collectors.toList()).contains(context.getGroup())) {
-                    CachedThreadPool.execute(new ScheduleLoadJobRunner(tenantVo.getUuid(), tmpJobHandlerList));
-                    System.out.println("  ✓" + tenantVo.getName());
-                }
-            }
-        }
+//        if (CollectionUtils.isNotEmpty(tmpJobHandlerList)) {
+//            System.out.println("⚡" + $.t("common.startloadschedulejob", context.getModuleId()));
+//            for (TenantVo tenantVo : tenantList) {
+//                TenantContext.get().switchTenant(tenantVo.getUuid()).setUseDefaultDatasource(false);
+//                List<ModuleGroupVo> activeModuleGroupList = TenantContext.get().getActiveModuleGroupList();
+//                TenantContext.get().switchTenant(tenantVo.getUuid()).setUseDefaultDatasource(true);
+//                if (activeModuleGroupList.stream().map(ModuleGroupVo::getGroup).collect(Collectors.toList()).contains(context.getGroup())) {
+//                    CachedThreadPool.execute(new ScheduleLoadJobRunner(tenantVo.getUuid(), tmpJobHandlerList));
+//                    System.out.println("  ✓" + tenantVo.getName());
+//                }
+//            }
+//        }
         // TODO 这里要增加清理job_status的逻辑
     }
 
-- 
Gitee


From b8c5bfefa03a65a27033402db0a900c33273aed2 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Thu, 7 Dec 2023 19:17:30 +0800
Subject: [PATCH 02/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../form/service/IFormCrossoverService.java   |   8 +
 .../core/ImportExportHandlerBase.java         |   3 +
 .../framework/form/service/FormService.java   |  10 +-
 .../form/service/FormServiceImpl.java         | 141 ++++++++++-
 .../handler/FormImportExportHandler.java      | 237 ++++++++++++++++++
 .../IntegrationImportExportHandler.java       |  79 ++++++
 .../handler/MatrixImportExportHandler.java    | 108 ++++++++
 .../NotifyPolicyImportExportHandler.java      | 110 ++++++++
 8 files changed, 691 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
 create mode 100644 src/main/java/neatlogic/module/framework/importexport/handler/IntegrationImportExportHandler.java
 create mode 100644 src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
 create mode 100644 src/main/java/neatlogic/module/framework/importexport/handler/NotifyPolicyImportExportHandler.java

diff --git a/src/main/java/neatlogic/framework/form/service/IFormCrossoverService.java b/src/main/java/neatlogic/framework/form/service/IFormCrossoverService.java
index be267be14..7193738ea 100644
--- a/src/main/java/neatlogic/framework/form/service/IFormCrossoverService.java
+++ b/src/main/java/neatlogic/framework/form/service/IFormCrossoverService.java
@@ -22,6 +22,7 @@ import neatlogic.framework.form.dto.AttributeDataVo;
 import neatlogic.framework.form.dto.FormAttributeVo;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.form.dto.FormVersionVo;
+import neatlogic.framework.form.dto.FormVo;
 import neatlogic.framework.form.exception.AttributeValidException;
 
 import java.util.List;
@@ -70,4 +71,11 @@ public interface IFormCrossoverService extends ICrossoverService {
      * @return
      */
     String getFormAttributeHandler(String attributeUuid, String formConfig);
+
+    /**
+     * 保存表单
+     * @param formVo
+     * @return
+     */
+    JSONObject saveForm(FormVo formVo);
 }
diff --git a/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java b/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java
index fc504b144..7c3a3e654 100644
--- a/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java
+++ b/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java
@@ -33,6 +33,9 @@ import java.util.zip.ZipOutputStream;
 public abstract class ImportExportHandlerBase implements ImportExportHandler {
 
     private static Logger logger = LoggerFactory.getLogger(ImportExportHandlerBase.class);
+
+    protected final String IMPORT = "import";
+    protected final String EXPORT = "export";
     /**
      * 检查导入依赖列表中的对象是否已经存在，存在则需要让用户决定是否覆盖
      * @param dependencyBaseInfoList
diff --git a/src/main/java/neatlogic/module/framework/form/service/FormService.java b/src/main/java/neatlogic/module/framework/form/service/FormService.java
index 7ee683d21..3659e005f 100644
--- a/src/main/java/neatlogic/module/framework/form/service/FormService.java
+++ b/src/main/java/neatlogic/module/framework/form/service/FormService.java
@@ -17,11 +17,12 @@ limitations under the License.
 package neatlogic.module.framework.form.service;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.common.dto.ValueTextVo;
 import neatlogic.framework.form.dto.AttributeDataVo;
 import neatlogic.framework.form.dto.FormAttributeVo;
-import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.form.dto.FormVersionVo;
+import neatlogic.framework.form.dto.FormVo;
 import neatlogic.framework.form.exception.AttributeValidException;
 
 import java.util.List;
@@ -89,4 +90,11 @@ public interface FormService {
      * @return
      */
     String getFormAttributeHandler(String attributeUuid, String formConfig);
+
+    /**
+     * 保存表单
+     * @param formVo
+     * @return
+     */
+    JSONObject saveForm(FormVo formVo);
 }
diff --git a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
index 29568c82b..8cbd3035a 100644
--- a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
+++ b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
@@ -19,16 +19,17 @@ package neatlogic.module.framework.form.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.common.dto.ValueTextVo;
+import neatlogic.framework.crossover.CrossoverServiceFactory;
 import neatlogic.framework.dependency.core.DependencyManager;
 import neatlogic.framework.form.attribute.core.FormAttributeHandlerFactory;
 import neatlogic.framework.form.attribute.core.IFormAttributeHandler;
 import neatlogic.framework.form.constvalue.FormHandler;
 import neatlogic.framework.form.dao.mapper.FormMapper;
-import neatlogic.framework.form.dto.AttributeDataVo;
-import neatlogic.framework.form.dto.FormAttributeMatrixVo;
-import neatlogic.framework.form.dto.FormAttributeVo;
-import neatlogic.framework.form.dto.FormVersionVo;
+import neatlogic.framework.form.dto.*;
 import neatlogic.framework.form.exception.AttributeValidException;
+import neatlogic.framework.form.exception.FormAttributeNameIsRepeatException;
+import neatlogic.framework.form.exception.FormNameRepeatException;
+import neatlogic.framework.form.exception.FormVersionNotFoundException;
 import neatlogic.framework.form.service.IFormCrossoverService;
 import neatlogic.framework.matrix.constvalue.SearchExpression;
 import neatlogic.framework.matrix.core.IMatrixDataSourceHandler;
@@ -41,6 +42,7 @@ import neatlogic.framework.matrix.dto.MatrixKeywordFilterVo;
 import neatlogic.framework.matrix.dto.MatrixVo;
 import neatlogic.framework.matrix.exception.MatrixDataSourceHandlerNotFoundException;
 import neatlogic.framework.matrix.exception.MatrixNotFoundException;
+import neatlogic.framework.util.UuidUtil;
 import neatlogic.module.framework.dependency.handler.Integration2FormAttrDependencyHandler;
 import neatlogic.module.framework.dependency.handler.MatrixAttr2FormAttrDependencyHandler;
 import org.apache.commons.collections4.CollectionUtils;
@@ -660,6 +662,137 @@ public class FormServiceImpl implements FormService, IFormCrossoverService {
         return getFormAttributeHandler(attributeUuid, JSONObject.parseObject(formConfig));
     }
 
+    @Override
+    public JSONObject saveForm(FormVo formVo) {
+        JSONObject resultObj = new JSONObject();
+        String formUuid = formVo.getUuid();
+        String currentVersionUuid = formVo.getCurrentVersionUuid();
+        resultObj.put("uuid", formUuid);
+        boolean updateName = true;
+        boolean updateFormConfig = true;
+        boolean formIsExists = false;
+        Integer oldFormVersionIsActive = 0;
+        FormVo oldFormVo = formMapper.getFormByUuid(formUuid);
+        if (oldFormVo != null) {
+            formIsExists = true;
+            if (Objects.equals(oldFormVo.getName(), formVo.getName())) {
+                updateName = false;
+            }
+            if (StringUtils.isNotBlank(currentVersionUuid)) {
+                FormVersionVo oldFormVersionVo = formMapper.getFormVersionByUuid(currentVersionUuid);
+                if (oldFormVersionVo == null) {
+                    throw new FormVersionNotFoundException(currentVersionUuid);
+                }
+                oldFormVersionIsActive = oldFormVersionVo.getIsActive();
+                resultObj.put("currentVersionUuid", oldFormVersionVo.getUuid());
+                resultObj.put("currentVersion", oldFormVersionVo.getVersion());
+                if (Objects.equals(oldFormVersionVo.getFormConfig(), formVo.getFormConfig())) {
+                    updateFormConfig = false;
+                } else {
+                    formMapper.deleteFormAttributeMatrixByFormVersionUuid(currentVersionUuid);
+                    List<FormAttributeVo> formAttributeList = oldFormVersionVo.getFormAttributeList();
+                    if (CollectionUtils.isNotEmpty(formAttributeList)) {
+                        for (FormAttributeVo formAttributeVo : formAttributeList) {
+                            DependencyManager.delete(MatrixAttr2FormAttrDependencyHandler.class, formAttributeVo.getUuid());
+                            DependencyManager.delete(Integration2FormAttrDependencyHandler.class, formAttributeVo.getUuid());
+                        }
+                    }
+                }
+            }
+        }
+        if (updateName && formMapper.checkFormNameIsRepeat(formVo) > 0) {
+            throw new FormNameRepeatException(formVo.getName());
+        }
+        if (!updateName && !updateFormConfig) {
+            //如果表单名和配置信息都没有更新，就直接返回
+            return resultObj;
+        } else if (!updateFormConfig) {
+            //只更新表单名信息
+            formMapper.updateForm(formVo);
+            return resultObj;
+        } else {
+            FormVersionVo formVersionVo = new FormVersionVo();
+            formVersionVo.setFormConfig(formVo.getFormConfig());
+            formVersionVo.setFormUuid(formUuid);
+            if (StringUtils.isNotBlank(currentVersionUuid)) {
+                formVersionVo.setUuid(currentVersionUuid);
+                formVersionVo.setIsActive(oldFormVersionIsActive);
+            } else {
+                formVersionVo.getUuid();
+            }
+            List<FormAttributeVo> formAttributeList = formVersionVo.getFormAttributeList();
+            if (CollectionUtils.isNotEmpty(formAttributeList)) {
+                //判断组件名是否重复
+                List<String> attributeNameList = formAttributeList.stream().map(FormAttributeVo::getLabel).collect(Collectors.toList());
+                List<String> nameList = new ArrayList<>();
+                for (int i = 0; i < attributeNameList.size(); i++) {
+                    String name = attributeNameList.get(i);
+                    if (i == 0) {
+                        nameList.add(name);
+                        continue;
+                    }
+                    if (nameList.contains(name)) {
+                        throw new FormAttributeNameIsRepeatException(name);
+                    }
+                    nameList.add(name);
+                }
+            }
+            //判断表单是否存在
+            if (!formIsExists) {
+                //插入表单信息
+                formMapper.insertForm(formVo);
+            } else {
+                //更新表单信息
+                formMapper.updateForm(formVo);
+            }
+
+            //插入表单版本信息
+            if (StringUtils.isBlank(currentVersionUuid)) {
+                Integer version = formMapper.getMaxVersionByFormUuid(formUuid);
+                if (version == null) {//如果表单没有激活版本时，设置当前版本号为1，且为激活版本
+                    version = 1;
+                    formVersionVo.setIsActive(1);
+                } else {
+                    version += 1;
+                    formVersionVo.setIsActive(0);
+                    //另存为新版时，需要对表单组件的uuid重新生成新值，既同一个表单的不同版本中组件uuid不同
+                    if (CollectionUtils.isNotEmpty(formAttributeList)) {
+                        String formConfigStr = formVersionVo.getFormConfig().toJSONString();
+                        for (FormAttributeVo formAttributeVo : formAttributeList) {
+                            String oldUuid = formAttributeVo.getUuid();
+                            String newUuid = UuidUtil.randomUuid();
+                            formConfigStr = formConfigStr.replace(oldUuid, newUuid);
+                        }
+                        formVersionVo.setFormConfig(JSONObject.parseObject(formConfigStr));
+                        formVersionVo.setFormAttributeList(null);
+                        formAttributeList = formVersionVo.getFormAttributeList();
+                    }
+                }
+                formVersionVo.setVersion(version);
+                formMapper.insertFormVersion(formVersionVo);
+                resultObj.put("currentVersionUuid", formVersionVo.getUuid());
+                resultObj.put("currentVersion", formVersionVo.getVersion());
+            } else {
+                formMapper.updateFormVersion(formVersionVo);
+            }
+            //保存激活版本时，更新表单属性信息
+            if (Objects.equals(formVersionVo.getIsActive(), 1)) {
+                formMapper.deleteFormAttributeByFormUuid(formUuid);
+            }
+            if (CollectionUtils.isNotEmpty(formAttributeList)) {
+                IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class);
+                for (FormAttributeVo formAttributeVo : formAttributeList) {
+                    //保存激活版本时，更新表单属性信息
+                    if (Objects.equals(formVersionVo.getIsActive(), 1)) {
+                        formMapper.insertFormAttribute(formAttributeVo);
+                    }
+                    formCrossoverService.saveDependency(formAttributeVo);
+                }
+            }
+            return resultObj;
+        }
+    }
+
     private List<FormAttributeVo> getAllFormAttributeList(JSONArray tableList) {
         List<FormAttributeVo> resultList = new ArrayList<>();
         if (CollectionUtils.isEmpty(tableList)) {
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
new file mode 100644
index 000000000..fd4ce493c
--- /dev/null
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
@@ -0,0 +1,237 @@
+package neatlogic.module.framework.importexport.handler;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.crossover.CrossoverServiceFactory;
+import neatlogic.framework.form.constvalue.FormHandler;
+import neatlogic.framework.form.dao.mapper.FormMapper;
+import neatlogic.framework.form.dto.FormVersionVo;
+import neatlogic.framework.form.dto.FormVo;
+import neatlogic.framework.form.exception.FormActiveVersionNotFoundExcepiton;
+import neatlogic.framework.form.exception.FormNotFoundException;
+import neatlogic.framework.form.service.IFormCrossoverService;
+import neatlogic.framework.importexport.constvalue.FrameworkImportExportHandlerType;
+import neatlogic.framework.importexport.core.ImportExportHandlerBase;
+import neatlogic.framework.importexport.core.ImportExportHandlerType;
+import neatlogic.framework.importexport.dto.ImportExportBaseInfoVo;
+import neatlogic.framework.importexport.dto.ImportExportPrimaryChangeVo;
+import neatlogic.framework.importexport.dto.ImportExportVo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.zip.ZipOutputStream;
+
+@Component
+public class FormImportExportHandler extends ImportExportHandlerBase {
+
+    private List<String> handlerList = new ArrayList<>();
+
+    {
+        handlerList.add(FormHandler.FORMSELECT.getHandler());
+        handlerList.add(FormHandler.FORMRADIO.getHandler());
+        handlerList.add(FormHandler.FORMCHECKBOX.getHandler());
+        handlerList.add(FormHandler.FORMTABLESELECTOR.getHandler());
+    }
+
+    @Resource
+    private FormMapper formMapper;
+
+    @Override
+    public ImportExportHandlerType getType() {
+        return FrameworkImportExportHandlerType.FORM;
+    }
+
+    @Override
+    public boolean checkImportAuth(ImportExportVo importExportVo) {
+        return true;
+    }
+
+    @Override
+    public boolean checkExportAuth(Object primaryKey) {
+        return true;
+    }
+
+    @Override
+    public boolean checkIsExists(ImportExportBaseInfoVo importExportBaseInfoVo) {
+        return formMapper.getFormByName(importExportBaseInfoVo.getName()) != null
+                || formMapper.getFormByUuid((String) importExportBaseInfoVo.getPrimaryKey()) != null;
+    }
+
+    @Override
+    public Object getPrimaryByName(ImportExportVo importExportVo) {
+        FormVo form = formMapper.getFormByName(importExportVo.getName());
+        if (form == null) {
+            throw new FormNotFoundException(importExportVo.getName());
+        }
+        return form.getUuid();
+    }
+
+    @Override
+    public Object importData(ImportExportVo importExportVo, List<ImportExportPrimaryChangeVo> primaryChangeList) {
+        FormVersionVo formVersion = importExportVo.getData().toJavaObject(FormVersionVo.class);
+        FormVo form = new FormVo();
+        if (formMapper.getFormByUuid(formVersion.getFormUuid()) != null) {
+            form.setUuid(formVersion.getFormUuid());
+        } else {
+            FormVo oldForm = formMapper.getFormByName(formVersion.getFormName());
+            if (oldForm != null) {
+                form.setUuid(oldForm.getUuid());
+            }
+        }
+        form.setName(formVersion.getFormName());
+        if (formMapper.getFormVersionByUuid(formVersion.getUuid()) != null) {
+            form.setCurrentVersionUuid(formVersion.getUuid());
+        }
+        importHandle(formVersion, primaryChangeList);
+        form.setFormConfig(formVersion.getFormConfig());
+        IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class);
+        formCrossoverService.saveForm(form);
+        return form.getUuid();
+    }
+
+    /**
+     * 导入处理，更新依赖组件的唯一标识
+     * @param formVersion
+     * @param primaryChangeList
+     */
+    private void importHandle(FormVersionVo formVersion, List<ImportExportPrimaryChangeVo> primaryChangeList) {
+        JSONObject formConfig = formVersion.getFormConfig();
+        dependencyHandle(IMPORT, formConfig, null, null, primaryChangeList);
+    }
+
+    @Override
+    protected ImportExportVo myExportData(Object primaryKey, List<ImportExportBaseInfoVo> dependencyList, ZipOutputStream zipOutputStream) {
+        String uuid = (String) primaryKey;
+        FormVo form = formMapper.getFormByUuid(uuid);
+        if (form != null) {
+            throw new FormNotFoundException(uuid);
+        }
+        FormVersionVo formVersion = formMapper.getActionFormVersionByFormUuid(uuid);
+        if (formVersion == null) {
+            throw new FormActiveVersionNotFoundExcepiton(form.getName());
+        }
+        exportHandle(formVersion, dependencyList, zipOutputStream);
+        ImportExportVo importExportVo = new ImportExportVo(this.getType().getValue(), primaryKey, formVersion.getFormName());
+        importExportVo.setDataWithObject(formVersion);
+        return importExportVo;
+    }
+
+    /**
+     * 导出处理，先导出依赖组件
+     * @param formVersion
+     * @param dependencyList
+     * @param zipOutputStream
+     */
+    private void exportHandle(FormVersionVo formVersion, List<ImportExportBaseInfoVo> dependencyList, ZipOutputStream zipOutputStream) {
+        JSONObject formConfig = formVersion.getFormConfig();
+        dependencyHandle(EXPORT, formConfig, dependencyList, zipOutputStream, null);
+    }
+
+    /**
+     * 导出处理，先导出依赖组件
+     * 导入处理，更新依赖组件的唯一标识
+     * @param action
+     * @param formConfig
+     * @param dependencyList
+     * @param zipOutputStream
+     * @param primaryChangeList
+     */
+    private void dependencyHandle(String action, JSONObject formConfig, List<ImportExportBaseInfoVo> dependencyList, ZipOutputStream zipOutputStream, List<ImportExportPrimaryChangeVo> primaryChangeList) {
+        if (MapUtils.isEmpty(formConfig)) {
+            return;
+        }
+        JSONArray tableList = formConfig.getJSONArray("tableList");
+        if (CollectionUtils.isNotEmpty(tableList)) {
+            for (int i = 0; i < tableList.size(); i++) {
+                JSONObject tableObj = tableList.getJSONObject(i);
+                if (MapUtils.isEmpty(tableObj)) {
+                    continue;
+                }
+                JSONObject component = tableObj.getJSONObject("component");
+                componentHandle(action, component, dependencyList, zipOutputStream, primaryChangeList);
+
+            }
+        }
+        JSONArray sceneList = formConfig.getJSONArray("sceneList");
+        if (CollectionUtils.isNotEmpty(sceneList)) {
+            for (int i = 0; i < sceneList.size(); i++) {
+                JSONObject sceneObj = sceneList.getJSONObject(i);
+                dependencyHandle(action, sceneObj, dependencyList, zipOutputStream, primaryChangeList);
+            }
+        }
+    }
+
+    /**
+     * 处理表单单个组件配置信息
+     * @param action
+     * @param component
+     * @param dependencyList
+     * @param zipOutputStream
+     * @param primaryChangeList
+     */
+    private void componentHandle(String action, JSONObject component, List<ImportExportBaseInfoVo> dependencyList, ZipOutputStream zipOutputStream, List<ImportExportPrimaryChangeVo> primaryChangeList) {
+        if (MapUtils.isEmpty(component)) {
+            return;
+        }
+        Boolean inherit = component.getBoolean("inherit");
+        if (Objects.equals(inherit, true)) {
+            return;
+        }
+        String handler = component.getString("handler");
+        if (handlerList.contains(handler)) {
+            // 单选框、复选框、下拉框、表格选择组件
+            JSONObject config = component.getJSONObject("config");
+            if (MapUtils.isEmpty(config)) {
+                return;
+            }
+            String dataSource = config.getString("dataSource");
+            if (!Objects.equals(dataSource, "matrix")) {
+                return;
+            }
+            String matrixUuid = config.getString("matrixUuid");
+            if (StringUtils.isBlank(matrixUuid)) {
+                return;
+            }
+            if (action == IMPORT) {
+                Object newPrimaryKey = getNewPrimaryKey(FrameworkImportExportHandlerType.MATRIX, matrixUuid, primaryChangeList);
+                if (newPrimaryKey != null) {
+                    config.put("matrixUuid", newPrimaryKey);
+                }
+            } else if (action == EXPORT) {
+                doExportData(FrameworkImportExportHandlerType.MATRIX, matrixUuid, dependencyList, zipOutputStream);
+            }
+        } else if (Objects.equals(handler, FormHandler.FORMTABLEINPUTER.getHandler())) {
+            // 表格输入组件
+            JSONObject config = component.getJSONObject("config");
+            if (MapUtils.isEmpty(config)) {
+                return;
+            }
+            JSONArray dataConfig = config.getJSONArray("dataConfig");
+            for (int i = 0; i < dataConfig.size(); i++) {
+                JSONObject dataObj = dataConfig.getJSONObject(i);
+                componentHandle(action, dataObj, dependencyList, zipOutputStream, primaryChangeList);
+            }
+        } else if (Objects.equals(handler, FormHandler.FORMTAB.getHandler()) || Objects.equals(handler, FormHandler.FORMCOLLAPSE.getHandler())) {
+            // 选项卡、折叠面板
+            JSONArray componentArray = component.getJSONArray("component");
+            for (int i = 0; i < componentArray.size(); i++) {
+                JSONObject componentObj = componentArray.getJSONObject(i);
+                componentHandle(action, componentObj, dependencyList, zipOutputStream, primaryChangeList);
+            }
+        } else if (Objects.equals(handler, FormHandler.FORMSUBASSEMBLY.getHandler())) {
+            // 子表单
+            JSONObject formData = component.getJSONObject("formData");
+            if (MapUtils.isEmpty(formData)) {
+                return;
+            }
+            JSONObject formConfig = formData.getJSONObject("formConfig");
+            dependencyHandle(action, formConfig, dependencyList, zipOutputStream, primaryChangeList);
+        }
+    }
+}
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/IntegrationImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/IntegrationImportExportHandler.java
new file mode 100644
index 000000000..40efe1d37
--- /dev/null
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/IntegrationImportExportHandler.java
@@ -0,0 +1,79 @@
+package neatlogic.module.framework.importexport.handler;
+
+import neatlogic.framework.exception.integration.IntegrationNotFoundException;
+import neatlogic.framework.importexport.constvalue.FrameworkImportExportHandlerType;
+import neatlogic.framework.importexport.core.ImportExportHandlerBase;
+import neatlogic.framework.importexport.core.ImportExportHandlerType;
+import neatlogic.framework.importexport.dto.ImportExportBaseInfoVo;
+import neatlogic.framework.importexport.dto.ImportExportPrimaryChangeVo;
+import neatlogic.framework.importexport.dto.ImportExportVo;
+import neatlogic.framework.integration.dao.mapper.IntegrationMapper;
+import neatlogic.framework.integration.dto.IntegrationVo;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.zip.ZipOutputStream;
+
+@Component
+public class IntegrationImportExportHandler extends ImportExportHandlerBase {
+
+    @Resource
+    private IntegrationMapper integrationMapper;
+
+    @Override
+    public ImportExportHandlerType getType() {
+        return FrameworkImportExportHandlerType.INTEGRATION;
+    }
+
+    @Override
+    public boolean checkImportAuth(ImportExportVo importExportVo) {
+        return true;
+    }
+
+    @Override
+    public boolean checkExportAuth(Object primaryKey) {
+        return true;
+    }
+
+    @Override
+    public boolean checkIsExists(ImportExportBaseInfoVo importExportBaseInfoVo) {
+        return integrationMapper.getIntegrationByName(importExportBaseInfoVo.getName()) != null;
+    }
+
+    @Override
+    public Object getPrimaryByName(ImportExportVo importExportVo) {
+        IntegrationVo integration = integrationMapper.getIntegrationByName(importExportVo.getName());
+        if (integration == null) {
+            throw new IntegrationNotFoundException(importExportVo.getName());
+        }
+        return integration.getUuid();
+    }
+
+    @Override
+    public Object importData(ImportExportVo importExportVo, List<ImportExportPrimaryChangeVo> primaryChangeList) {
+        IntegrationVo integration = importExportVo.getData().toJavaObject(IntegrationVo.class);
+        IntegrationVo oldIntegration = integrationMapper.getIntegrationByName(importExportVo.getName());
+        if (oldIntegration != null) {
+            integration.setUuid(oldIntegration.getUuid());
+        } else {
+            if (integrationMapper.getIntegrationByUuid(integration.getUuid()) != null) {
+                integration.setUuid(null);
+            }
+        }
+        integrationMapper.insertIntegration(integration);
+        return integration.getUuid();
+    }
+
+    @Override
+    protected ImportExportVo myExportData(Object primaryKey, List<ImportExportBaseInfoVo> dependencyList, ZipOutputStream zipOutputStream) {
+        String uuid = (String) primaryKey;
+        IntegrationVo integration = integrationMapper.getIntegrationByUuid(uuid);
+        if (integration == null) {
+            throw new IntegrationNotFoundException(uuid);
+        }
+        ImportExportVo importExportVo = new ImportExportVo(this.getType().getValue(), primaryKey, integration.getName());
+        importExportVo.setDataWithObject(integration);
+        return importExportVo;
+    }
+}
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
new file mode 100644
index 000000000..fa34d1c99
--- /dev/null
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
@@ -0,0 +1,108 @@
+package neatlogic.module.framework.importexport.handler;
+
+import neatlogic.framework.importexport.constvalue.FrameworkImportExportHandlerType;
+import neatlogic.framework.importexport.core.ImportExportHandlerBase;
+import neatlogic.framework.importexport.core.ImportExportHandlerType;
+import neatlogic.framework.importexport.dto.ImportExportBaseInfoVo;
+import neatlogic.framework.importexport.dto.ImportExportPrimaryChangeVo;
+import neatlogic.framework.importexport.dto.ImportExportVo;
+import neatlogic.framework.matrix.core.IMatrixDataSourceHandler;
+import neatlogic.framework.matrix.core.MatrixDataSourceHandlerFactory;
+import neatlogic.framework.matrix.dao.mapper.MatrixMapper;
+import neatlogic.framework.matrix.dto.MatrixVo;
+import neatlogic.framework.matrix.exception.MatrixDataSourceHandlerNotFoundException;
+import neatlogic.framework.matrix.exception.MatrixNotFoundException;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+import java.util.zip.ZipOutputStream;
+
+@Component
+public class MatrixImportExportHandler extends ImportExportHandlerBase {
+
+    @Resource
+    private MatrixMapper matrixMapper;
+
+    @Override
+    public ImportExportHandlerType getType() {
+        return FrameworkImportExportHandlerType.MATRIX;
+    }
+
+    @Override
+    public boolean checkImportAuth(ImportExportVo importExportVo) {
+        return true;
+    }
+
+    @Override
+    public boolean checkExportAuth(Object primaryKey) {
+        return true;
+    }
+
+    @Override
+    public boolean checkIsExists(ImportExportBaseInfoVo importExportBaseInfoVo) {
+        return matrixMapper.getMatrixByLabel(importExportBaseInfoVo.getName()) != null;
+    }
+
+    @Override
+    public Object getPrimaryByName(ImportExportVo importExportVo) {
+        MatrixVo matrix = matrixMapper.getMatrixByLabel(importExportVo.getName());
+        if (matrix == null) {
+            throw new MatrixNotFoundException(importExportVo.getName());
+        }
+        return matrix.getUuid();
+    }
+
+    @Override
+    public Object importData(ImportExportVo importExportVo, List<ImportExportPrimaryChangeVo> primaryChangeList) {
+        MatrixVo matrix = importExportVo.getData().toJavaObject(MatrixVo.class);
+        MatrixVo oldMatrix = matrixMapper.getMatrixByLabel(importExportVo.getName());
+        if (oldMatrix != null) {
+            matrix.setUuid(oldMatrix.getUuid());
+        } else {
+            if (matrixMapper.getMatrixByUuid(matrix.getUuid()) != null) {
+                matrix.setUuid(null);
+            }
+        }
+        IMatrixDataSourceHandler matrixDataSourceHandler = MatrixDataSourceHandlerFactory.getHandler(matrix.getType());
+        if (matrixDataSourceHandler == null) {
+            throw new MatrixDataSourceHandlerNotFoundException(matrix.getType());
+        }
+        if (Objects.equals(matrix.getType(), "external")) {
+            Object newPrimaryKey = getNewPrimaryKey(FrameworkImportExportHandlerType.INTEGRATION, matrix.getIntegrationUuid(), primaryChangeList);
+            if (newPrimaryKey != null) {
+                matrix.setIntegrationUuid((String) newPrimaryKey);
+            }
+        } else if (Objects.equals(matrix.getType(), "cmdbci")) {
+            Object newPrimaryKey = getNewPrimaryKey(FrameworkImportExportHandlerType.CMDB_CI, matrix.getId(), primaryChangeList);
+            if (newPrimaryKey != null) {
+                matrix.setCiId((Long) newPrimaryKey);
+            }
+        }
+        matrixDataSourceHandler.importMatrix(matrix);
+        return matrix.getUuid();
+    }
+
+    @Override
+    protected ImportExportVo myExportData(Object primaryKey, List<ImportExportBaseInfoVo> dependencyList, ZipOutputStream zipOutputStream) {
+        String uuid = (String) primaryKey;
+        MatrixVo matrix = matrixMapper.getMatrixByUuid(uuid);
+        if (matrix == null) {
+            throw new MatrixNotFoundException(uuid);
+        }
+        IMatrixDataSourceHandler matrixDataSourceHandler = MatrixDataSourceHandlerFactory.getHandler(matrix.getType());
+        if (matrixDataSourceHandler == null) {
+            throw new MatrixDataSourceHandlerNotFoundException(matrix.getType());
+        }
+        MatrixVo matrixVo = matrixDataSourceHandler.exportMatrix(matrix);
+        if (Objects.equals(matrix.getType(), "external")) {
+            doExportData(FrameworkImportExportHandlerType.INTEGRATION, matrixVo.getIntegrationUuid(), dependencyList, zipOutputStream);
+        } else if (Objects.equals(matrix.getType(), "cmdbci")) {
+            doExportData(FrameworkImportExportHandlerType.CMDB_CI, matrixVo.getId(), dependencyList, zipOutputStream);
+        }
+        ImportExportVo importExportVo = new ImportExportVo(this.getType().getValue(), primaryKey, matrixVo.getLabel());
+        importExportVo.setDataWithObject(matrixVo);
+        return importExportVo;
+    }
+}
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/NotifyPolicyImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/NotifyPolicyImportExportHandler.java
new file mode 100644
index 000000000..0284c4807
--- /dev/null
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/NotifyPolicyImportExportHandler.java
@@ -0,0 +1,110 @@
+package neatlogic.module.framework.importexport.handler;
+
+import neatlogic.framework.asynchronization.threadlocal.UserContext;
+import neatlogic.framework.importexport.constvalue.FrameworkImportExportHandlerType;
+import neatlogic.framework.importexport.core.ImportExportHandlerBase;
+import neatlogic.framework.importexport.core.ImportExportHandlerType;
+import neatlogic.framework.importexport.dto.ImportExportBaseInfoVo;
+import neatlogic.framework.importexport.dto.ImportExportPrimaryChangeVo;
+import neatlogic.framework.importexport.dto.ImportExportVo;
+import neatlogic.framework.notify.core.INotifyPolicyHandler;
+import neatlogic.framework.notify.core.NotifyPolicyHandlerFactory;
+import neatlogic.framework.notify.dao.mapper.NotifyMapper;
+import neatlogic.framework.notify.dto.NotifyPolicyVo;
+import neatlogic.framework.notify.exception.NotifyPolicyHandlerNotFoundException;
+import neatlogic.framework.notify.exception.NotifyPolicyNotFoundException;
+import neatlogic.framework.util.$;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+import java.util.zip.ZipOutputStream;
+
+@Component
+public class NotifyPolicyImportExportHandler extends ImportExportHandlerBase {
+
+    @Resource
+    private NotifyMapper notifyMapper;
+
+    @Override
+    public ImportExportHandlerType getType() {
+        return FrameworkImportExportHandlerType.NOTIFY_POLICY;
+    }
+
+    @Override
+    public boolean checkImportAuth(ImportExportVo importExportVo) {
+        return true;
+    }
+
+    @Override
+    public boolean checkExportAuth(Object primaryKey) {
+        return true;
+    }
+
+    @Override
+    public boolean checkIsExists(ImportExportBaseInfoVo importExportBaseInfoVo) {
+        return getNotifyPolicyByName(importExportBaseInfoVo.getName()) != null;
+    }
+
+    @Override
+    public Object getPrimaryByName(ImportExportVo importExportVo) {
+        NotifyPolicyVo notifyPolicy = getNotifyPolicyByName(importExportVo.getName());
+        if (notifyPolicy == null) {
+            throw new NotifyPolicyNotFoundException(importExportVo.getName());
+        }
+        return notifyPolicy.getId();
+    }
+
+    @Override
+    public Object importData(ImportExportVo importExportVo, List<ImportExportPrimaryChangeVo> primaryChangeList) {
+        NotifyPolicyVo notifyPolicy = importExportVo.getData().toJavaObject(NotifyPolicyVo.class);
+        NotifyPolicyVo oldNotifyPolicy = getNotifyPolicyByName(importExportVo.getName());
+        if (notifyPolicy != null) {
+            notifyPolicy.setId(oldNotifyPolicy.getId());
+            notifyPolicy.setLcu(UserContext.get().getUserUuid(true));
+            notifyMapper.updateNotifyPolicyById(notifyPolicy);
+        } else {
+            if (notifyMapper.getNotifyPolicyById(notifyPolicy.getId()) != null) {
+                notifyPolicy.setId(null);
+            }
+            notifyPolicy.setFcu(UserContext.get().getUserUuid(true));
+            notifyMapper.insertNotifyPolicy(notifyPolicy);
+        }
+        return notifyPolicy.getId();
+    }
+
+    @Override
+    protected ImportExportVo myExportData(Object primaryKey, List<ImportExportBaseInfoVo> dependencyList, ZipOutputStream zipOutputStream) {
+        Long id = (Long) primaryKey;
+        NotifyPolicyVo notifyPolicy = notifyMapper.getNotifyPolicyById(id);
+        if (notifyPolicy == null) {
+            throw new NotifyPolicyNotFoundException(id);
+        }
+        INotifyPolicyHandler notifyPolicyHandler = NotifyPolicyHandlerFactory.getHandler(notifyPolicy.getHandler());
+        if (notifyPolicyHandler == null) {
+            throw new NotifyPolicyHandlerNotFoundException(notifyPolicy.getHandler());
+        }
+        String name = $.t(notifyPolicyHandler.getName()) + "/" + notifyPolicy.getName();
+        ImportExportVo importExportVo = new ImportExportVo(this.getType().getValue(), primaryKey, name);
+        importExportVo.setDataWithObject(notifyPolicy);
+        return importExportVo;
+    }
+
+    private NotifyPolicyVo getNotifyPolicyByName(String name) {
+        String[] spilt = name.split("/");
+        String handlerName = spilt[0];
+        String notifyPolicyName = spilt[1];
+        List<NotifyPolicyVo> list = notifyMapper.getNotifyPolicyListByName(notifyPolicyName);
+        for (NotifyPolicyVo notifyPolicy : list) {
+            INotifyPolicyHandler notifyPolicyHandler = NotifyPolicyHandlerFactory.getHandler(notifyPolicy.getHandler());
+            if (notifyPolicyHandler == null) {
+                continue;
+            }
+            if (Objects.equals($.t(notifyPolicyHandler.getName()), handlerName)) {
+                return notifyPolicy;
+            }
+        }
+        return null;
+    }
+}
-- 
Gitee


From d4d2c1bb005486f9332ac69fc83eba0914515fed Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 11 Dec 2023 14:44:22 +0800
Subject: [PATCH 03/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../scheduler/core/SchedulerManager.java      | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/java/neatlogic/framework/scheduler/core/SchedulerManager.java b/src/main/java/neatlogic/framework/scheduler/core/SchedulerManager.java
index 3c1cbf502..06af43eb2 100644
--- a/src/main/java/neatlogic/framework/scheduler/core/SchedulerManager.java
+++ b/src/main/java/neatlogic/framework/scheduler/core/SchedulerManager.java
@@ -20,16 +20,20 @@ import neatlogic.framework.applicationlistener.core.ModuleInitializedListenerBas
 import neatlogic.framework.asynchronization.thread.NeatLogicThread;
 import neatlogic.framework.asynchronization.threadlocal.TenantContext;
 import neatlogic.framework.asynchronization.threadlocal.UserContext;
+import neatlogic.framework.asynchronization.threadpool.CachedThreadPool;
 import neatlogic.framework.bootstrap.NeatLogicWebApplicationContext;
 import neatlogic.framework.common.RootComponent;
 import neatlogic.framework.common.constvalue.SystemUser;
 import neatlogic.framework.dao.mapper.TenantMapper;
 import neatlogic.framework.dto.TenantVo;
+import neatlogic.framework.dto.module.ModuleGroupVo;
 import neatlogic.framework.scheduler.dao.mapper.SchedulerMapper;
 import neatlogic.framework.scheduler.dto.JobClassVo;
 import neatlogic.framework.scheduler.dto.JobLockVo;
 import neatlogic.framework.scheduler.dto.JobObject;
 import neatlogic.framework.scheduler.dto.JobStatusVo;
+import neatlogic.framework.util.$;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.*;
 import org.slf4j.Logger;
@@ -38,6 +42,7 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RootComponent
 public class SchedulerManager extends ModuleInitializedListenerBase {
@@ -209,18 +214,18 @@ public class SchedulerManager extends ModuleInitializedListenerBase {
                 publicJobClassList.add(jobClassVo);
             }
         }
-//        if (CollectionUtils.isNotEmpty(tmpJobHandlerList)) {
-//            System.out.println("⚡" + $.t("common.startloadschedulejob", context.getModuleId()));
-//            for (TenantVo tenantVo : tenantList) {
-//                TenantContext.get().switchTenant(tenantVo.getUuid()).setUseDefaultDatasource(false);
-//                List<ModuleGroupVo> activeModuleGroupList = TenantContext.get().getActiveModuleGroupList();
-//                TenantContext.get().switchTenant(tenantVo.getUuid()).setUseDefaultDatasource(true);
-//                if (activeModuleGroupList.stream().map(ModuleGroupVo::getGroup).collect(Collectors.toList()).contains(context.getGroup())) {
-//                    CachedThreadPool.execute(new ScheduleLoadJobRunner(tenantVo.getUuid(), tmpJobHandlerList));
-//                    System.out.println("  ✓" + tenantVo.getName());
-//                }
-//            }
-//        }
+        if (CollectionUtils.isNotEmpty(tmpJobHandlerList)) {
+            System.out.println("⚡" + $.t("common.startloadschedulejob", context.getModuleId()));
+            for (TenantVo tenantVo : tenantList) {
+                TenantContext.get().switchTenant(tenantVo.getUuid()).setUseDefaultDatasource(false);
+                List<ModuleGroupVo> activeModuleGroupList = TenantContext.get().getActiveModuleGroupList();
+                TenantContext.get().switchTenant(tenantVo.getUuid()).setUseDefaultDatasource(true);
+                if (activeModuleGroupList.stream().map(ModuleGroupVo::getGroup).collect(Collectors.toList()).contains(context.getGroup())) {
+                    CachedThreadPool.execute(new ScheduleLoadJobRunner(tenantVo.getUuid(), tmpJobHandlerList));
+                    System.out.println("  ✓" + tenantVo.getName());
+                }
+            }
+        }
         // TODO 这里要增加清理job_status的逻辑
     }
 
-- 
Gitee


From 7970f9f8132909350747e8034413e2aca1c31ee8 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 11 Dec 2023 14:50:38 +0800
Subject: [PATCH 04/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../integration/dao/mapper/IntegrationMapper.xml          | 8 --------
 .../handler/IntegrationImportExportHandler.java           | 6 +++++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.xml b/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.xml
index b11198a34..2106076ae 100644
--- a/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.xml
+++ b/src/main/java/neatlogic/framework/integration/dao/mapper/IntegrationMapper.xml
@@ -261,14 +261,6 @@ limitations under the License.
 		NOW(3),
 		#{fcu}
 		)
-		ON DUPLICATE KEY UPDATE
-		 `name` = #{name},
-		 `url` = #{url},
-		 `handler` = #{handler},
-		 `method` = #{method},
-		 `config` = #{configStr},
-		 `lcd` = NOW(3),
-		 `lcu` = #{lcu}
 	</insert>
 
 	<insert id="insertIntegrationAudit" parameterType="neatlogic.framework.integration.dto.IntegrationAuditVo">
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/IntegrationImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/IntegrationImportExportHandler.java
index 40efe1d37..4a1591890 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/IntegrationImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/IntegrationImportExportHandler.java
@@ -1,5 +1,6 @@
 package neatlogic.module.framework.importexport.handler;
 
+import neatlogic.framework.asynchronization.threadlocal.UserContext;
 import neatlogic.framework.exception.integration.IntegrationNotFoundException;
 import neatlogic.framework.importexport.constvalue.FrameworkImportExportHandlerType;
 import neatlogic.framework.importexport.core.ImportExportHandlerBase;
@@ -56,12 +57,15 @@ public class IntegrationImportExportHandler extends ImportExportHandlerBase {
         IntegrationVo oldIntegration = integrationMapper.getIntegrationByName(importExportVo.getName());
         if (oldIntegration != null) {
             integration.setUuid(oldIntegration.getUuid());
+            integration.setLcu(UserContext.get().getUserUuid());
+            integrationMapper.updateIntegration(integration);
         } else {
             if (integrationMapper.getIntegrationByUuid(integration.getUuid()) != null) {
                 integration.setUuid(null);
             }
+            integration.setFcu(UserContext.get().getUserUuid());
+            integrationMapper.insertIntegration(integration);
         }
-        integrationMapper.insertIntegration(integration);
         return integration.getUuid();
     }
 
-- 
Gitee


From 41ecbc69c5dccb243e73e985f2765307a8dc24ce Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 11 Dec 2023 14:56:29 +0800
Subject: [PATCH 05/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../handler/MatrixImportExportHandler.java    | 26 +++++++++++--------
 .../NotifyPolicyImportExportHandler.java      |  2 +-
 .../handler/CustomDataSourceHandler.java      |  2 ++
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
index fa34d1c99..274968ba7 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
@@ -42,27 +42,31 @@ public class MatrixImportExportHandler extends ImportExportHandlerBase {
 
     @Override
     public boolean checkIsExists(ImportExportBaseInfoVo importExportBaseInfoVo) {
-        return matrixMapper.getMatrixByLabel(importExportBaseInfoVo.getName()) != null;
+        return matrixMapper.getMatrixByLabel(importExportBaseInfoVo.getName()) != null
+                || matrixMapper.getMatrixByUuid((String) importExportBaseInfoVo.getPrimaryKey()) != null;
     }
 
     @Override
     public Object getPrimaryByName(ImportExportVo importExportVo) {
-        MatrixVo matrix = matrixMapper.getMatrixByLabel(importExportVo.getName());
-        if (matrix == null) {
-            throw new MatrixNotFoundException(importExportVo.getName());
+        MatrixVo matrix = matrixMapper.getMatrixByUuid((String) importExportVo.getPrimaryKey());
+        if (matrix != null) {
+            return matrix.getUuid();
         }
-        return matrix.getUuid();
+        matrix = matrixMapper.getMatrixByLabel(importExportVo.getName());
+        if (matrix != null) {
+            return matrix.getUuid();
+        }
+        throw new MatrixNotFoundException(importExportVo.getName());
     }
 
     @Override
     public Object importData(ImportExportVo importExportVo, List<ImportExportPrimaryChangeVo> primaryChangeList) {
         MatrixVo matrix = importExportVo.getData().toJavaObject(MatrixVo.class);
-        MatrixVo oldMatrix = matrixMapper.getMatrixByLabel(importExportVo.getName());
-        if (oldMatrix != null) {
-            matrix.setUuid(oldMatrix.getUuid());
-        } else {
-            if (matrixMapper.getMatrixByUuid(matrix.getUuid()) != null) {
-                matrix.setUuid(null);
+        MatrixVo oldMatrix = matrixMapper.getMatrixByUuid(matrix.getUuid());
+        if (oldMatrix == null) {
+            oldMatrix = matrixMapper.getMatrixByLabel(importExportVo.getName());
+            if (oldMatrix != null) {
+                matrix.setUuid(oldMatrix.getUuid());
             }
         }
         IMatrixDataSourceHandler matrixDataSourceHandler = MatrixDataSourceHandlerFactory.getHandler(matrix.getType());
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/NotifyPolicyImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/NotifyPolicyImportExportHandler.java
index 0284c4807..6409635c2 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/NotifyPolicyImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/NotifyPolicyImportExportHandler.java
@@ -60,7 +60,7 @@ public class NotifyPolicyImportExportHandler extends ImportExportHandlerBase {
     public Object importData(ImportExportVo importExportVo, List<ImportExportPrimaryChangeVo> primaryChangeList) {
         NotifyPolicyVo notifyPolicy = importExportVo.getData().toJavaObject(NotifyPolicyVo.class);
         NotifyPolicyVo oldNotifyPolicy = getNotifyPolicyByName(importExportVo.getName());
-        if (notifyPolicy != null) {
+        if (oldNotifyPolicy != null) {
             notifyPolicy.setId(oldNotifyPolicy.getId());
             notifyPolicy.setLcu(UserContext.get().getUserUuid(true));
             notifyMapper.updateNotifyPolicyById(notifyPolicy);
diff --git a/src/main/java/neatlogic/module/framework/matrix/handler/CustomDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/handler/CustomDataSourceHandler.java
index 5a9fc401b..9b743e224 100644
--- a/src/main/java/neatlogic/module/framework/matrix/handler/CustomDataSourceHandler.java
+++ b/src/main/java/neatlogic/module/framework/matrix/handler/CustomDataSourceHandler.java
@@ -117,6 +117,8 @@ public class CustomDataSourceHandler extends MatrixDataSourceHandlerBase {
                 attributeVo.setUuid(targetAttributeUuid);
                 attributeMapper.insertMatrixAttribute(attributeVo);
             }
+            sourceColumnList.add("sort");
+            targetColumnList.add("sort");
             attributeMapper.createMatrixDynamicTable(attributeVoList, targetUuid);
             //数据拷贝
             matrixDataMapper.insertDynamicTableDataForCopy(sourceUuid, sourceColumnList, targetUuid, targetColumnList);
-- 
Gitee


From 82383237d199e29b7abd0ba5a4e8ca2926767fc6 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 11 Dec 2023 15:43:38 +0800
Subject: [PATCH 06/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../form/service/IFormCrossoverService.java   |  10 +-
 .../framework/form/service/FormService.java   |   8 --
 .../form/service/FormServiceImpl.java         | 131 ------------------
 3 files changed, 1 insertion(+), 148 deletions(-)

diff --git a/src/main/java/neatlogic/framework/form/service/IFormCrossoverService.java b/src/main/java/neatlogic/framework/form/service/IFormCrossoverService.java
index 7193738ea..6c4e0f73f 100644
--- a/src/main/java/neatlogic/framework/form/service/IFormCrossoverService.java
+++ b/src/main/java/neatlogic/framework/form/service/IFormCrossoverService.java
@@ -17,12 +17,11 @@ limitations under the License.
 package neatlogic.framework.form.service;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.crossover.ICrossoverService;
 import neatlogic.framework.form.dto.AttributeDataVo;
 import neatlogic.framework.form.dto.FormAttributeVo;
-import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.form.dto.FormVersionVo;
-import neatlogic.framework.form.dto.FormVo;
 import neatlogic.framework.form.exception.AttributeValidException;
 
 import java.util.List;
@@ -71,11 +70,4 @@ public interface IFormCrossoverService extends ICrossoverService {
      * @return
      */
     String getFormAttributeHandler(String attributeUuid, String formConfig);
-
-    /**
-     * 保存表单
-     * @param formVo
-     * @return
-     */
-    JSONObject saveForm(FormVo formVo);
 }
diff --git a/src/main/java/neatlogic/module/framework/form/service/FormService.java b/src/main/java/neatlogic/module/framework/form/service/FormService.java
index 3659e005f..7841665b9 100644
--- a/src/main/java/neatlogic/module/framework/form/service/FormService.java
+++ b/src/main/java/neatlogic/module/framework/form/service/FormService.java
@@ -22,7 +22,6 @@ import neatlogic.framework.common.dto.ValueTextVo;
 import neatlogic.framework.form.dto.AttributeDataVo;
 import neatlogic.framework.form.dto.FormAttributeVo;
 import neatlogic.framework.form.dto.FormVersionVo;
-import neatlogic.framework.form.dto.FormVo;
 import neatlogic.framework.form.exception.AttributeValidException;
 
 import java.util.List;
@@ -90,11 +89,4 @@ public interface FormService {
      * @return
      */
     String getFormAttributeHandler(String attributeUuid, String formConfig);
-
-    /**
-     * 保存表单
-     * @param formVo
-     * @return
-     */
-    JSONObject saveForm(FormVo formVo);
 }
diff --git a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
index 8cbd3035a..b4cb7afef 100644
--- a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
+++ b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
@@ -662,137 +662,6 @@ public class FormServiceImpl implements FormService, IFormCrossoverService {
         return getFormAttributeHandler(attributeUuid, JSONObject.parseObject(formConfig));
     }
 
-    @Override
-    public JSONObject saveForm(FormVo formVo) {
-        JSONObject resultObj = new JSONObject();
-        String formUuid = formVo.getUuid();
-        String currentVersionUuid = formVo.getCurrentVersionUuid();
-        resultObj.put("uuid", formUuid);
-        boolean updateName = true;
-        boolean updateFormConfig = true;
-        boolean formIsExists = false;
-        Integer oldFormVersionIsActive = 0;
-        FormVo oldFormVo = formMapper.getFormByUuid(formUuid);
-        if (oldFormVo != null) {
-            formIsExists = true;
-            if (Objects.equals(oldFormVo.getName(), formVo.getName())) {
-                updateName = false;
-            }
-            if (StringUtils.isNotBlank(currentVersionUuid)) {
-                FormVersionVo oldFormVersionVo = formMapper.getFormVersionByUuid(currentVersionUuid);
-                if (oldFormVersionVo == null) {
-                    throw new FormVersionNotFoundException(currentVersionUuid);
-                }
-                oldFormVersionIsActive = oldFormVersionVo.getIsActive();
-                resultObj.put("currentVersionUuid", oldFormVersionVo.getUuid());
-                resultObj.put("currentVersion", oldFormVersionVo.getVersion());
-                if (Objects.equals(oldFormVersionVo.getFormConfig(), formVo.getFormConfig())) {
-                    updateFormConfig = false;
-                } else {
-                    formMapper.deleteFormAttributeMatrixByFormVersionUuid(currentVersionUuid);
-                    List<FormAttributeVo> formAttributeList = oldFormVersionVo.getFormAttributeList();
-                    if (CollectionUtils.isNotEmpty(formAttributeList)) {
-                        for (FormAttributeVo formAttributeVo : formAttributeList) {
-                            DependencyManager.delete(MatrixAttr2FormAttrDependencyHandler.class, formAttributeVo.getUuid());
-                            DependencyManager.delete(Integration2FormAttrDependencyHandler.class, formAttributeVo.getUuid());
-                        }
-                    }
-                }
-            }
-        }
-        if (updateName && formMapper.checkFormNameIsRepeat(formVo) > 0) {
-            throw new FormNameRepeatException(formVo.getName());
-        }
-        if (!updateName && !updateFormConfig) {
-            //如果表单名和配置信息都没有更新，就直接返回
-            return resultObj;
-        } else if (!updateFormConfig) {
-            //只更新表单名信息
-            formMapper.updateForm(formVo);
-            return resultObj;
-        } else {
-            FormVersionVo formVersionVo = new FormVersionVo();
-            formVersionVo.setFormConfig(formVo.getFormConfig());
-            formVersionVo.setFormUuid(formUuid);
-            if (StringUtils.isNotBlank(currentVersionUuid)) {
-                formVersionVo.setUuid(currentVersionUuid);
-                formVersionVo.setIsActive(oldFormVersionIsActive);
-            } else {
-                formVersionVo.getUuid();
-            }
-            List<FormAttributeVo> formAttributeList = formVersionVo.getFormAttributeList();
-            if (CollectionUtils.isNotEmpty(formAttributeList)) {
-                //判断组件名是否重复
-                List<String> attributeNameList = formAttributeList.stream().map(FormAttributeVo::getLabel).collect(Collectors.toList());
-                List<String> nameList = new ArrayList<>();
-                for (int i = 0; i < attributeNameList.size(); i++) {
-                    String name = attributeNameList.get(i);
-                    if (i == 0) {
-                        nameList.add(name);
-                        continue;
-                    }
-                    if (nameList.contains(name)) {
-                        throw new FormAttributeNameIsRepeatException(name);
-                    }
-                    nameList.add(name);
-                }
-            }
-            //判断表单是否存在
-            if (!formIsExists) {
-                //插入表单信息
-                formMapper.insertForm(formVo);
-            } else {
-                //更新表单信息
-                formMapper.updateForm(formVo);
-            }
-
-            //插入表单版本信息
-            if (StringUtils.isBlank(currentVersionUuid)) {
-                Integer version = formMapper.getMaxVersionByFormUuid(formUuid);
-                if (version == null) {//如果表单没有激活版本时，设置当前版本号为1，且为激活版本
-                    version = 1;
-                    formVersionVo.setIsActive(1);
-                } else {
-                    version += 1;
-                    formVersionVo.setIsActive(0);
-                    //另存为新版时，需要对表单组件的uuid重新生成新值，既同一个表单的不同版本中组件uuid不同
-                    if (CollectionUtils.isNotEmpty(formAttributeList)) {
-                        String formConfigStr = formVersionVo.getFormConfig().toJSONString();
-                        for (FormAttributeVo formAttributeVo : formAttributeList) {
-                            String oldUuid = formAttributeVo.getUuid();
-                            String newUuid = UuidUtil.randomUuid();
-                            formConfigStr = formConfigStr.replace(oldUuid, newUuid);
-                        }
-                        formVersionVo.setFormConfig(JSONObject.parseObject(formConfigStr));
-                        formVersionVo.setFormAttributeList(null);
-                        formAttributeList = formVersionVo.getFormAttributeList();
-                    }
-                }
-                formVersionVo.setVersion(version);
-                formMapper.insertFormVersion(formVersionVo);
-                resultObj.put("currentVersionUuid", formVersionVo.getUuid());
-                resultObj.put("currentVersion", formVersionVo.getVersion());
-            } else {
-                formMapper.updateFormVersion(formVersionVo);
-            }
-            //保存激活版本时，更新表单属性信息
-            if (Objects.equals(formVersionVo.getIsActive(), 1)) {
-                formMapper.deleteFormAttributeByFormUuid(formUuid);
-            }
-            if (CollectionUtils.isNotEmpty(formAttributeList)) {
-                IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class);
-                for (FormAttributeVo formAttributeVo : formAttributeList) {
-                    //保存激活版本时，更新表单属性信息
-                    if (Objects.equals(formVersionVo.getIsActive(), 1)) {
-                        formMapper.insertFormAttribute(formAttributeVo);
-                    }
-                    formCrossoverService.saveDependency(formAttributeVo);
-                }
-            }
-            return resultObj;
-        }
-    }
-
     private List<FormAttributeVo> getAllFormAttributeList(JSONArray tableList) {
         List<FormAttributeVo> resultList = new ArrayList<>();
         if (CollectionUtils.isEmpty(tableList)) {
-- 
Gitee


From 1e06a8b3a721f17ebba40c57132871192ebb5106 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 11 Dec 2023 15:45:16 +0800
Subject: [PATCH 07/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../module/framework/form/service/FormServiceImpl.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
index b4cb7afef..29568c82b 100644
--- a/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
+++ b/src/main/java/neatlogic/module/framework/form/service/FormServiceImpl.java
@@ -19,17 +19,16 @@ package neatlogic.module.framework.form.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.common.dto.ValueTextVo;
-import neatlogic.framework.crossover.CrossoverServiceFactory;
 import neatlogic.framework.dependency.core.DependencyManager;
 import neatlogic.framework.form.attribute.core.FormAttributeHandlerFactory;
 import neatlogic.framework.form.attribute.core.IFormAttributeHandler;
 import neatlogic.framework.form.constvalue.FormHandler;
 import neatlogic.framework.form.dao.mapper.FormMapper;
-import neatlogic.framework.form.dto.*;
+import neatlogic.framework.form.dto.AttributeDataVo;
+import neatlogic.framework.form.dto.FormAttributeMatrixVo;
+import neatlogic.framework.form.dto.FormAttributeVo;
+import neatlogic.framework.form.dto.FormVersionVo;
 import neatlogic.framework.form.exception.AttributeValidException;
-import neatlogic.framework.form.exception.FormAttributeNameIsRepeatException;
-import neatlogic.framework.form.exception.FormNameRepeatException;
-import neatlogic.framework.form.exception.FormVersionNotFoundException;
 import neatlogic.framework.form.service.IFormCrossoverService;
 import neatlogic.framework.matrix.constvalue.SearchExpression;
 import neatlogic.framework.matrix.core.IMatrixDataSourceHandler;
@@ -42,7 +41,6 @@ import neatlogic.framework.matrix.dto.MatrixKeywordFilterVo;
 import neatlogic.framework.matrix.dto.MatrixVo;
 import neatlogic.framework.matrix.exception.MatrixDataSourceHandlerNotFoundException;
 import neatlogic.framework.matrix.exception.MatrixNotFoundException;
-import neatlogic.framework.util.UuidUtil;
 import neatlogic.module.framework.dependency.handler.Integration2FormAttrDependencyHandler;
 import neatlogic.module.framework.dependency.handler.MatrixAttr2FormAttrDependencyHandler;
 import org.apache.commons.collections4.CollectionUtils;
-- 
Gitee


From 372b2ba086f31f66abca03dc94b2acefbfa7bfa1 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 11 Dec 2023 18:09:19 +0800
Subject: [PATCH 08/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../handler/FormImportExportHandler.java      | 105 +++++++++++++++---
 1 file changed, 90 insertions(+), 15 deletions(-)

diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
index fd4ce493c..591c97ba0 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
@@ -2,9 +2,12 @@ package neatlogic.module.framework.importexport.handler;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.asynchronization.threadlocal.UserContext;
 import neatlogic.framework.crossover.CrossoverServiceFactory;
+import neatlogic.framework.dependency.core.DependencyManager;
 import neatlogic.framework.form.constvalue.FormHandler;
 import neatlogic.framework.form.dao.mapper.FormMapper;
+import neatlogic.framework.form.dto.FormAttributeVo;
 import neatlogic.framework.form.dto.FormVersionVo;
 import neatlogic.framework.form.dto.FormVo;
 import neatlogic.framework.form.exception.FormActiveVersionNotFoundExcepiton;
@@ -16,6 +19,8 @@ import neatlogic.framework.importexport.core.ImportExportHandlerType;
 import neatlogic.framework.importexport.dto.ImportExportBaseInfoVo;
 import neatlogic.framework.importexport.dto.ImportExportPrimaryChangeVo;
 import neatlogic.framework.importexport.dto.ImportExportVo;
+import neatlogic.module.framework.dependency.handler.Integration2FormAttrDependencyHandler;
+import neatlogic.module.framework.dependency.handler.MatrixAttr2FormAttrDependencyHandler;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -65,33 +70,91 @@ public class FormImportExportHandler extends ImportExportHandlerBase {
 
     @Override
     public Object getPrimaryByName(ImportExportVo importExportVo) {
-        FormVo form = formMapper.getFormByName(importExportVo.getName());
-        if (form == null) {
-            throw new FormNotFoundException(importExportVo.getName());
+        FormVo form = formMapper.getFormByUuid((String) importExportVo.getPrimaryKey());
+        if (form != null) {
+            return form.getUuid();
         }
-        return form.getUuid();
+        form = formMapper.getFormByName(importExportVo.getName());
+        if (form != null) {
+            return form.getUuid();
+        }
+        throw new FormNotFoundException(importExportVo.getName());
     }
 
     @Override
     public Object importData(ImportExportVo importExportVo, List<ImportExportPrimaryChangeVo> primaryChangeList) {
         FormVersionVo formVersion = importExportVo.getData().toJavaObject(FormVersionVo.class);
+        // 处理表单基本信息
         FormVo form = new FormVo();
-        if (formMapper.getFormByUuid(formVersion.getFormUuid()) != null) {
-            form.setUuid(formVersion.getFormUuid());
-        } else {
-            FormVo oldForm = formMapper.getFormByName(formVersion.getFormName());
+        form.setUuid(formVersion.getFormUuid());
+        form.setName(formVersion.getFormName());
+        form.setIsActive(1);
+        form.setFcu(UserContext.get().getUserUuid());
+        FormVo oldForm = formMapper.getFormByUuid(formVersion.getFormUuid());
+        if (oldForm == null) {
+            oldForm = formMapper.getFormByName(formVersion.getFormName());
             if (oldForm != null) {
                 form.setUuid(oldForm.getUuid());
             }
         }
-        form.setName(formVersion.getFormName());
-        if (formMapper.getFormVersionByUuid(formVersion.getUuid()) != null) {
-            form.setCurrentVersionUuid(formVersion.getUuid());
+        if (oldForm != null) {
+            if (Objects.equals(oldForm.getIsActive(), 1) || Objects.equals(oldForm.getName(), form.getName())) {
+                formMapper.updateForm(form);
+            }
+        } else {
+            formMapper.insertForm(form);
         }
+
         importHandle(formVersion, primaryChangeList);
-        form.setFormConfig(formVersion.getFormConfig());
+
+        // 处理表单版本
+        formVersion.setFormUuid(form.getUuid());
+        formVersion.setIsActive(0);
+        FormVersionVo oldFormVersion = formMapper.getFormVersionByUuid(formVersion.getUuid());
+        if (oldFormVersion != null) {
+            // 删除依赖
+            formMapper.deleteFormAttributeMatrixByFormVersionUuid(oldFormVersion.getUuid());
+            List<FormAttributeVo> formAttributeList = oldFormVersion.getFormAttributeList();
+            if (CollectionUtils.isNotEmpty(formAttributeList)) {
+                for (FormAttributeVo formAttributeVo : formAttributeList) {
+                    DependencyManager.delete(MatrixAttr2FormAttrDependencyHandler.class, formAttributeVo.getUuid());
+                    DependencyManager.delete(Integration2FormAttrDependencyHandler.class, formAttributeVo.getUuid());
+                }
+            }
+            formMapper.updateFormVersion(formVersion);
+        } else {
+            Integer version = formMapper.getMaxVersionByFormUuid(form.getUuid());
+            if (version == null) {
+                version = 1;
+            } else {
+                version += 1;
+            }
+            formVersion.setVersion(version);
+            formMapper.insertFormVersion(formVersion);
+        }
+
         IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class);
-        formCrossoverService.saveForm(form);
+        // 插入依赖
+        List<FormAttributeVo> formAttributeList = formVersion.getFormAttributeList();
+        for (FormAttributeVo formAttributeVo : formAttributeList) {
+            formCrossoverService.saveDependency(formAttributeVo);
+        }
+        // 激活版本
+        FormVersionVo oldActiveFormVersion = formMapper.getActionFormVersionByFormUuid(form.getUuid());
+        if (oldActiveFormVersion != null) {
+            formMapper.resetFormVersionIsActiveByFormUuid(formVersion.getFormUuid());
+        }
+        FormVersionVo updateIsActive = new FormVersionVo();
+        updateIsActive.setUuid(formVersion.getUuid());
+        //将当前版本设置为激活版本
+        updateIsActive.setIsActive(1);
+        formMapper.updateFormVersion(updateIsActive);
+        formMapper.deleteFormAttributeByFormUuid(formVersion.getFormUuid());
+        if (CollectionUtils.isNotEmpty(formAttributeList)) {
+            for (FormAttributeVo formAttributeVo : formAttributeList) {
+                formMapper.insertFormAttribute(formAttributeVo);
+            }
+        }
         return form.getUuid();
     }
 
@@ -109,7 +172,7 @@ public class FormImportExportHandler extends ImportExportHandlerBase {
     protected ImportExportVo myExportData(Object primaryKey, List<ImportExportBaseInfoVo> dependencyList, ZipOutputStream zipOutputStream) {
         String uuid = (String) primaryKey;
         FormVo form = formMapper.getFormByUuid(uuid);
-        if (form != null) {
+        if (form == null) {
             throw new FormNotFoundException(uuid);
         }
         FormVersionVo formVersion = formMapper.getActionFormVersionByFormUuid(uuid);
@@ -215,7 +278,19 @@ public class FormImportExportHandler extends ImportExportHandlerBase {
             JSONArray dataConfig = config.getJSONArray("dataConfig");
             for (int i = 0; i < dataConfig.size(); i++) {
                 JSONObject dataObj = dataConfig.getJSONObject(i);
-                componentHandle(action, dataObj, dependencyList, zipOutputStream, primaryChangeList);
+                if (Objects.equals(dataObj.getString("handler"), "formtable")) {
+                    JSONObject config1 = dataObj.getJSONObject("config");
+                    if (MapUtils.isEmpty(config1)) {
+                        continue;
+                    }
+                    JSONArray dataConfig1 = config1.getJSONArray("dataConfig");
+                    for (int j = 0; j < dataConfig1.size(); j++) {
+                        JSONObject dataObj1 = dataConfig1.getJSONObject(j);
+                        componentHandle(action, dataObj1, dependencyList, zipOutputStream, primaryChangeList);
+                    }
+                } else {
+                    componentHandle(action, dataObj, dependencyList, zipOutputStream, primaryChangeList);
+                }
             }
         } else if (Objects.equals(handler, FormHandler.FORMTAB.getHandler()) || Objects.equals(handler, FormHandler.FORMCOLLAPSE.getHandler())) {
             // 选项卡、折叠面板
-- 
Gitee


From 9e4cdc52eee40e1d59c997b5046f8e129bc3d3ce Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 11 Dec 2023 18:11:14 +0800
Subject: [PATCH 09/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../core/ImportExportHandlerFactory.java      | 19 ++++++++++++++++---
 .../handler/FormImportExportHandler.java      |  2 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerFactory.java b/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerFactory.java
index 43a0cb821..deba5e016 100644
--- a/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerFactory.java
+++ b/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerFactory.java
@@ -102,7 +102,7 @@ public class ImportExportHandlerFactory extends ModuleInitializedListenerBase {
         if (StringUtils.isNotBlank(userSelection)) {
             JSONObject userSelectionObj = JSONObject.parseObject(userSelection);
             if (MapUtils.isNotEmpty(userSelectionObj)) {
-                checkAll = userSelectionObj.getBooleanValue("checkAll");
+                checkAll = userSelectionObj.getBooleanValue("checkedAll");
                 JSONArray typeArray = userSelectionObj.getJSONArray("typeList");
                 if (CollectionUtils.isNotEmpty(typeArray)) {
                     typeList = typeArray.toJavaList(ImportDependencyTypeVo.class);
@@ -144,16 +144,29 @@ public class ImportExportHandlerFactory extends ModuleInitializedListenerBase {
                         if (!Objects.equals(mainImportExportVo.getType(), targetType)) {
                             throw new ImportExportTypeInconsistencyException(mainImportExportVo.getType(), targetType);
                         }
+                        boolean alreadyExists = false;
+                        JSONObject resultObj = new JSONObject();
+                        ImportExportBaseInfoVo mainImportExportBaseInfoVo = new ImportExportBaseInfoVo(mainImportExportVo.getType(), mainImportExportVo.getPrimaryKey(), mainImportExportVo.getName());
+                        if (importExportHandler.checkIsExists(mainImportExportBaseInfoVo)) {
+                            mainImportExportBaseInfoVo.setType(importExportHandler.getType().getText());
+                            resultObj.put("alreadyExists", mainImportExportBaseInfoVo);
+                            alreadyExists = true;
+                        }
                         List<ImportExportBaseInfoVo> dependencyBaseInfoList = mainImportExportVo.getDependencyBaseInfoList();
                         if (CollectionUtils.isNotEmpty(dependencyBaseInfoList) && StringUtils.isBlank(userSelection)) {
                             List<ImportDependencyTypeVo> importDependencyTypeList = importExportHandler.checkDependencyList(dependencyBaseInfoList);
                             if (CollectionUtils.isNotEmpty(importDependencyTypeList)) {
-                                JSONObject resultObj = new JSONObject();
                                 resultObj.put("checkedAll", false);
                                 resultObj.put("typeList", importDependencyTypeList);
                                 return resultObj;
+                            } else {
+                                checkAll = true;
+                                resultObj.put("checkedAll", true);
+                                resultObj.put("typeList", new ArrayList<>());
                             }
-                            checkAll = true;
+                        }
+                        if (alreadyExists) {
+                            return resultObj;
                         }
                     }
                 }
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
index 591c97ba0..ceacb072a 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/FormImportExportHandler.java
@@ -121,6 +121,7 @@ public class FormImportExportHandler extends ImportExportHandlerBase {
                     DependencyManager.delete(Integration2FormAttrDependencyHandler.class, formAttributeVo.getUuid());
                 }
             }
+            formVersion.setLcu(UserContext.get().getUserUuid());
             formMapper.updateFormVersion(formVersion);
         } else {
             Integer version = formMapper.getMaxVersionByFormUuid(form.getUuid());
@@ -130,6 +131,7 @@ public class FormImportExportHandler extends ImportExportHandlerBase {
                 version += 1;
             }
             formVersion.setVersion(version);
+            formVersion.setFcu(UserContext.get().getUserUuid());
             formMapper.insertFormVersion(formVersion);
         }
 
-- 
Gitee


From e3dfd2cfa1530cbb105e53dfba6bd9fd8b5398b2 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Tue, 12 Dec 2023 11:22:26 +0800
Subject: [PATCH 10/10] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?-IT=E6=9C=8D=E5=8A=A1=E8=B7=A8=E7=8E=AF=E5=A2=83=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=86=8D=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1031708374171648]后端-IT服务跨环境导出再导入 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1031708374171648
---
 .../constvalue/FrameworkImportExportHandlerType.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/framework/importexport/constvalue/FrameworkImportExportHandlerType.java b/src/main/java/neatlogic/framework/importexport/constvalue/FrameworkImportExportHandlerType.java
index 8b0383403..0da6bd498 100644
--- a/src/main/java/neatlogic/framework/importexport/constvalue/FrameworkImportExportHandlerType.java
+++ b/src/main/java/neatlogic/framework/importexport/constvalue/FrameworkImportExportHandlerType.java
@@ -20,7 +20,7 @@ import neatlogic.framework.importexport.core.ImportExportHandlerType;
 import neatlogic.framework.util.$;
 
 public enum FrameworkImportExportHandlerType implements ImportExportHandlerType {
-    FILE("file", "common.attachment"),
+    FILE("file", "附件"),
     INTEGRATION("integration", "集成"),
     FORM("form", "表单"),
     MATRIX("matrix", "矩阵"),
-- 
Gitee