From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 一月 2025 11:29:05 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/api/entity/Api1306.java | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1306.java b/src/main/java/com/fzzy/api/entity/Api1306.java
index 134219e..9843ea5 100644
--- a/src/main/java/com/fzzy/api/entity/Api1306.java
+++ b/src/main/java/com/fzzy/api/entity/Api1306.java
@@ -30,29 +30,29 @@
@Id
@PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿" )
- @Column(name = "xzzydh", length = 36, nullable = false)
+ @Column(name = "xzzydh", length = 36)
private String xzzydh;
@PropertyDef(label = "浠撴埧浠ｇ爜" )
- @Column(name = "cfdm", length = 25, nullable = false)
+ @Column(name = "cfdm", length = 25)
private String cfdm;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鐔忚捀寮�濮嬫椂闂�" )
- @Column(name = "xzkssj", nullable = false)
+ @Column(name = "xzkssj")
private Date xzkssj;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鐔忚捀缁撴潫鏃堕棿" )
- @Column(name = "xzjssj", nullable = false)
+ @Column(name = "xzjssj")
private Date xzjssj;
@PropertyDef(label = "瀹宠櫕妫�娴嬪崟鍙�" )
- @Column(name = "hcjcdh", length = 42, nullable = false)
+ @Column(name = "hcjcdh", length = 42)
private String hcjcdh;
- @PropertyDef(label = "灏佷粨鍚庣啅钂哥殑娆℃暟" )
- @Column(name = "djcxz", nullable = false)
+ @PropertyDef(label = "灏佷粨鍚庣啅钂哥殑娆℃暟 绗嚑娆＄啅钂�" )
+ @Column(name = "djcxz")
private Integer djcxz;
@PropertyDef(label = "甯歌鐔忚捀鏂瑰紡" )
@@ -92,7 +92,7 @@
private String syzzsh;
@PropertyDef(label = "鑽墏鍚嶇О" )
- @Column(name = "yjmc", length = 64, nullable = false)
+ @Column(name = "yjmc", length = 64)
private String yjmc;
@PropertyDef(label = "鍓傚瀷" )
@@ -101,22 +101,22 @@
@PropertyDef(label = "娴撳害" )
@Column(name = "nd", precision = 20, scale = 3)
- private double nd;
+ private Double nd;
@PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�" )
@Column(name = "lddwyyl", precision = 20, scale = 3)
- private double lddwyyl;
+ private Double lddwyyl;
@PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�" )
@Column(name = "kjdwyyl", precision = 20, scale = 3)
- private double kjdwyyl;
+ private Double kjdwyyl;
@PropertyDef(label = "鎬荤敤鑽噺" )
@Column(name = "zyyl", precision = 20, scale = 3)
- private double zyyl;
+ private Double zyyl;
@PropertyDef(label = "鏂借嵂鏂规硶" )
- @Column(name = "syff", length = 1, nullable = false)
+ @Column(name = "syff", length = 1)
private String syff;
@PropertyDef(label = "杈呭姪鏂借嵂鎺柦" )
@@ -145,19 +145,23 @@
@PropertyDef(label = "琛ヨ嵂鍓嶄粨鍐呯７鍖栨阿娴撳害" )
@Column(name = "byqcnlhqnd", precision = 20, scale = 3)
- private double byqcnlhqnd;
+ private Double byqcnlhqnd;
+
+ @PropertyDef(label = "纾峰寲姘㈡祿搴﹀崟浣�",description = "1锛歡/m鲁 (榛樿) 2锛歱pm 3:ml/m鲁 4锛�%VOL銆�")
+ @Column(name = "nlhqnddw", length = 1)
+ private String nlhqnddw;
@PropertyDef(label = "鐩爣娴撳害" )
@Column(name = "mbnd", precision = 20, scale = 3)
- private double mbnd;
+ private Double mbnd;
@PropertyDef(label = "璁＄畻琛ヨ嵂閲�" )
@Column(name = "jsbyl", precision = 20, scale = 3)
- private double jsbyl;
+ private Double jsbyl;
@PropertyDef(label = "瀹為檯琛ヨ嵂閲�" )
@Column(name = "sjbyl", precision = 20, scale = 3)
- private double sjbyl;
+ private Double sjbyl;
@PropertyDef(label = "琛ヨ嵂鏂规硶" )
@Column(name = "byff", length = 128)
@@ -177,7 +181,7 @@
@PropertyDef(label = "宄板�兼祿搴�" )
@Column(name = "fznd", precision = 20, scale = 3)
- private double fznd;
+ private Double fznd;
@PropertyDef(label = "鐩爣娴撳害缁存寔澶╂暟" )
@Column(name = "mbndwcts")
@@ -197,11 +201,11 @@
@PropertyDef(label = "CT鍊�" )
@Column(name = "ctz", precision = 20, scale = 3)
- private double ctz;
+ private Double ctz;
@PropertyDef(label = "鏁ｆ皵鍓嶇７鍖栨阿娴撳害" )
@Column(name = "sqqlhqnd", precision = 20, scale = 3)
- private double sqqlhqnd;
+ private Double sqqlhqnd;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鏁ｆ皵鏃ユ湡" )
@@ -209,7 +213,7 @@
private Date sqrq;
@PropertyDef(label = "鏁ｆ皵鏂规硶" )
- @Column(name = "sqff", length = 128, nullable = false)
+ @Column(name = "sqff", length = 128)
private String sqff;
@PropertyDef(label = "鏁ｆ皵鎵瑰噯浜�" )
@@ -217,12 +221,12 @@
private String sqpzr;
@PropertyDef(label = "鏁ｆ皵鎸佺画澶╂暟" )
- @Column(name = "sqcsts", nullable = false)
+ @Column(name = "sqcsts")
private Integer sqcsts;
@PropertyDef(label = "鏁ｆ皵缁撴潫鏃剁７鍖栨阿娴撳害" )
@Column(name = "sqjsslhqnd", precision = 20, scale = 3)
- private double sqjsslhqnd;
+ private Double sqjsslhqnd;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "娈嬫福鏀堕泦浣滀笟鏃堕棿" )
@@ -270,7 +274,7 @@
private Integer pysswthhcs;
@PropertyDef(label = "鐔忚捀鏁堟灉璇勪环" )
- @Column(name = "xzxgpj", length = 1, nullable = false)
+ @Column(name = "xzxgpj", length = 1)
private String xzxgpj;
@PropertyDef(label = "鐔忚捀璐熻矗浜�" )
@@ -282,12 +286,18 @@
private String xzzyry;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
+ /*---------绯荤粺鍐呬娇鐢�:鍥芥爣鍜屽箍涓滅啅钂稿崟鍙凤細浠撴埧浠ｇ爜+yyyyMMdd+3浣嶉『搴忓彿锛涗笂娴风啅钂稿崟鍙凤細璐т綅浠ｇ爜+yyyyMMdd+3浣嶉『搴忓彿----------*/
+ @JSONField(serialize = false)
+ @PropertyDef(label = "璐т綅浠ｇ爜" )
+ @Column(name = "hwdm", length = 30)
+ private String hwdm;
+
}
\ No newline at end of file
--
Gitblit v1.9.3