songqq/contract-manager
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

refactor(vo): 重构VO对象结构，统一字段命名和接口实现

Browse Source 
重构所有VO对象，统一字段命名规范，移除冗余字段，优化接口实现
新增Voable接口用于VO对象转换
调整BaseViewModel和ProjectBasedViewModel接口定义
更新相关服务和控制器以适应VO对象变更
This commit is contained in:
宋其青
2025-09-21 17:47:52 +08:00
parent 07c3f39a95
commit 039d753bab
408 changed files with 6602 additions and 4800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
client/src/main/java/com/ecep/contract/vm/CloudRkViewModel.java
View File

@@ -2,8 +2,7 @@ package com.ecep.contract.vm;
import java.time.LocalDateTime;
import com.ecep.contract.model.CloudRk;
import com.ecep.contract.model.Company;
import com.ecep.contract.vo.CloudRkVo;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleIntegerProperty;
@@ -14,7 +13,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
public class CloudRkViewModel extends IdentityViewModel<CloudRkVo> {
/**
* 云端Id
*/
@@ -64,9 +63,9 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
*/
private SimpleStringProperty description = new SimpleStringProperty();
/**
* 公司
* 公司, Company
*/
private SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
private SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
/**
* 最后更新日期
*/
@@ -88,8 +87,17 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
*/
private SimpleIntegerProperty version = new SimpleIntegerProperty();
/**
* 从Vo创建ViewModel
*/
public static CloudRkViewModel from(CloudRkVo v) {
CloudRkViewModel vm = new CloudRkViewModel();
vm.updateFrom(v);
return vm;
}
@Override
protected void updateFrom(CloudRk v) {
protected void updateFrom(CloudRkVo v) {
super.updateFrom(v);
cloudId.set(v.getCloudId());
updateDays.set(v.getUpdateDays());
@@ -103,17 +111,16 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
vendorGrade.set(v.getVendorGrade());
vendorDescription.set(v.getVendorDescription());
vendorScore.set(v.getVendorScore());
company.set(v.getCompany());
company.set(v.getCompanyId());
latestUpdate.set(v.getLatestUpdate());
cloudEntUpdate.set(v.getCloudEntUpdate());
cloudBlackListUpdated.set(v.getCloudBlackListUpdated());
cloudLatest.set(v.getCloudLatest());
cloudLatest.set(v.getCloudLatest());
version.set(v.getVersion());
}
@Override
public boolean copyTo(CloudRk v) {
public boolean copyTo(CloudRkVo v) {
boolean result = super.copyTo(v);
v.setCloudId(cloudId.get());
v.setUpdateDays(updateDays.get());
@@ -127,7 +134,7 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
v.setVendorGrade(vendorGrade.get());
v.setVendorDescription(vendorDescription.get());
v.setVendorScore(vendorScore.get());
v.setCompany(company.get());
v.setCompanyId(company.get());
v.setLatestUpdate(latestUpdate.get());
v.setCloudEntUpdate(cloudEntUpdate.get());
v.setCloudBlackListUpdated(cloudBlackListUpdated.get());