fix(vm-service): 虚拟机模块 云主机列表,磁盘列表导出

Author: shaohuzhang1

framework/sdk/backend/src/main/java/com/fit2cloud/base/entity/VmCloudHost.java

@@ -139,21 +139,21 @@ public class VmCloudHost implements Serializable {
      * 虚拟化类型
      */
     @TableField("hypervisor_type")
-    @ExcelProperty(value = "虚拟化类型")
+    @ExcelIgnore
     private String hypervisorType;
 
     /**
      * 虚拟化版本
      */
     @TableField("hypervisor_version")
-    @ExcelProperty(value = "虚拟化版本")
+    @ExcelIgnore
     private String hypervisorVersion;
 
     /**
      * 主机提供商
      */
     @TableField("host_vendor")
-    @ExcelProperty(value = "主机提供商")
+    @ExcelIgnore
     private String hostVendor;
 
     /**

services/operation-analysis/backend/src/main/java/com/fit2cloud/utils/CustomCellWriteHeightConfig.java renamed to framework/sdk/backend/src/main/java/com/fit2cloud/common/utils/CustomCellWriteHeightConfig.java

@@ -1,4 +1,4 @@
-package com.fit2cloud.utils;
+package com.fit2cloud.common.utils;
 
 import com.alibaba.excel.write.style.row.AbstractRowHeightStyleStrategy;
 import org.apache.poi.ss.usermodel.Cell;

services/operation-analysis/backend/src/main/java/com/fit2cloud/utils/CustomCellWriteWidthConfig.java renamed to framework/sdk/backend/src/main/java/com/fit2cloud/common/utils/CustomCellWriteWidthConfig.java

@@ -1,4 +1,4 @@
-package com.fit2cloud.utils;
+package com.fit2cloud.common.utils;
 
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.Head;

services/operation-analysis/backend/src/main/java/com/fit2cloud/utils/EasyExcelUtils.java renamed to framework/sdk/backend/src/main/java/com/fit2cloud/common/utils/EasyExcelUtils.java

@@ -1,4 +1,4 @@
-package com.fit2cloud.utils;
+package com.fit2cloud.common.utils;
 
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;

services/operation-analysis/backend/src/main/java/com/fit2cloud/controller/BaseResourceAnalysisController.java

@@ -18,9 +18,9 @@
 import com.fit2cloud.dto.AnalysisHostDTO;
 import com.fit2cloud.dto.KeyValue;
 import com.fit2cloud.service.IBaseResourceAnalysisService;
-import com.fit2cloud.utils.CustomCellWriteHeightConfig;
-import com.fit2cloud.utils.CustomCellWriteWidthConfig;
-import com.fit2cloud.utils.EasyExcelUtils;
+import com.fit2cloud.common.utils.CustomCellWriteHeightConfig;
+import com.fit2cloud.common.utils.CustomCellWriteWidthConfig;
+import com.fit2cloud.common.utils.EasyExcelUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;

services/operation-analysis/backend/src/main/java/com/fit2cloud/controller/DiskAnalysisController.java

@@ -12,9 +12,9 @@
 import com.fit2cloud.dto.AnalysisDiskDTO;
 import com.fit2cloud.dto.KeyValue;
 import com.fit2cloud.service.IDiskAnalysisService;
-import com.fit2cloud.utils.CustomCellWriteHeightConfig;
-import com.fit2cloud.utils.CustomCellWriteWidthConfig;
-import com.fit2cloud.utils.EasyExcelUtils;
+import com.fit2cloud.common.utils.CustomCellWriteHeightConfig;
+import com.fit2cloud.common.utils.CustomCellWriteWidthConfig;
+import com.fit2cloud.common.utils.EasyExcelUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;

services/operation-analysis/backend/src/main/java/com/fit2cloud/controller/ServerAnalysisController.java

@@ -13,9 +13,9 @@
 import com.fit2cloud.dto.AnalysisServerDTO;
 import com.fit2cloud.dto.KeyValue;
 import com.fit2cloud.service.IServerAnalysisService;
-import com.fit2cloud.utils.CustomCellWriteHeightConfig;
-import com.fit2cloud.utils.CustomCellWriteWidthConfig;
-import com.fit2cloud.utils.EasyExcelUtils;
+import com.fit2cloud.common.utils.CustomCellWriteHeightConfig;
+import com.fit2cloud.common.utils.CustomCellWriteWidthConfig;
+import com.fit2cloud.common.utils.EasyExcelUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;

services/operation-analysis/backend/src/main/java/com/fit2cloud/dto/AnalysisDatastoreDTO.java

@@ -40,10 +40,10 @@ public class AnalysisDatastoreDTO extends VmCloudDatastore {
     private String allocated;
 
     @Schema(title = "使用率")
-    @ExcelProperty("使用率")
+    @ExcelProperty("使用率(%)")
     private String useRate;
 
     @Schema(title = "剩余率")
-    @ExcelProperty("剩余率")
+    @ExcelProperty("剩余率(%)")
     private String freeRate;
 }

services/operation-analysis/backend/src/main/java/com/fit2cloud/dto/AnalysisServerDTO.java

@@ -44,15 +44,15 @@ public class AnalysisServerDTO extends VmCloudServer {
     private String deleteMonth;
     @ExcelIgnore
     private BigDecimal cpuMinimum;
-    @ExcelProperty("CPU最大使用率")
+    @ExcelProperty("CPU最大使用率(%)")
     private BigDecimal cpuMaximum;
-    @ExcelProperty("CPU平均使用率")
+    @ExcelProperty("CPU平均使用率(%)")
     private BigDecimal cpuAverage;
     @ExcelIgnore
     private BigDecimal memoryMinimum;
-    @ExcelProperty("内存最大使用率")
+    @ExcelProperty("内存最大使用率(%)")
     private BigDecimal memoryMaximum;
-    @ExcelProperty("内存平均使用率")
+    @ExcelProperty("内存平均使用率(%)")
     private BigDecimal memoryAverage;
     @ExcelIgnore
     private BigDecimal diskAverage;

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

@@ -33,9 +33,9 @@
 import com.fit2cloud.service.IOptimizationStrategyIgnoreResourceService;
 import com.fit2cloud.service.IOptimizationStrategyService;
 import com.fit2cloud.service.IPermissionService;
-import com.fit2cloud.utils.CustomCellWriteHeightConfig;
-import com.fit2cloud.utils.CustomCellWriteWidthConfig;
-import com.fit2cloud.utils.EasyExcelUtils;
+import com.fit2cloud.common.utils.CustomCellWriteHeightConfig;
+import com.fit2cloud.common.utils.CustomCellWriteWidthConfig;
+import com.fit2cloud.common.utils.EasyExcelUtils;
 import com.fit2cloud.utils.cache.ElasticSearchVmLatestMonitoringDataSyncCache;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import jakarta.annotation.Resource;