From b69a3ae3d41e8e18e6dc8a4ca1f5db22f9dac05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=A4=E5=85=A8=E6=98=86?= Date: Mon, 1 Sep 2025 10:35:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NetworkManageController.java | 3 +- .../controller/StoragePoolController.java | 3 +- .../project/entity/dao/StoragePool.java | 21 ++++ .../project/entity/dto/Network.java | 18 ++++ .../project/entity/dto/VmStoragePool.java | 102 ++++-------------- .../project/service/NetworkManageService.java | 2 +- .../project/service/StoragePoolService.java | 2 +- .../impl/NetworkManageServiceImpl.java | 9 +- .../service/impl/StoragePoolServiceImpl.java | 9 +- 9 files changed, 76 insertions(+), 93 deletions(-) diff --git a/nex-be/src/main/java/com/unisinsight/project/controller/NetworkManageController.java b/nex-be/src/main/java/com/unisinsight/project/controller/NetworkManageController.java index 0d9e2c7..b7bbb94 100644 --- a/nex-be/src/main/java/com/unisinsight/project/controller/NetworkManageController.java +++ b/nex-be/src/main/java/com/unisinsight/project/controller/NetworkManageController.java @@ -59,8 +59,7 @@ public class NetworkManageController { @ApiOperation(value = "同步数据和状态") @GetMapping("/synchData") public Result synchData() { - networkManageService.synchData(); - return Result.successResult(); + return Result.successResult(networkManageService.synchData()); } } diff --git a/nex-be/src/main/java/com/unisinsight/project/controller/StoragePoolController.java b/nex-be/src/main/java/com/unisinsight/project/controller/StoragePoolController.java index 2304d25..7bb026b 100644 --- a/nex-be/src/main/java/com/unisinsight/project/controller/StoragePoolController.java +++ b/nex-be/src/main/java/com/unisinsight/project/controller/StoragePoolController.java @@ -65,8 +65,7 @@ public class StoragePoolController { @ApiOperation(value = "同步数据") @GetMapping("/synchData") public Result synchData() { - storagePoolService.synchData(); - return Result.successResult(); + return Result.successResult(storagePoolService.synchData()); } } diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/dao/StoragePool.java b/nex-be/src/main/java/com/unisinsight/project/entity/dao/StoragePool.java index 3872265..e0eba0b 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/dao/StoragePool.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/dao/StoragePool.java @@ -76,4 +76,25 @@ public class StoragePool { @TableField("create_user") @ApiModelProperty(value = "创建用户") private String createUser; + + /** + * 总容量 + */ + @TableField(exist = false) + @ApiModelProperty(value = "总容量") + private Long capacity; + + /** + * 已分配容量 + */ + @TableField(exist = false) + @ApiModelProperty(value = "已分配容量") + private Long allocation; + + /** + * 可用容量 + */ + @TableField(exist = false) + @ApiModelProperty(value = "可用容量") + private Long available; } diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/dto/Network.java b/nex-be/src/main/java/com/unisinsight/project/entity/dto/Network.java index a7d35e5..42fcf80 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/dto/Network.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/dto/Network.java @@ -3,6 +3,7 @@ package com.unisinsight.project.entity.dto; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; import lombok.Data; @Data @@ -51,4 +52,21 @@ public class Network { @JsonProperty("vlan_id") private Integer vlanId; + + // 自定义 setter，在设置 name 时同步到 networkName + public void setName(String name) { + this.name = name; + if (name != null) { + this.networkName = name; + } + } + + // 自定义 setter，在设置 poolName 时同步到 name + @JsonSetter("network_name") + public void setPoolName(String poolName) { + this.networkName = poolName; + if (poolName != null) { + this.name = poolName; + } + } } \ No newline at end of file diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/dto/VmStoragePool.java b/nex-be/src/main/java/com/unisinsight/project/entity/dto/VmStoragePool.java index 1709af9..c14df0a 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/dto/VmStoragePool.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/dto/VmStoragePool.java @@ -1,8 +1,15 @@ // StoragePool.java - 存储池信息对象 package com.unisinsight.project.entity.dto; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import lombok.Data; + +@Data public class VmStoragePool { private String name; + @JsonProperty("pool_name") + private String poolName; private String uuid; private String state; private Long capacity; @@ -10,96 +17,25 @@ public class VmStoragePool { private Long available; private Integer autostart; private Integer persistent; + @JsonProperty("volume_count") private Integer volumeCount; private String type; private String path; - // Getters and Setters - public String getName() { - return name; - } - + // 自定义 setter，在设置 name 时同步到 poolName public void setName(String name) { this.name = name; + if (name != null) { + this.poolName = name; + } } - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public Long getCapacity() { - return capacity; - } - - public void setCapacity(Long capacity) { - this.capacity = capacity; - } - - public Long getAllocation() { - return allocation; - } - - public void setAllocation(Long allocation) { - this.allocation = allocation; - } - - public Long getAvailable() { - return available; - } - - public void setAvailable(Long available) { - this.available = available; - } - - public Integer getAutostart() { - return autostart; - } - - public void setAutostart(Integer autostart) { - this.autostart = autostart; - } - - public Integer getPersistent() { - return persistent; - } - - public void setPersistent(Integer persistent) { - this.persistent = persistent; - } - - public Integer getVolumeCount() { - return volumeCount; - } - - public void setVolumeCount(Integer volumeCount) { - this.volumeCount = volumeCount; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; + // 自定义 setter，在设置 poolName 时同步到 name + @JsonSetter("pool_name") + public void setPoolName(String poolName) { + this.poolName = poolName; + if (poolName != null) { + this.name = poolName; + } } } diff --git a/nex-be/src/main/java/com/unisinsight/project/service/NetworkManageService.java b/nex-be/src/main/java/com/unisinsight/project/service/NetworkManageService.java index 5760d35..ef6b2d1 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/NetworkManageService.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/NetworkManageService.java @@ -62,5 +62,5 @@ public interface NetworkManageService { */ PageResult pageNetworkManages(NetworkManagePageReq networkManagePageReq); - void synchData(); + String synchData(); } diff --git a/nex-be/src/main/java/com/unisinsight/project/service/StoragePoolService.java b/nex-be/src/main/java/com/unisinsight/project/service/StoragePoolService.java index 25841b8..fb65a41 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/StoragePoolService.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/StoragePoolService.java @@ -51,5 +51,5 @@ public interface StoragePoolService { */ PageResult pageStoragePools(StoragePoolReq storagePoolReq); - void synchData(); + String synchData(); } diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/NetworkManageServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/NetworkManageServiceImpl.java index 8abed65..939958e 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/NetworkManageServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/NetworkManageServiceImpl.java @@ -242,7 +242,8 @@ public class NetworkManageServiceImpl extends ServiceImpl response; try { response = client.list(1, 100); @@ -255,7 +256,7 @@ public class NetworkManageServiceImpl extends ServiceImpl networkList = response.getData().getNetworks(); if (CollectionUtils.isEmpty(networkList)) { - return; + return "同步成功,无数据更新"; } log.info("开始同步网络数据，共{}条记录", networkList.size()); @@ -294,10 +295,12 @@ public class NetworkManageServiceImpl extends ServiceImpl list) { diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/StoragePoolServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/StoragePoolServiceImpl.java index f293fe2..ec0fdb4 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/StoragePoolServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/StoragePoolServiceImpl.java @@ -187,7 +187,8 @@ public class StoragePoolServiceImpl extends ServiceImpl response; try { response = client.listStorage(1, 100); @@ -220,7 +221,7 @@ public class StoragePoolServiceImpl extends ServiceImpl