Entity 遗漏

topsun/src/main/java/com/huigou/topsun/common/NumberToStringSerializer.java

+package com.huigou.topsun.common;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+
+/**
+ * NumberToStringSerializer Jackson 数据类型转换
+ *
+ * @author qinzhenguan
+ * @createDate 2023/12/20 10:12
+ **/
+public class NumberToStringSerializer extends JsonSerializer<Number> {
+    @Override
+    public void serialize(Number number, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+        jsonGenerator.writeString(number.toString());
+    }
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/product/application/impl/ProductApplicationImpl.java

@@ -80,7 +80,7 @@ public class ProductApplicationImpl implements ProductApplication {
     @Override
     public Map<String, Object> queryDetailAll(Product product) {
         Map<String, Object> resultMap = new HashMap<>(200);
-        String productId = product.getProductId();
+        BigDecimal productId =  product.getProductId();
         ProductDetail productDetail = detailRepository.findByProductId(productId);
         ProductTechnology productTechnology = technologyRepository.findByProductId(productId);
 
@@ -181,7 +181,7 @@ public class ProductApplicationImpl implements ProductApplication {
         List<Product> products = query.getResultList();
 
         if(product != null) {
-            String id = product.getProductId();
+            BigDecimal id = product.getProductId();
             if(id == null) {
                 product.setProductId(String.valueOf(Snowflake.nextId()));
                 entityManager.persist(product);
@@ -189,7 +189,7 @@ public class ProductApplicationImpl implements ProductApplication {
             entityManager.merge(product);
         }
         if(productDetail != null) {
-            String id = productDetail.getProductDetailId();
+            BigDecimal id = productDetail.getProductDetailId();
             if(id == null) {
                 productDetail.setProductDetailId(String.valueOf(Snowflake.nextId()));
                 entityManager.persist(productDetail);
@@ -197,7 +197,7 @@ public class ProductApplicationImpl implements ProductApplication {
             entityManager.merge(productDetail);
         }
         if(productLooked != null) {
-            String id = productLooked.getProductLookedId();
+            BigDecimal id = productLooked.getProductLookedId();
             if(id == null) {
                 productLooked.setProductLookedId(String.valueOf(Snowflake.nextId()));
                 entityManager.persist(productLooked);

topsun/src/main/java/com/huigou/topsun/product/domain/Brand.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -12,12 +16,15 @@ import lombok.Data;
  */
 @Table(name="brand")
 @Entity
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Brand implements Serializable {
     /**
      * 品牌ID
      */
     @Id
     @Column(name = "brand_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal brandId;
 
     /**
@@ -38,8 +45,8 @@ public class Brand implements Serializable {
     @Column(name = "brand_remark")
     private String brandRemark;
 
-    public String getBrandId() {
-        return brandId.toString();
+    public BigDecimal getBrandId() {
+        return brandId;
     }
 
     public void setBrandId(String brandId) {

topsun/src/main/java/com/huigou/topsun/product/domain/Color.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -12,12 +16,15 @@ import lombok.Data;
  */
 @Table(name="color")
 @Entity
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Color implements Serializable {
     /**
      * 颜色ID
      */
     @Id
     @Column(name = "color_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal colorId;
 
     /**
@@ -38,8 +45,8 @@ public class Color implements Serializable {
     @Column(name = "color_remark")
     private String colorRemark;
 
-    public String getColorId() {
-        return colorId.toString();
+    public BigDecimal getColorId() {
+        return colorId;
     }
 
     public void setColorId(String colorId) {

topsun/src/main/java/com/huigou/topsun/product/domain/Factory.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -12,12 +16,15 @@ import lombok.Data;
  */
 @Table(name="factory")
 @Entity
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Factory implements Serializable {
     /**
      * 工厂ID
      */
     @Id
     @Column(name = "factory_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal factoryId;
 
     /**
@@ -32,8 +39,8 @@ public class Factory implements Serializable {
     @Column(name = "factory_code")
     private String factoryCode;
 
-    public String getFactoryId() {
-        return factoryId.toString();
+    public BigDecimal getFactoryId() {
+        return factoryId;
     }
 
     public void setFactoryId(String factoryId) {

topsun/src/main/java/com/huigou/topsun/product/domain/Product.java

@@ -5,17 +5,22 @@ import java.math.BigDecimal;
 import java.util.Objects;
 
 import javax.persistence.*;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * @author Tison
  * 产品
  */
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @Entity
 @Table(name = "product")
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Product implements Serializable {
 
 	/**
@@ -23,6 +28,7 @@ public class Product implements Serializable {
 	 */
 	@Id
 	@Column(name = "product_id", nullable = false)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productId;
 
 	/**
@@ -171,14 +177,14 @@ public class Product implements Serializable {
 				.toString();
 	}
 
-	public String getProductId() { return productId.toString(); }
+	public BigDecimal getProductId() { return productId; }
 
 	public void setProductId(String productId) {
 		this.productId = (productId != null) ? new BigDecimal(productId) : null;
 	}
 
-	public String getProductCategoryId() {
-		return productCategoryId.toString();
+	public BigDecimal getProductCategoryId() {
+		return productCategoryId;
 	}
 
 	public void setProductCategoryId(String productCategoryId) {

topsun/src/main/java/com/huigou/topsun/product/domain/ProductCategory.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -12,12 +16,15 @@ import lombok.Data;
  */
 @Table(name="product_category")
 @Entity
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductCategory implements Serializable {
     /**
      * 产品类别ID
      */
     @Id
     @Column(name = "product_category_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productCategoryId;
 
     /**
@@ -38,8 +45,8 @@ public class ProductCategory implements Serializable {
     @Column(name = "product_category_code")
     private String productCategoryCode;
 
-    public String getProductCategoryId() {
-        return productCategoryId.toString();
+    public BigDecimal getProductCategoryId() {
+        return productCategoryId;
     }
 
     public void setProductCategoryId(String productCategoryId) {

topsun/src/main/java/com/huigou/topsun/product/domain/ProductDetail.java

@@ -9,16 +9,18 @@ import javax.persistence.*;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * @author Tison
  * 产品详细信息
  */
-@JsonInclude(JsonInclude.Include.ALWAYS)
-@JsonIgnoreProperties(ignoreUnknown = true)
 @Entity
 @Table(name = "product_detail")
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductDetail implements Serializable {
 
 	/**
@@ -26,12 +28,14 @@ public class ProductDetail implements Serializable {
 	 */
 	@Id
 	@Column(name = "product_detail_id", nullable = false, length = 32)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productDetailId;
 
 	/**
 	 * 产品ID
 	 */
 	@Column(name = "product_id", nullable = true, length = 32)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productId;
 
 	/**
@@ -143,13 +147,13 @@ public class ProductDetail implements Serializable {
 				.toString();
 	}
 
-	public String getProductDetailId() { return productDetailId.toString(); }
+	public BigDecimal getProductDetailId() { return productDetailId; }
 
 	public void setProductDetailId(String productDetailId) {
 		this.productDetailId = (productDetailId != null) ? new BigDecimal(productDetailId) : null;
 	}
 
-	public String getProductId() { return productId.toString(); }
+	public BigDecimal getProductId() { return productId; }
 
 	public void setProductId(String productId) {
 		this.productId = (productId != null) ? new BigDecimal(productId) : null;

topsun/src/main/java/com/huigou/topsun/product/domain/ProductFace.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -12,12 +16,15 @@ import lombok.Data;
  */
 @Table(name="product_face")
 @Entity
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductFace implements Serializable {
     /**
      * 产品版面ID
      */
     @Id
     @Column(name = "product_face_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productFaceId;
 
     /**
@@ -26,8 +33,8 @@ public class ProductFace implements Serializable {
     @Column(name = "product_image")
     private String productImage;
 
-    public String getProductFaceId() {
-        return productFaceId.toString();
+    public BigDecimal getProductFaceId() {
+        return productFaceId;
     }
 
     public void setProductFaceId(String productFaceId) {

topsun/src/main/java/com/huigou/topsun/product/domain/ProductFaceColor.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -12,24 +16,29 @@ import lombok.Data;
  */
 @Table(name="product_face_color")
 @Entity
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductFaceColor implements Serializable {
     /**
      * 产品颜色ID
      */
     @Id
     @Column(name = "product_face_color_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productFaceColorId;
 
     /**
      * 产品版面ID
      */
     @Column(name = "product_face_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productFaceId;
 
     /**
      * 颜色ID
      */
     @Column(name = "color_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal colorId;
 
     /**
@@ -44,16 +53,16 @@ public class ProductFaceColor implements Serializable {
     @Column(name = "sort_order")
     private Integer sortOrder;
 
-    public String getProductFaceColorId() {
-        return productFaceColorId.toString();
+    public BigDecimal getProductFaceColorId() {
+        return productFaceColorId;
     }
 
     public void setProductFaceColorId(String productFaceColorId) {
         this.productFaceColorId = (productFaceColorId != null) ? new BigDecimal(productFaceColorId) : null;
     }
 
-    public String getProductFaceId() {
-        return productFaceId.toString();
+    public BigDecimal getProductFaceId() {
+        return productFaceId;
     }
 
     public void setProductFaceId(String productFaceId) {

topsun/src/main/java/com/huigou/topsun/product/domain/ProductLooked.java

@@ -9,16 +9,18 @@ import javax.persistence.*;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * @author Tison
  * 产品外观
  */
-@JsonInclude(JsonInclude.Include.ALWAYS)
-@JsonIgnoreProperties(ignoreUnknown = true)
 @Entity
 @Table(name = "product_looked")
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductLooked implements Serializable {
 
 	/**
@@ -26,12 +28,14 @@ public class ProductLooked implements Serializable {
 	 */
 	@Id
 	@Column(name = "product_looked_id", nullable = false, length = 32)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productLookedId;
 
 	/**
 	 * 产品ID
 	 */
 	@Column(name = "product_id", nullable = true, length = 32)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productId;
 
 	/**
@@ -173,14 +177,14 @@ public class ProductLooked implements Serializable {
 				.toString();
 	}
 
-	public String getProductLookedId() { return productLookedId.toString(); }
+	public BigDecimal getProductLookedId() { return productLookedId; }
 
 	public void setProductLookedId(String productLookedId) {
 		this.productLookedId = (productLookedId != null) ? new BigDecimal(productLookedId) : null;
 	}
 
 
-	public String getProductId() { return productId.toString(); }
+	public BigDecimal getProductId() { return productId; }
 
 	public void setProductId(String productId) {
 		this.productId = (productId != null) ? new BigDecimal(productId) : null;

topsun/src/main/java/com/huigou/topsun/product/domain/ProductLoss.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -12,18 +16,22 @@ import lombok.Data;
  */
 @Table(name="product_loss")
 @Entity
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductLoss implements Serializable {
     /**
      * 产品lossID
      */
     @Id
     @Column(name = "product_loss_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productLossId;
 
     /**
      * 产品ID
      */
     @Column(name = "product_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productId;
 
     /**
@@ -56,15 +64,15 @@ public class ProductLoss implements Serializable {
     @Column(name = "customer_name")
     private String customerName;
 
-    public String getProductLossId() {
-        return productLossId.toString();
+    public BigDecimal getProductLossId() {
+        return productLossId;
     }
 
     public void setProductLossId(String productLossId) {
         this.productLossId = (productLossId != null) ? new BigDecimal(productLossId) : null;
     }
 
-    public String getProductId() { return productId.toString(); }
+    public BigDecimal getProductId() { return productId; }
 
     public void setProductId(String productId) {
         this.productId = (productId != null) ? new BigDecimal(productId) : null;

topsun/src/main/java/com/huigou/topsun/product/domain/ProductMaterial.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -12,24 +16,29 @@ import lombok.Data;
  */
 @Table(name="product_material")
 @Entity
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductMaterial implements Serializable {
     /**
      * 产品物料组成ID
      */
     @Id
     @Column(name = "product_material_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productMaterialId;
 
     /**
      * 产品ID
      */
     @Column(name = "product_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productId;
 
     /**
      * 物料ID
      */
     @Column(name = "material_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal materialId;
 
     /**
@@ -50,16 +59,16 @@ public class ProductMaterial implements Serializable {
     @Column(name = "bom_type")
     private String bomType;
 
-    public String getProductMaterialId() {
-        return productMaterialId.toString();
+    public BigDecimal getProductMaterialId() {
+        return productMaterialId;
     }
 
     public void setProductMaterialId(String productMaterialId) {
         this.productMaterialId = (productMaterialId != null) ? new BigDecimal(productMaterialId) : null;
     }
 
-    public String getProductId() {
-        return productId.toString();
+    public BigDecimal getProductId() {
+        return productId;
     }
 
     public void setProductId(String productId) {

topsun/src/main/java/com/huigou/topsun/product/domain/ProductProcess.java

@@ -5,17 +5,22 @@ import java.math.BigDecimal;
 import java.util.Objects;
 
 import javax.persistence.*;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * @author Tison
  * 产品工艺工序
  */
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @Entity
 @Table(name = "product_process")
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductProcess implements Serializable {
 
 	/**
@@ -23,12 +28,14 @@ public class ProductProcess implements Serializable {
 	 */
 	@Id
 	@Column(name = "product_process_id", nullable = false, length = 32)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productProcessId;
 
 	/**
 	 * 工艺id
 	 */
 	@Column(name = "product_technology_id", nullable = true, length = 32)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productTechnologyId;
 
 	/**
@@ -93,16 +100,16 @@ public class ProductProcess implements Serializable {
 				.toString();
 	}
 
-	public String getProductProcessId() {
-		return productProcessId.toString();
+	public BigDecimal getProductProcessId() {
+		return productProcessId;
 	}
 
 	public void setProductProcessId(String productProcessId) {
 		this.productProcessId = (productProcessId != null) ? new BigDecimal(productProcessId) : null;
 	}
 
-	public String getProductTechnologyId() {
-		return productTechnologyId.toString();
+	public BigDecimal getProductTechnologyId() {
+		return productTechnologyId;
 	}
 
 	public void setProductTechnologyId(String productTechnologyId) {

topsun/src/main/java/com/huigou/topsun/product/domain/ProductPublishedConf.java

@@ -6,6 +6,8 @@ import javax.persistence.*;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -13,21 +15,23 @@ import lombok.Data;
  * @TableName product_published_conf
  */
 @Table(name="product_published_conf")
+@Entity
 @JsonInclude(JsonInclude.Include.ALWAYS)
 @JsonIgnoreProperties(ignoreUnknown = true)
-@Entity
 public class ProductPublishedConf implements Serializable {
     /**
      * 排版参数配置ID
      */
     @Id
     @Column(name = "product_published_conf_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productPublishedConfId;
 
     /**
      * 产品ID
      */
     @Column(name = "product_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productId;
 
     /**
@@ -90,16 +94,16 @@ public class ProductPublishedConf implements Serializable {
     @Column(name = "product_sheet_conf")
     private String productSheetConf;
 
-    public String getProductPublishedConfId() {
-        return productPublishedConfId.toString();
+    public BigDecimal getProductPublishedConfId() {
+        return productPublishedConfId;
     }
 
     public void setProductPublishedConfId(String productPublishedConfId) {
         this.productPublishedConfId = (productPublishedConfId != null) ? new BigDecimal(productPublishedConfId) : null;
     }
 
-    public String getProductId() {
-        return productId.toString();
+    public BigDecimal getProductId() {
+        return productId;
     }
 
     public void setProductId(String productId) {

topsun/src/main/java/com/huigou/topsun/product/domain/ProductRiskDescription.java

@@ -5,17 +5,22 @@ import java.math.BigDecimal;
 import java.util.Objects;
 
 import javax.persistence.*;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * @author Tison
  * 产品风险描述
  */
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @Entity
 @Table(name = "product_risk_description")
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductRiskDescription implements Serializable {
 
 	/**
@@ -23,12 +28,14 @@ public class ProductRiskDescription implements Serializable {
 	 */
 	@Id
 	@Column(name = "product_risk_description_id", nullable = false, length = 32)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productRiskDescriptionId;
 
 	/**
 	 * 产品id
 	 */
 	@Column(name = "product_id", nullable = true, length = 32)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productId;
 
 	/**
@@ -68,16 +75,16 @@ public class ProductRiskDescription implements Serializable {
 				.toString();
 	}
 
-	public String getProductRiskDescriptionId() {
-		return productRiskDescriptionId.toString();
+	public BigDecimal getProductRiskDescriptionId() {
+		return productRiskDescriptionId;
 	}
 
 	public void setProductRiskDescriptionId(String productRiskDescriptionId) {
 		this.productRiskDescriptionId = (productRiskDescriptionId != null) ? new BigDecimal(productRiskDescriptionId) : null;
 	}
 
-	public String getProductId() {
-		return productId.toString();
+	public BigDecimal getProductId() {
+		return productId;
 	}
 
 	public void setProductId(String productId) {

topsun/src/main/java/com/huigou/topsun/product/domain/ProductTechnology.java

@@ -8,16 +8,18 @@ import javax.persistence.*;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * @author Tison
  * 产品工艺
  */
-@JsonInclude(JsonInclude.Include.ALWAYS)
-@JsonIgnoreProperties(ignoreUnknown = true)
 @Entity
 @Table(name = "product_technology")
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductTechnology implements Serializable {
 
 	/**
@@ -25,12 +27,14 @@ public class ProductTechnology implements Serializable {
 	 */
 	@Id
 	@Column(name = "product_technology_id", nullable = false)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productTechnologyId;
 
 	/**
 	 * 产品id
 	 */
 	@Column(name = "product_id", nullable = true)
+	@JsonSerialize(using = NumberToStringSerializer.class)
 	private BigDecimal productId;
 
 	/**
@@ -214,14 +218,14 @@ public class ProductTechnology implements Serializable {
 				.toString();
 	}
 
-	public String getProductTechnologyId() { return productTechnologyId.toString(); }
+	public BigDecimal getProductTechnologyId() { return productTechnologyId; }
 
 	public void setProductTechnologyId(String productTechnologyId) {
 		this.productTechnologyId = (productTechnologyId != null) ? new BigDecimal(productTechnologyId) : null;
 	}
 
-	public String getProductId() {
-		return productId.toString();
+	public BigDecimal getProductId() {
+		return productId;
 	}
 
 	public void setProductId(String productId) {

topsun/src/main/java/com/huigou/topsun/product/domain/ProductTypesetConf.java

@@ -4,6 +4,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huigou.topsun.common.NumberToStringSerializer;
 import lombok.Data;
 
 /**
@@ -12,18 +16,22 @@ import lombok.Data;
  */
 @Table(name="product_typeset_conf")
 @Entity
+@JsonInclude(JsonInclude.Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductTypesetConf implements Serializable {
     /**
      * 产品排版配置ID
      */
     @Id
     @Column(name = "product_typeset_conf_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productTypesetConfId;
 
     /**
      * 产品ID
      */
     @Column(name = "product_id")
+    @JsonSerialize(using = NumberToStringSerializer.class)
     private BigDecimal productId;
 
     /**
@@ -47,16 +55,16 @@ public class ProductTypesetConf implements Serializable {
     @Column(name = "loss_rate")
     private Double lossRate;
 
-    public String getProductTypesetConfId() {
-        return productTypesetConfId.toString();
+    public BigDecimal getProductTypesetConfId() {
+        return productTypesetConfId;
     }
 
     public void setProductTypesetConfId(String productTypesetConfId) {
         this.productTypesetConfId = (productTypesetConfId != null) ? new BigDecimal(productTypesetConfId) : null;
     }
 
-    public String getProductId() {
-        return productId.toString();
+    public BigDecimal getProductId() {
+        return productId;
     }
 
     public void setProductId(String productId) {

topsun/src/main/java/com/huigou/topsun/product/repository/ProductDetailRepository.java

@@ -3,11 +3,13 @@ package com.huigou.topsun.product.repository;
 import com.huigou.topsun.product.domain.ProductDetail;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.math.BigDecimal;
+
 /**
  * @Auther: xin.lu
  * @Date: 2023/11/22/10:41
  * @Description:
  */
 public interface ProductDetailRepository extends JpaRepository<ProductDetail,String> {
-    ProductDetail findByProductId(String productId);
+    ProductDetail findByProductId(BigDecimal productId);
 }

topsun/src/main/java/com/huigou/topsun/product/repository/ProductLookedRepository.java

@@ -3,6 +3,8 @@ package com.huigou.topsun.product.repository;
 import com.huigou.topsun.product.domain.ProductLooked;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.math.BigDecimal;
+
 /**
  * @author qinzhenguan
  * @Auther: xin.lu
@@ -10,7 +12,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
  * @Description:
  */
 public interface ProductLookedRepository extends JpaRepository<ProductLooked,String> {
-    ProductLooked findByProductId(String productId);
+    ProductLooked findByProductId(BigDecimal productId);
     ProductLooked findByProductIdEquals(String productId);
 
 

topsun/src/main/java/com/huigou/topsun/product/repository/ProductLossRepository.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.product.repository;
 import com.huigou.topsun.product.domain.ProductLoss;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -11,6 +12,6 @@ import java.util.List;
  * @Description:
  */
 public interface ProductLossRepository extends JpaRepository<ProductLoss,String> {
-    List<ProductLoss> findByProductId(String productId);
+    List<ProductLoss> findByProductId(BigDecimal productId);
 
 }

topsun/src/main/java/com/huigou/topsun/product/repository/ProductMaterialRepository.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.product.repository;
 import com.huigou.topsun.product.domain.ProductMaterial;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -11,5 +12,5 @@ import java.util.List;
  * @Description:
  */
 public interface ProductMaterialRepository extends JpaRepository<ProductMaterial,String> {
-    List<ProductMaterial> findByProductId(String productId);
+    List<ProductMaterial> findByProductId(BigDecimal productId);
 }

topsun/src/main/java/com/huigou/topsun/product/repository/ProductProcessRepository.java

@@ -10,5 +10,5 @@ import java.util.List;
  * @author qinzhenguan
  */
 public interface ProductProcessRepository extends JpaRepository<ProductProcess, Long> {
-    List<ProductProcess> findByProductTechnologyId(String productTechnologyId);
+    List<ProductProcess> findByProductTechnologyId(BigDecimal productTechnologyId);
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/product/repository/ProductPublishedConfRepository.java

@@ -3,13 +3,15 @@ package com.huigou.topsun.product.repository;
 import com.huigou.topsun.product.domain.ProductPublishedConf;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.math.BigDecimal;
+
 /**
  * @Auther: xin.lu
  * @Date: 2023/11/22/10:46
  * @Description:
  */
 public interface ProductPublishedConfRepository extends JpaRepository<ProductPublishedConf,String> {
-    ProductPublishedConf findByProductId(String productId);
+    ProductPublishedConf findByProductId(BigDecimal productId);
 
     ProductPublishedConf getProductPublishedConfByProductId(String productId);
 }

topsun/src/main/java/com/huigou/topsun/product/repository/ProductTechnologyRepository.java

@@ -3,9 +3,11 @@ package com.huigou.topsun.product.repository;
 import com.huigou.topsun.product.domain.ProductTechnology;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.math.BigDecimal;
+
 /**
  * @author qinzhenguan
  */
 public interface ProductTechnologyRepository extends JpaRepository<ProductTechnology, Long> {
-    ProductTechnology findByProductId(String productId);
+    ProductTechnology findByProductId(BigDecimal productId);
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/product/repository/ProductTypesetConfRepository.java

@@ -3,11 +3,13 @@ package com.huigou.topsun.product.repository;
 import com.huigou.topsun.product.domain.ProductTypesetConf;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.math.BigDecimal;
+
 /**
  * @Auther: xin.lu
  * @Date: 2023/11/22/10:46
  * @Description:
  */
 public interface ProductTypesetConfRepository extends JpaRepository<ProductTypesetConf,String> {
-    ProductTypesetConf findByProductId(String productId);
+    ProductTypesetConf findByProductId(BigDecimal productId);
 }