From a69402c8b67d8ce4b698d0c394d15ff43b5d99d0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 14 十二月 2023 23:17:41 +0800
Subject: [PATCH] 提交正来电子协议解析-3

---
 src/main/java/com/fzzy/api/entity/Api1102.java |   76 +++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/fzzy/api/entity/Api1102.java b/src/main/java/com/fzzy/api/entity/Api1102.java
index 801c79d..201d98c 100644
--- a/src/main/java/com/fzzy/api/entity/Api1102.java
+++ b/src/main/java/com/fzzy/api/entity/Api1102.java
@@ -5,6 +5,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -12,31 +14,25 @@
 import javax.persistence.Table;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * 鎺ュ彛琛�-搴撳尯淇℃伅
  */
-@Data
+@Getter
+@Setter
 @Entity
 @Table(name = "API_1102")
 public class Api1102 implements Serializable {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 6597930270077627879L;
 
-
+    /*----------鍥芥爣瀛楁----------*/
     @Id
     @PropertyDef(label = "搴撳尯浠g爜")
     @Column(name = "kqdm", length = 21)
     private String kqdm;
-
-    @JsonIgnore
-    @PropertyDef(label = "涓氬姟id")
-    @Column(name = "bizId", length = 40)
-    private String bizId;
 
     @PropertyDef(label = "鍗曚綅浠g爜")
     @Column(name = "dwdm", length = 18)
@@ -54,26 +50,21 @@
     @Column(name = "xzqhdm", length = 6)
     private String xzqhdm;
 
-    @JSONField(serialize = false)
-    @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
-    @Column(name = "xzqhmc", length = 20)
-    private String xzqhmc;
-
     @PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
     @Column(name = "kqcq", length = 1)
     private String kqcq;
 
     @PropertyDef(label = "鏈夋晥浠撳")
     @Column(name = "yxcr", precision = 20, scale = 6)
-    private double yxcr;
+    private Double yxcr;
 
     @PropertyDef(label = "鏈夋晥缃愬")
     @Column(name = "yxgr", precision = 20, scale = 6)
-    private double yxgr;
+    private Double yxgr;
 
     @PropertyDef(label = "鍗犲湴闈㈢Н")
     @Column(name = "zdmj", precision = 20, scale = 6)
-    private double zdmj;
+    private Double zdmj;
 
     @PropertyDef(label = "浠撴埧鏁�")
     @Column(name = "cfs")
@@ -85,23 +76,15 @@
 
     @PropertyDef(label = "搴撳尯缁忓害")
     @Column(name = "jd", precision = 20, scale = 6)
-    private double jd;
+    private Double jd;
 
     @PropertyDef(label = "搴撳尯绾害")
     @Column(name = "wd", precision = 20, scale = 6)
-    private double wd;
+    private Double wd;
 
     @PropertyDef(label = "搴撳尯鐘舵��", description = "1:姝e父锛堥粯璁わ級 2:閫�鍑哄偍澶囩伯鎵垮偍")
     @Column(name = "kqzt", length = 1)
     private String kqzt;
-
-    @PropertyDef(label = "娴峰悍鍖哄煙ID", description = "瀵瑰簲娴峰悍瑙嗛骞冲彴regionIndexCode瀛楁")
-    @Column(name = "hkRegionId", length = 36)
-    private String hkRegionId;
-
-    @PropertyDef(label = "浜ф潈鏂瑰簱鍖轰唬鐮�", description = "鑷湁浜ф潈鏃跺簱鍖轰唬鐮佸繀椤荤瓑浜庝骇鏉冩柟搴撳尯浠g爜,闈炶嚜鏈変骇鏉冩椂搴撳尯浠g爜涓嶈兘绛変簬浜ф潈鏂瑰簱鍖轰唬鐮�")
-    @Column(name = "cqfkqdm", length = 21)
-    private String cqfkqdm;
 
     @PropertyDef(label = "鎿嶄綔鏍囧織")
     @Column(name = "czbz", length = 1)
@@ -112,9 +95,44 @@
     @Column(name = "zhgxsj", nullable = false)
     private Date zhgxsj;
 
+
+    /*----------骞夸笢鐪佸钩鍙拌鑼冨瓧娈�----------*/
+    @PropertyDef(label = "娴峰悍鍖哄煙ID", description = "瀵瑰簲娴峰悍瑙嗛骞冲彴regionIndexCode瀛楁")
+    @Column(name = "hkRegionId", length = 36)
+    private String hkRegionId;
+
+    @PropertyDef(label = "浜ф潈鏂瑰簱鍖轰唬鐮�", description = "鑷湁浜ф潈鏃跺簱鍖轰唬鐮佸繀椤荤瓑浜庝骇鏉冩柟搴撳尯浠g爜,闈炶嚜鏈変骇鏉冩椂搴撳尯浠g爜涓嶈兘绛変簬浜ф潈鏂瑰簱鍖轰唬鐮�")
+    @Column(name = "cqfkqdm", length = 21)
+    private String cqfkqdm;
+
+
+    /*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
     @PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:鍖虹骇鐩村睘锛�3:绀句細浠撳锛�4:鍏朵粬")
-    @JSONField(serialize = false)
     @Column(name = "kqsx", length = 1)
     private String kqsx;
 
+    @PropertyDef(label = "寤掗棿鏁�")
+    @Column(name = "ajs")
+    private Integer ajs;
+
+    @PropertyDef(label = "鏍囪浣�")
+    @Column(name = "bjw", length = 40)
+    private String bjw;
+
+    @PropertyDef(label = "鍌ㄥ浠撳")
+    @Column(name = "cbcr")
+    private Double cbcr;
+
+
+    /*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
+    @JsonIgnore
+    @PropertyDef(label = "涓氬姟id")
+    @Column(name = "bizId", length = 40)
+    private String bizId;
+
+    @JSONField(serialize = false)
+    @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
+    @Column(name = "xzqhmc", length = 20)
+    private String xzqhmc;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3