Compare commits

..

No commits in common. "32bf2914894d8afc3c97e943590f40265751ed1f" and "fc743e5aa6df95b3458aff6bda5352d6d0c22c16" have entirely different histories.

7 changed files with 58 additions and 42 deletions

View File

@ -2,13 +2,11 @@
// Network.java - 网络信息对象 // Network.java - 网络信息对象
package com.unisinsight.project.entity.dto; package com.unisinsight.project.entity.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.JsonSetter;
import lombok.Data; import lombok.Data;
@Data @Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class Network { public class Network {
@JsonProperty("network_name") @JsonProperty("network_name")
private String networkName; private String networkName;
@ -20,7 +18,7 @@ public class Network {
private String state; private String state;
@JsonProperty("autostart") @JsonProperty("autostart")
private Integer autostart; private Boolean autostart;
private Integer persistent; private Integer persistent;
@ -55,13 +53,6 @@ public class Network {
@JsonProperty("vlan_id") @JsonProperty("vlan_id")
private Integer vlanId; private Integer vlanId;
// 新增字段
@JsonProperty("connected_devices")
private Integer connectedDevices;
@JsonProperty("traffic_stats")
private TrafficStats trafficStats;
// 自定义 setter在设置 name 时同步到 networkName // 自定义 setter在设置 name 时同步到 networkName
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
@ -70,12 +61,12 @@ public class Network {
} }
} }
// 自定义 setter在设置 networkName 时同步到 name // 自定义 setter在设置 poolName 时同步到 name
@JsonSetter("network_name") @JsonSetter("network_name")
public void setNetworkName(String networkName) { public void setPoolName(String poolName) {
this.networkName = networkName; this.networkName = poolName;
if (networkName != null) { if (poolName != null) {
this.name = networkName; this.name = poolName;
} }
} }
} }

View File

@ -1,13 +1,24 @@
package com.unisinsight.project.entity.dto; package com.unisinsight.project.entity.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import java.util.List; import java.util.List;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class NetworkData { public class NetworkData {
private List<Network> networks; private List<Network> networks;
private Pagination pagination; private Pagination pagination;
// Getters and Setters
public List<Network> getNetworks() {
return networks;
}
public void setNetworks(List<Network> networks) {
this.networks = networks;
}
public Pagination getPagination() {
return pagination;
}
public void setPagination(Pagination pagination) {
this.pagination = pagination;
}
} }

View File

@ -1,15 +1,42 @@
// Pagination.java - 分页信息对象 // Pagination.java - 分页信息对象
package com.unisinsight.project.entity.dto; package com.unisinsight.project.entity.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class Pagination { public class Pagination {
private Integer currentPage; private Integer currentPage;
private Integer pageSize; private Integer pageSize;
private Integer total; private Integer total;
private Integer totalPages; 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;
}
} }

View File

@ -1,11 +0,0 @@
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;
}

View File

@ -23,7 +23,7 @@ public class StoragePoolReq {
@ApiModelProperty("自动启动,默认是") @ApiModelProperty("自动启动,默认是")
@JsonProperty("autostart") @JsonProperty("autostart")
private Integer autostart =1; private boolean autostart = true;
@ApiModelProperty("名称") @ApiModelProperty("名称")
@NotBlank(message = "名称不能为空") @NotBlank(message = "名称不能为空")

View File

@ -73,7 +73,7 @@ public class NetworkManageServiceImpl extends ServiceImpl<NetworkManageMapper, N
try { try {
Network network = new Network(); Network network = new Network();
BeanUtils.copyProperties(networkManageReq, network); BeanUtils.copyProperties(networkManageReq, network);
// network.setAutostart(networkManageReq.getAutostart() == 1); network.setAutostart(networkManageReq.getAutostart() == 1);
network.setDhcpEnabled(networkManageReq.getDhcpEnabled() == 1); network.setDhcpEnabled(networkManageReq.getDhcpEnabled() == 1);
ApiResponse response = client.createNetwork(network); ApiResponse response = client.createNetwork(network);
if (!"200".equals(response.getCode())) { if (!"200".equals(response.getCode())) {
@ -116,7 +116,7 @@ public class NetworkManageServiceImpl extends ServiceImpl<NetworkManageMapper, N
setNetworkManageReq(existing, networkManageReq); setNetworkManageReq(existing, networkManageReq);
Network network = new Network(); Network network = new Network();
BeanUtils.copyProperties(networkManageReq, network); BeanUtils.copyProperties(networkManageReq, network);
// network.setAutostart(networkManageReq.getAutostart() == 1); network.setAutostart(networkManageReq.getAutostart() == 1);
network.setDhcpEnabled(networkManageReq.getDhcpEnabled() == 1); network.setDhcpEnabled(networkManageReq.getDhcpEnabled() == 1);
ApiResponse response = client.updateNetwork(network); ApiResponse response = client.updateNetwork(network);
if (!"200".equals(response.getCode())) { if (!"200".equals(response.getCode())) {
@ -324,7 +324,7 @@ public class NetworkManageServiceImpl extends ServiceImpl<NetworkManageMapper, N
BeanUtils.copyProperties(network, networkManage); BeanUtils.copyProperties(network, networkManage);
networkManage.setNetworkName(StringUtil.isEmpty(network.getNetworkName()) ? network.getName() : networkManage.getNetworkName()); networkManage.setNetworkName(StringUtil.isEmpty(network.getNetworkName()) ? network.getName() : networkManage.getNetworkName());
networkManage.setStatus("active".equals(network.getState()) ? 1 : 0); networkManage.setStatus("active".equals(network.getState()) ? 1 : 0);
// networkManage.setAutostart(network.getAutostart() ? 1 : 0); networkManage.setAutostart(network.getAutostart() ? 1 : 0);
networkManage.setDhcpEnabled(network.getDhcpEnabled() ? 1 : 0); networkManage.setDhcpEnabled(network.getDhcpEnabled() ? 1 : 0);
networkManage.setUpdateTime(new Date()); networkManage.setUpdateTime(new Date());

View File

@ -24,8 +24,6 @@ spring:
data-locations: classpath*:db/*.sql data-locations: classpath*:db/*.sql
jackson: jackson:
property-naming-strategy: SNAKE_CASE property-naming-strategy: SNAKE_CASE
deserialization:
fail-on-unknown-properties: false
knife4j: knife4j:
production: false production: false