fix(operation-analysis): 云主机，磁盘分布添加过滤条件

Author: jianneng-fit2cloud

framework/sdk/backend/src/main/java/com/fit2cloud/base/mapper/BaseVmCloudDiskMapper.java

@@ -22,4 +22,7 @@
 public interface BaseVmCloudDiskMapper extends MPJBaseMapper<VmCloudDisk> {
     @Select("SELECT source_id as `key`,count(*) as `value` FROM  vm_cloud_disk  ${ew.customSqlSegment} GROUP BY source_id")
     List<DefaultKeyValue<String, Integer>> groupSourceId(@Param(Constants.WRAPPER) Wrapper<VmCloudDisk> wrapper);
+
+    @Select("SELECT source_id as `key`,sum(size) as `value` FROM  vm_cloud_disk  ${ew.customSqlSegment} GROUP BY source_id")
+    List<DefaultKeyValue<String, Integer>> groupSourceIdBySize(@Param(Constants.WRAPPER) Wrapper<VmCloudDisk> wrapper);
 }

services/operation-analysis/backend/src/main/java/com/fit2cloud/service/impl/DiskAnalysisServiceImpl.java

@@ -266,7 +266,7 @@ public Map<String, List<TreeNode>> analysisCloudDiskByOrgWorkspace(ResourceAnaly
             result.put("all", workspaceList);
             result.put("tree", workspaceList);
         } else {
-            result = orgSpread();
+            result = orgSpread(request);
 
         }
         return result;
@@ -275,8 +275,8 @@ public Map<String, List<TreeNode>> analysisCloudDiskByOrgWorkspace(ResourceAnaly
     /**
      * 组织上的分布
      */
-    private Map<String, List<TreeNode>> orgSpread() {
-        List<DefaultKeyValue<String, Integer>> groupSource = baseVmCloudDiskMapper.groupSourceId(new LambdaQueryWrapper<VmCloudDisk>().notIn(VmCloudDisk::getStatus, List.of("Deleted", "Failed")));
+    private Map<String, List<TreeNode>> orgSpread(ResourceAnalysisRequest request) {
+        List<DefaultKeyValue<String, Integer>> groupSource = groupSource(request);
         // 获取获取组织工作空间树
         List<OrganizationTree> tree = iBaseOrganizationService.tree("ORGANIZATION_AND_WORKSPACE");
         List<TreeNode> treeNodes = OperationUtils.orgCount(tree, (orgId, workspaceIds) -> getCount(orgId, workspaceIds, groupSource), groupSource.stream().mapToInt(DefaultKeyValue::getValue).sum());
@@ -287,6 +287,16 @@ private Map<String, List<TreeNode>> orgSpread() {
         return Map.of("tree", treeNodes);
     }
 
+    private List<DefaultKeyValue<String, Integer>> groupSource(ResourceAnalysisRequest request){
+        LambdaQueryWrapper<VmCloudDisk> wrapper = new LambdaQueryWrapper<VmCloudDisk>().notIn(VmCloudDisk::getStatus, List.of("Deleted", "Failed"));
+        wrapper.in(CollectionUtils.isNotEmpty(request.getAccountIds()),VmCloudDisk::getAccountId,request.getAccountIds());
+        if(request.isStatisticalBlock()){
+            return baseVmCloudDiskMapper.groupSourceId(wrapper);
+        }else{
+            return baseVmCloudDiskMapper.groupSourceIdBySize(wrapper);
+        }
+    }
+
     /**
      * 获取组织或者工作空间统计
      *

services/operation-analysis/backend/src/main/java/com/fit2cloud/service/impl/ServerAnalysisServiceImpl.java

@@ -474,8 +474,10 @@ public Map<String, List<TreeNode>> analysisVmCloudServerByOrgWorkspace(ResourceA
      */
     private Map<String, List<TreeNode>> orgSpread(ResourceAnalysisRequest request) {
         Map<String, List<TreeNode>> result = new HashMap<>(1);
-
-        List<DefaultKeyValue<String, Integer>> groupSource = baseVmCloudServerMapper.groupSourceId(new LambdaQueryWrapper<VmCloudServer>().notIn(VmCloudServer::getInstanceStatus, List.of(SpecialAttributesConstants.StatusField.VM_DELETE, SpecialAttributesConstants.StatusField.FAILED)));
+        LambdaQueryWrapper<VmCloudServer> wrapper = new LambdaQueryWrapper<VmCloudServer>().notIn(VmCloudServer::getInstanceStatus, List.of(SpecialAttributesConstants.StatusField.VM_DELETE, SpecialAttributesConstants.StatusField.FAILED));
+        wrapper.in(CollectionUtils.isNotEmpty(request.getAccountIds()),VmCloudServer::getAccountId,request.getAccountIds());
+        wrapper.in(CollectionUtils.isNotEmpty(request.getHostIds()),VmCloudServer::getHostId,request.getHostIds());
+        List<DefaultKeyValue<String, Integer>> groupSource = baseVmCloudServerMapper.groupSourceId(wrapper);
         // 获取获取组织工作空间树
         List<OrganizationTree> tree = iBaseOrganizationService.tree("ORGANIZATION_AND_WORKSPACE");
         List<TreeNode> treeNodes = OperationUtils.orgCount(tree, (orgId, workspaceIds) ->