refactor(vo): 重构VO对象结构,统一字段命名和接口实现
重构所有VO对象,统一字段命名规范,移除冗余字段,优化接口实现 新增Voable接口用于VO对象转换 调整BaseViewModel和ProjectBasedViewModel接口定义 更新相关服务和控制器以适应VO对象变更
This commit is contained in:
@@ -6,6 +6,7 @@ import java.util.Objects;
|
||||
import com.ecep.contract.model.Employee;
|
||||
import com.ecep.contract.model.EmployeeAuthBind;
|
||||
|
||||
import com.ecep.contract.vo.EmployeeAuthBindVo;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import lombok.Data;
|
||||
@@ -13,21 +14,25 @@ import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class EmployeeAuthBindViewModel extends IdentityViewModel<EmployeeAuthBind> implements EmployeeBasedViewModel {
|
||||
public class EmployeeAuthBindViewModel extends IdentityViewModel<EmployeeAuthBindVo> implements EmployeeBasedViewModel {
|
||||
private SimpleStringProperty ip = new SimpleStringProperty();
|
||||
private SimpleStringProperty mac = new SimpleStringProperty();
|
||||
|
||||
private SimpleObjectProperty<Employee> employee = new SimpleObjectProperty<>();
|
||||
/**
|
||||
* Employee
|
||||
*/
|
||||
private SimpleObjectProperty<Integer> employee = new SimpleObjectProperty<>();
|
||||
|
||||
private SimpleObjectProperty<LocalDateTime> createTime = new SimpleObjectProperty<>();
|
||||
|
||||
private SimpleObjectProperty<Employee> updater = new SimpleObjectProperty<>();
|
||||
/**
|
||||
* Employee
|
||||
*/
|
||||
private SimpleObjectProperty<Integer> updater = new SimpleObjectProperty<>();
|
||||
private SimpleObjectProperty<LocalDateTime> updateTime = new SimpleObjectProperty<>();
|
||||
|
||||
private SimpleStringProperty description = new SimpleStringProperty();
|
||||
|
||||
|
||||
public static EmployeeAuthBindViewModel from(EmployeeAuthBind v) {
|
||||
public static EmployeeAuthBindViewModel from(EmployeeAuthBindVo v) {
|
||||
EmployeeAuthBindViewModel vm = new EmployeeAuthBindViewModel();
|
||||
vm.update(v);
|
||||
return vm;
|
||||
@@ -35,19 +40,19 @@ public class EmployeeAuthBindViewModel extends IdentityViewModel<EmployeeAuthBin
|
||||
|
||||
|
||||
@Override
|
||||
protected void updateFrom(EmployeeAuthBind v) {
|
||||
protected void updateFrom(EmployeeAuthBindVo v) {
|
||||
super.updateFrom(v);
|
||||
getIp().set(v.getIp());
|
||||
getMac().set(v.getMac());
|
||||
getEmployee().set(v.getEmployee());
|
||||
getEmployee().set(v.getEmployeeId());
|
||||
getCreateTime().set(v.getCreateTime());
|
||||
getUpdater().set(v.getUpdater());
|
||||
getUpdater().set(v.getUpdaterId());
|
||||
getUpdateTime().set(v.getUpdateTime());
|
||||
getDescription().set(v.getDescription());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean copyTo(EmployeeAuthBind v) {
|
||||
public boolean copyTo(EmployeeAuthBindVo v) {
|
||||
boolean modified = super.copyTo(v);
|
||||
if (!Objects.equals(getIp().get(), v.getIp())) {
|
||||
v.setIp(getIp().get());
|
||||
@@ -57,16 +62,16 @@ public class EmployeeAuthBindViewModel extends IdentityViewModel<EmployeeAuthBin
|
||||
v.setMac(getMac().get());
|
||||
modified = true;
|
||||
}
|
||||
if (!Objects.equals(getEmployee().get(), v.getEmployee())) {
|
||||
v.setEmployee(getEmployee().get());
|
||||
if (!Objects.equals(getEmployee().get(), v.getEmployeeId())) {
|
||||
v.setEmployeeId(getEmployee().get());
|
||||
modified = true;
|
||||
}
|
||||
if (!Objects.equals(getCreateTime().get(), v.getCreateTime())) {
|
||||
v.setCreateTime(getCreateTime().get());
|
||||
modified = true;
|
||||
}
|
||||
if (!Objects.equals(getUpdater().get(), v.getUpdater())) {
|
||||
v.setUpdater(getUpdater().get());
|
||||
if (!Objects.equals(getUpdater().get(), v.getUpdaterId())) {
|
||||
v.setUpdaterId(getUpdater().get());
|
||||
modified = true;
|
||||
}
|
||||
if (!Objects.equals(getUpdateTime().get(), v.getUpdateTime())) {
|
||||
|
||||
Reference in New Issue
Block a user