修改数据域统计接口

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

@@ -36,7 +36,8 @@ 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();
-        if (StringUtils.isEmpty(parentAssetId)) {
+        String archiType = mapDto.getArchiType();
+        if (StringUtils.isEmpty(archiType) && StringUtils.isEmpty(parentAssetId)) {
             throw new NullPointerException("架构类型、架构层级及元素名称不能为空;");
             throw new NullPointerException("架构类型、架构层级及元素名称不能为空;");
         }
         }
         List<ArchMapVo> resultDatas = archMapService.getOverAllBusAsset(mapDto);
         List<ArchMapVo> resultDatas = archMapService.getOverAllBusAsset(mapDto);
@@ -51,6 +52,7 @@ public class ArchMapController {
     @PostMapping("getOverAllAppAsset")
     @PostMapping("getOverAllAppAsset")
     @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取总体应用架构资产信息", moduleName = "架构地图")
     @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取总体应用架构资产信息", moduleName = "架构地图")
     public Result getOverAllAppAsset() {
     public Result getOverAllAppAsset() {
+
         return null;
         return null;
     }
     }
 
 

framework-analysis/src/main/java/org/arch/analysis/dto/ArchMapDto.java

@@ -19,10 +19,6 @@ public class ArchMapDto {
     /**
     /**
      * 架构类型
      * 架构类型
      */
      */
-    private String archType;
-    /**
-     * 架构类型
-     */
     private String archiType;
     private String archiType;
     /**
     /**
      * 父级资产编号
      * 父级资产编号

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

@@ -14,7 +14,7 @@
             archi_asset_info n,
             archi_asset_info n,
             archi_element m
             archi_element m
         where
         where
-            n.archi_type = 'ARCHI_BUSINESS'
+            n.archi_type = #{archiType}
           and n.archi_ele_id = m.element_id
           and n.archi_ele_id = m.element_id
           <if test="eaLevel!=null and eaLevel!=''">
           <if test="eaLevel!=null and eaLevel!=''">
               and m.ea_level= #{eaLevel}
               and m.ea_level= #{eaLevel}