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 42fcf80..2024a97 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 @@ -2,11 +2,13 @@ // Network.java - 网络信息对象 package com.unisinsight.project.entity.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class Network { @JsonProperty("network_name") private String networkName; @@ -18,7 +20,7 @@ public class Network { private String state; @JsonProperty("autostart") - private Boolean autostart; + private Integer autostart; private Integer persistent; @@ -53,6 +55,13 @@ public class Network { @JsonProperty("vlan_id") private Integer vlanId; + // 新增字段 + @JsonProperty("connected_devices") + private Integer connectedDevices; + + @JsonProperty("traffic_stats") + private TrafficStats trafficStats; + // 自定义 setter,在设置 name 时同步到 networkName public void setName(String name) { this.name = name; @@ -61,12 +70,12 @@ public class Network { } } - // 自定义 setter,在设置 poolName 时同步到 name + // 自定义 setter,在设置 networkName 时同步到 name @JsonSetter("network_name") - public void setPoolName(String poolName) { - this.networkName = poolName; - if (poolName != null) { - this.name = poolName; + public void setNetworkName(String networkName) { + this.networkName = networkName; + if (networkName != null) { + this.name = networkName; } } } \ No newline at end of file diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/dto/NetworkData.java b/nex-be/src/main/java/com/unisinsight/project/entity/dto/NetworkData.java index f6492ce..3c19ffa 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/dto/NetworkData.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/dto/NetworkData.java @@ -1,24 +1,13 @@ package com.unisinsight.project.entity.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + import java.util.List; +@Data +@JsonIgnoreProperties(ignoreUnknown = true) public class NetworkData { private List networks; private Pagination pagination; - // Getters and Setters - public List getNetworks() { - return networks; - } - - public void setNetworks(List networks) { - this.networks = networks; - } - - public Pagination getPagination() { - return pagination; - } - - public void setPagination(Pagination pagination) { - this.pagination = pagination; - } } diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/dto/Pagination.java b/nex-be/src/main/java/com/unisinsight/project/entity/dto/Pagination.java index 42ead4a..441ec32 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/dto/Pagination.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/dto/Pagination.java @@ -1,42 +1,15 @@ // Pagination.java - 分页信息对象 package com.unisinsight.project.entity.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) public class Pagination { private Integer currentPage; private Integer pageSize; private Integer total; private Integer totalPages; - // Getters and Setters - public Integer getCurrentPage() { - return currentPage; - } - - public void setCurrentPage(Integer currentPage) { - this.currentPage = currentPage; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public Integer getTotal() { - return total; - } - - public void setTotal(Integer total) { - this.total = total; - } - - public Integer getTotalPages() { - return totalPages; - } - - public void setTotalPages(Integer totalPages) { - this.totalPages = totalPages; - } } diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/dto/TrafficStats.java b/nex-be/src/main/java/com/unisinsight/project/entity/dto/TrafficStats.java new file mode 100644 index 0000000..46d8091 --- /dev/null +++ b/nex-be/src/main/java/com/unisinsight/project/entity/dto/TrafficStats.java @@ -0,0 +1,11 @@ +package com.unisinsight.project.entity.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class TrafficStats { + private Long upload; + private Long download; +} diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/req/StoragePoolReq.java b/nex-be/src/main/java/com/unisinsight/project/entity/req/StoragePoolReq.java index a12b159..4d95626 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/req/StoragePoolReq.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/req/StoragePoolReq.java @@ -23,7 +23,7 @@ public class StoragePoolReq { @ApiModelProperty("自动启动,默认是") @JsonProperty("autostart") - private boolean autostart = true; + private Integer autostart =1; @ApiModelProperty("名称") @NotBlank(message = "名称不能为空") 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 aa68ad3..4525a41 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 @@ -73,7 +73,7 @@ public class NetworkManageServiceImpl extends ServiceImpl