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

refactor: 重构WebSocket服务及相关实体类

Browse Source 
重构WebSocket服务名称从WebSocketService改为WebSocketClientService，并实现Serializable接口
添加WebSocket常量定义和消息处理实现
优化实体类equals和hashCode方法
修复控制器路径和日志配置
添加查询服务和任务接口方法
This commit is contained in:
宋其青
2025-09-17 11:45:50 +08:00
parent 30deb0a280
commit c42ff7501d
152 changed files with 1933 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileTypeLocalViewModel.java
View File

@@ -1,4 +1,12 @@
package com.ecep.contract.vm;
public class CompanyCustomerFileTypeLocalViewModel {
import com.ecep.contract.CompanyCustomerFileType;
import com.ecep.contract.model.CompanyCustomerFileTypeLocal;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class CompanyCustomerFileTypeLocalViewModel extends EnumViewModel<CompanyCustomerFileType, CompanyCustomerFileTypeLocal> {
}

11
client/src/main/java/com/ecep/contract/vm/CompanyVendorFileTypeLocalViewModel.java
View File

@@ -1,4 +1,13 @@
package com.ecep.contract.vm;
public class CompanyVendorFileTypeLocalViewModel {
import com.ecep.contract.CompanyCustomerFileType;
import com.ecep.contract.CompanyVendorFileType;
import com.ecep.contract.model.CompanyCustomerFileTypeLocal;
import com.ecep.contract.model.CompanyVendorFileTypeLocal;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class CompanyVendorFileTypeLocalViewModel extends EnumViewModel<CompanyVendorFileType, CompanyVendorFileTypeLocal> {
}

20
client/src/main/java/com/ecep/contract/vm/ContractFileTypeLocalViewModel.java
View File

@@ -12,40 +12,22 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class ContractFileTypeLocalViewModel extends IdentityViewModel<ContractFileTypeLocal> {
private SimpleObjectProperty<ContractFileType> type = new SimpleObjectProperty<>();
public class ContractFileTypeLocalViewModel extends EnumViewModel<ContractFileType, ContractFileTypeLocal> {
private SimpleStringProperty suggestFileName = new SimpleStringProperty();
private SimpleStringProperty lang = new SimpleStringProperty();
private SimpleStringProperty value = new SimpleStringProperty();
@Override
protected void updateFrom(ContractFileTypeLocal v) {
super.updateFrom(v);
type.set(v.getType());
suggestFileName.set(v.getSuggestFileName());
lang.set(v.getLang());
value.set(v.getValue());
}
@Override
public boolean copyTo(ContractFileTypeLocal v) {
boolean ret = super.copyTo(v);
if (!Objects.equals(type.get(), v.getType())) {
v.setType(type.get());
ret = true;
}
if (!Objects.equals(suggestFileName.get(), v.getSuggestFileName())) {
v.setSuggestFileName(suggestFileName.get());
ret = true;
}
if (!Objects.equals(lang.get(), v.getLang())) {
v.setLang(lang.get());
ret = true;
}
if (!Objects.equals(value.get(), v.getValue())) {
v.setValue(value.get());
ret = true;
}
return ret;
}
}

41
client/src/main/java/com/ecep/contract/vm/EnumViewModel.java
View File

@@ -1,4 +1,43 @@
package com.ecep.contract.vm;
public class EnumViewModel {
import com.ecep.contract.model.BaseEnumEntity;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Objects;
@Data
@EqualsAndHashCode(callSuper = true)
public class EnumViewModel<K extends Enum<?>, T extends BaseEnumEntity<K>> extends IdentityViewModel<T> {
private SimpleObjectProperty<K> type = new SimpleObjectProperty<>();
private SimpleStringProperty lang = new SimpleStringProperty();
private SimpleStringProperty value = new SimpleStringProperty();
@Override
protected void updateFrom(T v) {
super.updateFrom(v);
type.set(v.getType());
lang.set(v.getLang());
value.set(v.getValue());
}
@Override
public boolean copyTo(T v) {
boolean ret = super.copyTo(v);
if (!Objects.equals(v.getType(), type.get())) {
v.setType(type.get());
ret = true;
}
if (!Objects.equals(v.getLang(), lang.get())) {
v.setLang(lang.get());
ret = true;
}
if (!Objects.equals(v.getValue(), value.get())) {
v.setValue(value.get());
ret = true;
}
return ret;
}
}