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

3
common/src/main/java/com/ecep/contract/model/CompanyVendor.java
View File

@@ -6,6 +6,8 @@ import java.time.LocalDate;
import java.util.List;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.hibernate.annotations.ColumnDefault;
import com.ecep.contract.VendorType;
@@ -56,6 +58,7 @@ public class CompanyVendor implements IdentityEntity, CompanyBasedEntity, Serial
private Company company;
@OneToMany(mappedBy = "vendor", fetch = FetchType.LAZY)
@JsonIgnore
@ToString.Exclude
private List<CompanyVendorEntity> entities;

4
common/src/main/java/com/ecep/contract/model/CompanyVendorFileTypeLocal.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.CompanyVendorFileType;
@@ -19,7 +20,8 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_VENDOR_FILE_TYPE_LOCAL")
@ToString
public class CompanyVendorFileTypeLocal extends BaseEnumEntity<CompanyVendorFileType> {
public class CompanyVendorFileTypeLocal extends BaseEnumEntity<CompanyVendorFileType> implements Serializable {
private static final long serialVersionUID = 1L;
@Override
public final boolean equals(Object object) {
if (this == object)

4
common/src/main/java/com/ecep/contract/model/ContractFileTypeLocal.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.ContractFileType;
@@ -20,7 +21,8 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT_FILE_TYPE_LOCAL")
@ToString
public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> {
public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 建议的文件名
*/

1
common/src/main/java/com/ecep/contract/model/ContractGroup.java
View File

@@ -64,6 +64,7 @@ public class ContractGroup implements IdentityEntity, NamedEntity, Serializable
@Override
public final int hashCode() {
super.hashCode();
return HibernateProxyUtils.hashCode(this);
}
}

4
common/src/main/java/com/ecep/contract/model/CustomerCatalog.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
@@ -22,7 +23,8 @@ import lombok.ToString;
@Entity
@Table(name = "CUSTOMER_CATALOG", schema = "supplier_ms")
@ToString
public class CustomerCatalog implements BasedEntity, IdentityEntity {
public class CustomerCatalog implements BasedEntity, IdentityEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY)

4
common/src/main/java/com/ecep/contract/model/CustomerSatisfactionSurvey.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Objects;
@@ -27,7 +28,8 @@ import lombok.ToString;
@Entity
@Table(name = "PROJECT_CUSTOMER_SATISFACTION_SURVEY", schema = "supplier_ms")
@ToString
public class CustomerSatisfactionSurvey implements IdentityEntity, ProjectBasedEntity {
public class CustomerSatisfactionSurvey implements IdentityEntity, ProjectBasedEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

4
common/src/main/java/com/ecep/contract/model/DeliverySignMethod.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
@@ -24,7 +25,8 @@ import lombok.ToString;
@Setter
@Entity
@Table(name = "PRODUCT_DELIVERY_SIGN_METHOD", schema = "supplier_ms")
public class DeliverySignMethod implements BasedEntity, IdentityEntity {
public class DeliverySignMethod implements BasedEntity, IdentityEntity , Serializable {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY)

5
common/src/main/java/com/ecep/contract/model/Employee.java
View File

@@ -117,8 +117,11 @@ public class Employee implements BasedEntity, IdentityEntity, NamedEntity, Seria
public final boolean equals(Object object) {
if (this == object)
return true;
if (object == null || HibernateProxyUtils.isNotEffectiveClassEquals(this, object))
if (object == null)
return false;
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
return false;
}
Employee employee = (Employee) object;
return getId() != null && Objects.equals(getId(), employee.getId());
}

19
common/src/main/java/com/ecep/contract/model/ExtendVendorInfo.java
View File

@@ -1,28 +1,21 @@
package com.ecep.contract.model;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import java.util.Objects;
@Getter
@Setter
@Entity
@Table(name = "CONTRACT_EXTEND_VENDOR_INFO", schema = "supplier_ms")
@ToString
public class ExtendVendorInfo implements IdentityEntity {
public class ExtendVendorInfo implements IdentityEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

5
common/src/main/java/com/ecep/contract/model/HistoryPrice.java
View File

@@ -3,11 +3,13 @@ package com.ecep.contract.model;
import jakarta.persistence.Embeddable;
import lombok.Data;
import java.io.Serializable;
import java.time.MonthDay;
@Embeddable
@Data
public class HistoryPrice {
public class HistoryPrice implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 税率，1% =1，100% =100
*/
@@ -22,7 +24,6 @@ public class HistoryPrice {
private double postTaxPrice;
/**
* 12-31, 字符串方式存储
* {@link com.ecep.contract.manager.ds.MonthDayConverter}
*/
private MonthDay monthDay;
}

4
common/src/main/java/com/ecep/contract/model/HolidayTable.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Objects;
@@ -21,7 +22,8 @@ import lombok.ToString;
@Entity
@Table(name = "HOLIDAY_TABLE")
@ToString
public class HolidayTable {
public class HolidayTable implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@JdbcTypeCode(SqlTypes.DATE)

4
common/src/main/java/com/ecep/contract/model/InventoryHistoryPrice.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.time.Year;
import java.util.Objects;
@@ -26,7 +27,8 @@ import lombok.ToString;
@ToString
@Entity
@Table(name = "INVENTORY_HISTORY", schema = "supplier_ms")
public class InventoryHistoryPrice implements IdentityEntity {
public class InventoryHistoryPrice implements IdentityEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

2
common/src/main/java/com/ecep/contract/model/ProjectFile.java
View File

@@ -29,7 +29,7 @@ import lombok.ToString;
@Entity
@Table(name = "PROJECT_FILE")
@ToString
public class ProjectFile implements IdentityEntity, ProjectBasedEntity, Serializable {
public class ProjectFile implements IdentityEntity, ProjectBasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id

4
common/src/main/java/com/ecep/contract/model/ProjectFileTypeLocal.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.ProjectFileType;
@@ -16,7 +17,8 @@ import lombok.ToString;
@Entity
@Table(name = "PROJECT_FILE_TYPE_LOCAL")
@ToString
public class ProjectFileTypeLocal extends BaseEnumEntity<ProjectFileType> {
public class ProjectFileTypeLocal extends BaseEnumEntity<ProjectFileType> implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@Override
public final boolean equals(Object object) {
if (this == object) {

3
common/src/main/java/com/ecep/contract/model/ProjectFundPlan.java
View File

@@ -32,7 +32,8 @@ import lombok.ToString;
@Entity
@Table(name = "PROJECT_FUND_PLAN")
@ToString
public class ProjectFundPlan implements IdentityEntity, ProjectBasedEntity {
public class ProjectFundPlan implements IdentityEntity, ProjectBasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/ProjectQuotation.java
View File

@@ -30,7 +30,8 @@ import lombok.ToString;
@Entity
@Table(name = "PROJECT_QUOTATION")
@ToString
public class ProjectQuotation implements IdentityEntity, ProjectBasedEntity {
public class ProjectQuotation implements IdentityEntity, ProjectBasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

4
common/src/main/java/com/ecep/contract/model/ProjectSaleType.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
@@ -20,7 +21,8 @@ import lombok.Setter;
@Setter
@Entity
@Table(name = "PROJECT_SALE_TYPE")
public class ProjectSaleType implements IdentityEntity, NamedEntity, BasedEntity {
public class ProjectSaleType implements IdentityEntity, NamedEntity, BasedEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY)

3
common/src/main/java/com/ecep/contract/model/ProjectSaleTypeRequireFileType.java
View File

@@ -27,7 +27,8 @@ import lombok.ToString;
@Setter
@Entity
@Table(name = "PROJECT_SALE_TYPE_REQ_FILE_TYPE")
public class ProjectSaleTypeRequireFileType implements IdentityEntity, BasedEntity {
public class ProjectSaleTypeRequireFileType implements IdentityEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY)

2
common/src/main/java/com/ecep/contract/model/ProjectType.java
View File

@@ -21,7 +21,7 @@ import lombok.Setter;
@Setter
@Entity
@Table(name = "PROJECT_TYPE")
public class ProjectType implements IdentityEntity, NamedEntity, BasedEntity, Serializable {
public class ProjectType implements IdentityEntity, NamedEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/PurchaseBillVoucher.java
View File

@@ -27,7 +27,8 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_BILL_VOUCHER", schema = "supplier_ms")
@ToString
public class PurchaseBillVoucher implements IdentityEntity, BasedEntity {
public class PurchaseBillVoucher implements IdentityEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/PurchaseBillVoucherItem.java
View File

@@ -26,7 +26,8 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_BILL_VOUCHER_ITEM", schema = "supplier_ms")
@ToString
public class PurchaseBillVoucherItem implements IdentityEntity, BasedEntity {
public class PurchaseBillVoucherItem implements IdentityEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/PurchaseOrder.java
View File

@@ -27,7 +27,8 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_ORDER", schema = "supplier_ms")
@ToString
public class PurchaseOrder implements IdentityEntity, BasedEntity, ContractBasedEntity {
public class PurchaseOrder implements IdentityEntity, BasedEntity, ContractBasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/PurchaseOrderItem.java
View File

@@ -27,7 +27,8 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_ORDER_ITEM", schema = "supplier_ms")
@ToString
public class PurchaseOrderItem implements IdentityEntity, BasedEntity {
public class PurchaseOrderItem implements IdentityEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/PurchaseReceipt.java
View File

@@ -27,7 +27,8 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_RECEIPT", schema = "supplier_ms")
@ToString
public class PurchaseReceipt implements IdentityEntity, BasedEntity {
public class PurchaseReceipt implements IdentityEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/PurchaseSettlementVoucher.java
View File

@@ -27,7 +27,8 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_SETTLE_VOUCHER", schema = "supplier_ms")
@ToString
public class PurchaseSettlementVoucher implements IdentityEntity, BasedEntity {
public class PurchaseSettlementVoucher implements IdentityEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/PurchaseSettlementVoucherItem.java
View File

@@ -26,7 +26,8 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_SETTLE_VOUCHER_ITEM", schema = "supplier_ms")
@ToString
public class PurchaseSettlementVoucherItem implements IdentityEntity, BasedEntity {
public class PurchaseSettlementVoucherItem implements IdentityEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/SalesBillVoucher.java
View File

@@ -27,7 +27,8 @@ import lombok.ToString;
@Entity
@Table(name = "SALES_BILL_VOUCHER", schema = "supplier_ms")
@ToString
public class SalesBillVoucher implements IdentityEntity, BasedEntity {
public class SalesBillVoucher implements IdentityEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

3
common/src/main/java/com/ecep/contract/model/SalesBillVoucherItem.java
View File

@@ -26,7 +26,8 @@ import lombok.ToString;
@Entity
@Table(name = "SALES_BILL_VOUCHER_ITEM", schema = "supplier_ms")
@ToString
public class SalesBillVoucherItem implements IdentityEntity, BasedEntity {
public class SalesBillVoucherItem implements IdentityEntity, BasedEntity, java.io.Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

4
common/src/main/java/com/ecep/contract/model/SalesOrder.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Objects;
@@ -27,7 +28,8 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT_SALES_ORDER", schema = "supplier_ms")
@ToString
public class SalesOrder implements IdentityEntity, BasedEntity, ContractBasedEntity {
public class SalesOrder implements IdentityEntity, BasedEntity, ContractBasedEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

42
common/src/main/java/com/ecep/contract/model/SalesOrderInvoice.java
View File

@@ -1,4 +1,44 @@
package com.ecep.contract.model;
public class SalesOrderInvoice {
import com.ecep.contract.util.HibernateProxyUtils;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.proxy.HibernateProxy;
import java.io.Serializable;
import java.util.Objects;
/**
* 销售订单发票
*/
@Getter
@Setter
@RequiredArgsConstructor
@Entity
@Table(name = "SALES_ORDER_INVOICE", schema = "supplier_ms")
@ToString
public class SalesOrderInvoice implements IdentityEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)
private Integer id;
@Override
public final boolean equals(Object o) {
if (this == o) return true;
if (o == null) return false;
if (HibernateProxyUtils.isNotEffectiveClassEquals(o, this)) {
return false;
}
SalesOrderInvoice that = (SalesOrderInvoice) o;
return getId() != null && Objects.equals(getId(), that.getId());
}
@Override
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
}

4
common/src/main/java/com/ecep/contract/model/SalesOrderItem.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Objects;
@@ -27,7 +28,8 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT_SALES_ORDER_ITEM", schema = "supplier_ms")
@ToString
public class SalesOrderItem implements IdentityEntity, BasedEntity {
public class SalesOrderItem implements IdentityEntity, BasedEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "ID", nullable = false)

16
common/src/main/java/com/ecep/contract/model/VendorGroup.java
View File

@@ -1,19 +1,14 @@
package com.ecep.contract.model;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import java.util.Objects;
/**
* 采购合同类型
*/
@@ -22,7 +17,8 @@ import lombok.ToString;
@Entity
@Table(name = "VENDOR_GROUP", schema = "supplier_ms")
@ToString
public class VendorGroup implements IdentityEntity, NamedEntity, BasedEntity {
public class VendorGroup implements IdentityEntity, NamedEntity, BasedEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)

4
common/src/main/java/com/ecep/contract/model/VendorGroupRequireFileType.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.ContractFileType;
@@ -27,7 +28,8 @@ import lombok.ToString;
@Setter
@Entity
@Table(name = "VENDOR_GROUP_REQ_FILE_TYPE")
public class VendorGroupRequireFileType implements IdentityEntity, BasedEntity {
public class VendorGroupRequireFileType implements IdentityEntity, BasedEntity, Serializable {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY)

4
common/src/main/java/com/ecep/contract/model/VendorTypeLocal.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.VendorType;
@@ -19,7 +20,8 @@ import lombok.ToString;
@Entity
@Table(name = "VENDOR_TYPE_LOCAL")
@ToString(callSuper = true)
public class VendorTypeLocal extends BaseEnumEntity<VendorType> {
public class VendorTypeLocal extends BaseEnumEntity<VendorType> implements Serializable {
private static final long serialVersionUID = 1L;
@Override
public final boolean equals(Object object) {

5
common/src/main/java/com/ecep/contract/model/VolumeSize.java
View File

@@ -3,12 +3,15 @@ package com.ecep.contract.model;
import jakarta.persistence.Embeddable;
import lombok.Data;
import java.io.Serializable;
/**
* 体积尺寸
*/
@Embeddable
@Data
public class VolumeSize {
public class VolumeSize implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 体积
*/