From 3cecdcc9f87c58840ace323291d5079e96408451 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Tue, 12 Dec 2023 23:13:49 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E4=B8=AD=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9A=84=E5=8F=96=E5=80=BC=EF=BC=8C=E7=94=B1=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=A8=A1=E5=9E=8B=E7=9A=84=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=94=B9=E6=88=90=E5=85=A8=E5=B1=80=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1045002732404736]后端-应用清单中环境的取值，由软件服务模型的环境属性改成全局变量 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1045002732404736
---
 .../mapper/resourcecenter/ResourceMapper.xml  | 74 ++++++++++---------
 .../ResourceCenterResourceServiceImpl.java    | 36 +++++++++
 2 files changed, 77 insertions(+), 33 deletions(-)

diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
index 4438fb5b..133bd2ff 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
@@ -1078,19 +1078,23 @@ limitations under the License.
     </select>
 
     <select id="getAppEnvById" parameterType="java.lang.Long" resultMap="resourceCenterMap">
-        select `id`,
-               `name`,
-               `description`
-        from `@{DATA_SCHEMA}`.`scence_env`
-        where `id` = #{value}
+        SELECT
+            a.`id`,
+            a.`value` AS NAME,
+            a.`sort` AS envSeqNo
+        FROM `cmdb_global_attritem` a
+        JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env'
+        WHERE a.`id` = #{value}
     </select>
 
     <select id="getAppEnvListByIdList" parameterType="java.lang.Long" resultMap="resourceCenterMap">
-        select `id`,
-        `name`,
-        `description`
-        from `@{DATA_SCHEMA}`.`scence_env`
-        where `id` in
+        SELECT
+        a.`id`,
+        a.`value` AS NAME,
+        a.`sort` AS envSeqNo
+        FROM `cmdb_global_attritem` a
+        JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env'
+        where a.`id` in
         <foreach collection="list" open="(" separator="," close=")" item="value">
             #{value}
         </foreach>
@@ -1177,29 +1181,33 @@ limitations under the License.
     </select>
 
     <select id="getAppEnvByName" parameterType="java.lang.String" resultMap="resourceCenterMap">
-        select `id`,
-               `name`,
-               `description`
-        from `@{DATA_SCHEMA}`.`scence_env`
-        where `name` = #{value}
+        SELECT
+            a.`id`,
+            a.`value` AS NAME,
+            a.`sort` AS envSeqNo
+        FROM `cmdb_global_attritem` a
+        JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env'
+        where a.`value` = #{value}
     </select>
 
     <select id="getAllAppEnv"
             resultType="neatlogic.framework.cmdb.dto.resourcecenter.entity.AppEnvironmentVo">
-        select `id`         as envId,
-               `name`       as envName,
-               `env_seq_no` as envSeqNo
-        from `@{DATA_SCHEMA}`.`scence_env`
+        SELECT
+            a.`id`AS envId,
+            a.`value` AS envName,
+            a.`sort` AS envSeqNo
+        FROM `cmdb_global_attritem` a
+        JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env'
     </select>
 
     <select id="searchAppEnvCount" parameterType="neatlogic.framework.common.dto.BasePageVo" resultType="int">
         SELECT
         COUNT(1)
-        FROM @{DATA_SCHEMA}.`scence_env`
+        FROM `cmdb_global_attritem` a
+        JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env'
         <where>
             <if test="keyword != null and keyword != ''">
-                `name` LIKE CONCAT('%', #{keyword}, '%')
-                OR `description` LIKE CONCAT('%', #{keyword}, '%')
+                a.`value` LIKE CONCAT('%', #{keyword}, '%')
             </if>
         </where>
     </select>
@@ -1207,12 +1215,12 @@ limitations under the License.
     <select id="searchAppEnvIdList" parameterType="neatlogic.framework.common.dto.BasePageVo"
             resultType="java.lang.Long">
         SELECT
-        `id`
-        FROM @{DATA_SCHEMA}.`scence_env`
+        a.`id`
+        FROM `cmdb_global_attritem` a
+        JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env'
         <where>
             <if test="keyword != null and keyword != ''">
-                `name` LIKE CONCAT('%', #{keyword}, '%')
-                OR `description` LIKE CONCAT('%', #{keyword}, '%')
+                a.`value` LIKE CONCAT('%', #{keyword}, '%')
             </if>
         </where>
         LIMIT #{startNum}, #{pageSize}
@@ -1220,16 +1228,16 @@ limitations under the License.
 
     <select id="searchAppEnvListByIdList" parameterType="java.lang.Long" resultMap="resourceCenterMap">
         SELECT
-        `id`,
-        `name`,
-        `description`,
-        `env_seq_no`
-        FROM @{DATA_SCHEMA}.`scence_env`
-        WHERE `id` IN
+        a.`id`,
+        a.`value` AS NAME,
+        a.`sort` AS envSeqNo
+        FROM `cmdb_global_attritem` a
+        JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env'
+        WHERE a.`id` IN
         <foreach collection="list" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        ORDER BY `env_seq_no` ASC
+        ORDER BY a.`sort` ASC
     </select>
 
     <select id="searchAppSystemCount" parameterType="neatlogic.framework.common.dto.BasePageVo" resultType="int">
diff --git a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
index 3e6f8773..00da0d21 100644
--- a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
+++ b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java
@@ -23,6 +23,7 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext;
 import neatlogic.framework.cmdb.dto.ci.AttrVo;
 import neatlogic.framework.cmdb.dto.ci.CiVo;
 import neatlogic.framework.cmdb.dto.cientity.CiEntityVo;
+import neatlogic.framework.cmdb.dto.globalattr.GlobalAttrVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.*;
 import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityConfigVo;
 import neatlogic.framework.cmdb.dto.resourcecenter.config.ResourceEntityFieldMappingVo;
@@ -48,6 +49,7 @@ import neatlogic.framework.util.TableResultUtil;
 import neatlogic.module.cmdb.dao.mapper.ci.AttrMapper;
 import neatlogic.module.cmdb.dao.mapper.ci.CiMapper;
 import neatlogic.module.cmdb.dao.mapper.cientity.CiEntityMapper;
+import neatlogic.module.cmdb.dao.mapper.globalattr.GlobalAttrMapper;
 import neatlogic.module.cmdb.dao.mapper.resourcecenter.ResourceAccountMapper;
 import neatlogic.module.cmdb.dao.mapper.resourcecenter.ResourceEntityMapper;
 import neatlogic.module.cmdb.dao.mapper.resourcecenter.ResourceMapper;
@@ -88,6 +90,9 @@ public class ResourceCenterResourceServiceImpl implements IResourceCenterResourc
     @Resource
     private AttrMapper attrMapper;
 
+    @Resource
+    private GlobalAttrMapper globalAttrMapper;
+
     @Resource
     private CiEntityMapper ciEntityMapper;
 
@@ -880,6 +885,37 @@ public class ResourceCenterResourceServiceImpl implements IResourceCenterResourc
                         }
                     }
                 }
+            } else if (Objects.equals(type, "globalAttr")) {
+                String fromCi = fieldMappingVo.getFromCi();
+                if (StringUtils.isBlank(fromCi)) {
+                    throw new ResourceViewFieldMappingException(viewName, field, "fromCi", fromCi);
+                }
+                CiVo fromCiVo = ciMapper.getCiByName(fromCi);
+                if (fromCiVo == null) {
+                    throw new ResourceViewFieldMappingException(viewName, field, "fromCi", fromCi);
+                }
+                String fromAttr = fieldMappingVo.getFromAttr();
+                if (StringUtils.isBlank(fromAttr)) {
+                    throw new ResourceViewFieldMappingException(viewName, field, "fromAttr", fromAttr);
+                }
+                GlobalAttrVo globalAttrVo = new GlobalAttrVo();
+                globalAttrVo.setName(fromAttr);
+                if (globalAttrMapper.checkGlobalAttrNameIsUsed(globalAttrVo) == 0) {
+                    throw new ResourceViewFieldMappingException(viewName, field, "fromAttr", fromAttr);
+                }
+                String toAttr = fieldMappingVo.getToAttr();
+                if (StringUtils.isBlank(toAttr)) {
+                    throw new ResourceViewFieldMappingException(viewName, field, "toAttr", toAttr);
+                }
+                if (!Objects.equals(toAttr, "id") && !Objects.equals(toAttr, "value") && !Objects.equals(toAttr, "sort")){
+                    throw new ResourceViewFieldMappingException(viewName, field, "toAttr", toAttr);
+                }
+                newFieldMappingVo.setFromCi(fromCi);
+                newFieldMappingVo.setFromCiId(fromCiVo.getId());
+                newFieldMappingVo.setFromAttr(fromAttr);
+                newFieldMappingVo.setToAttr(toAttr);
+            } else if (Objects.equals(type, "empty")) {
+
             } else {
                 throw new ResourceViewFieldMappingException(viewName, field, "type", type);
             }
-- 
Gitee