删除多余的属性

framework-analysis/src/main/java/org/arch/analysis/controller/ArchMapController.java

@@ -36,9 +36,7 @@ public class ArchMapController {
     @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取总体业务架构资产信息", moduleName = "架构地图")
     @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取总体业务架构资产信息", moduleName = "架构地图")
     public Result getOverAllBusAsset(@RequestBody ArchMapDto mapDto) {
     public Result getOverAllBusAsset(@RequestBody ArchMapDto mapDto) {
         String parentAssetId = mapDto.getParentAssetId();
         String parentAssetId = mapDto.getParentAssetId();
-        String eleName = mapDto.getEleName();
-        if (StringUtils.isEmpty(eleName)
-                || StringUtils.isEmpty(parentAssetId)) {
+        if (StringUtils.isEmpty(parentAssetId)) {
             throw new NullPointerException("架构类型、架构层级及元素名称不能为空;");
             throw new NullPointerException("架构类型、架构层级及元素名称不能为空;");
         }
         }
         List<ArchMapVo> resultDatas = archMapService.getOverAllBusAsset(mapDto);
         List<ArchMapVo> resultDatas = archMapService.getOverAllBusAsset(mapDto);

framework-analysis/src/main/java/org/arch/analysis/vo/ArchMapVo.java

@@ -4,7 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
-
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class ArchMapVo {
 public class ArchMapVo {
     /**
     /**
      * 元素名称
      * 元素名称
@@ -30,68 +32,9 @@ public class ArchMapVo {
      * 架构类型
      * 架构类型
      */
      */
     private String archiType;
     private String archiType;
+    /**
+     * 上级资产编号
+     */
+    private String assetId;
 
 
-    public String getEleName() {
-        return eleName;
-    }
-
-    public void setEleName(String eleName) {
-        this.eleName = eleName;
-    }
-
-    public String getAssetName() {
-        return assetName;
-    }
-
-    public void setAssetName(String assetName) {
-        this.assetName = assetName;
-    }
-
-    public String getElementId() {
-        return elementId;
-    }
-
-    public void setElementId(String elementId) {
-        this.elementId = elementId;
-    }
-
-    public String getEaLevel() {
-        return eaLevel;
-    }
-
-    public void setEaLevel(String eaLevel) {
-        this.eaLevel = eaLevel;
-    }
-
-
-    public String getParentAssetId() {
-        return parentAssetId;
-    }
-
-    public void setParentAssetId(String parentAssetId) {
-        this.parentAssetId = parentAssetId;
-    }
-
-    public String getArchiType() {
-        return archiType;
-    }
-
-    public void setArchiType(String archiType) {
-        this.archiType = archiType;
-    }
-
-    public ArchMapVo() {
-    }
-
-    @Override
-    public String toString() {
-        return "ArchMapVo{" +
-                "eleName='" + eleName + '\'' +
-                ", assetName='" + assetName + '\'' +
-                ", elementId='" + elementId + '\'' +
-                ", eaLevel='" + eaLevel + '\'' +
-                ", parentAssetId='" + parentAssetId + '\'' +
-                ", archiType='" + archiType + '\'' +
-                '}';
-    }
 }
 }

framework-analysis/src/main/resources/mapper/ArchMapMapp.xml

@@ -8,14 +8,14 @@
             m.element_id as elementId,
             m.element_id as elementId,
             m.ea_level as eaLevel,
             m.ea_level as eaLevel,
             n.parent_asset_id as parentAssetId,
             n.parent_asset_id as parentAssetId,
-            n.archi_type as archiType
+            n.archi_type as archiType,
+            n.asset_id as assetId
         from
         from
             archi_asset_info n,
             archi_asset_info n,
             archi_element m
             archi_element m
         where
         where
             n.archi_type = 'ARCHI_BUSINESS'
             n.archi_type = 'ARCHI_BUSINESS'
           and n.archi_ele_id = m.element_id
           and n.archi_ele_id = m.element_id
-          and n.ele_name = #{eleName}
           <if test="eaLevel!=null and eaLevel!=''">
           <if test="eaLevel!=null and eaLevel!=''">
               and m.ea_level= #{eaLevel}
               and m.ea_level= #{eaLevel}
           </if>
           </if>