From adbfddf638d6492ff7737f012889f610284ca3a5 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Wed, 28 Feb 2024 16:58:21 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1081086489100288]流程管理-流程导入异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1081086489100288
---
 .../handler/MatrixImportExportHandler.java    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

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 9bcc812b0..773e39498 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
@@ -1,5 +1,6 @@
 package neatlogic.module.framework.importexport.handler;
 
+import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.exception.core.ApiRuntimeException;
 import neatlogic.framework.importexport.constvalue.FrameworkImportExportHandlerType;
 import neatlogic.framework.importexport.core.ImportExportHandler;
@@ -17,6 +18,8 @@ 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.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -95,6 +98,19 @@ public class MatrixImportExportHandler extends ImportExportHandlerBase {
             }
             ImportExportBaseInfoVo importExportBaseInfoVo = new ImportExportBaseInfoVo();
             importExportBaseInfoVo.setPrimaryKey(matrix.getCiId());
+            JSONObject config = matrix.getConfig();
+            if (MapUtils.isNotEmpty(config)) {
+                String name = "";
+                String ciLabel = config.getString("ciLabel");
+                if (StringUtils.isNotBlank(ciLabel)) {
+                    name = name + ciLabel;
+                }
+                String ciName = config.getString("ciName");
+                if (StringUtils.isNotBlank(ciName)) {
+                    name = name + "(" + ciName + ")";
+                }
+                importExportBaseInfoVo.setName(name);
+            }
             importExportBaseInfoVo.setType(FrameworkImportExportHandlerType.CMDB_CI.getValue());
             try {
                 importExportHandler.checkIsExists(importExportBaseInfoVo);
@@ -129,6 +145,19 @@ public class MatrixImportExportHandler extends ImportExportHandlerBase {
             }
             ImportExportBaseInfoVo importExportBaseInfoVo = new ImportExportBaseInfoVo();
             importExportBaseInfoVo.setPrimaryKey(matrixVo.getCiId());
+            JSONObject config = matrixVo.getConfig();
+            if (MapUtils.isNotEmpty(config)) {
+                String name = "";
+                String ciLabel = config.getString("ciLabel");
+                if (StringUtils.isNotBlank(ciLabel)) {
+                    name = name + ciLabel;
+                }
+                String ciName = config.getString("ciName");
+                if (StringUtils.isNotBlank(ciName)) {
+                    name = name + "(" + ciName + ")";
+                }
+                importExportBaseInfoVo.setName(name);
+            }
             importExportBaseInfoVo.setType(FrameworkImportExportHandlerType.CMDB_CI.getValue());
             try {
                 importExportHandler.checkIsExists(importExportBaseInfoVo);
-- 
Gitee