From 7ca617f98917b5270a280b61565758216b374fa8 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 31 七月 2023 19:23:50 +0800
Subject: [PATCH] 能耗bug修复
---
igds-recir/src/main/java/com/ld/igds/models/DrugLog.java | 372 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 276 insertions(+), 96 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
index f4bc674..8935bb3 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
@@ -1,5 +1,6 @@
package com.ld.igds.models;
+import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -7,128 +8,307 @@
import javax.persistence.Id;
import javax.persistence.Table;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.bstek.dorado.annotation.PropertyDef;
/**
* 鐜祦鐔忚捀-鐔忚捀浣滀笟璁板綍
- *
- * @date 2018骞�3鏈�9鏃� 涓嬪崍3:46:24
- * @version 1.0
+ *
+ * @date 2023骞�7鏈�26鏃�
*/
@Data
@Entity
@Table(name = "D_DRUG_LOG")
-public class DrugLog {
+public class DrugLog implements Serializable {
- @Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
- private String id;
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿", description = "浠撴埧浠ｇ爜+浣滀笟鏃ユ湡 (yyyyMMdd) +3 浣嶉『搴忓彿")
+ private String id;
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
- @Column(name = "DEPT_ID_", length = 40)
- @PropertyDef(label = "鎵�灞炲垎搴�")
- private String deptId;
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
- @Column(name = "DEPOT_ID_", length = 50)
- @PropertyDef(label = "浠撳簱")
- private String depotId;
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱")
+ private String depotId;
+
+ @Column(name = "START_")
+ @PropertyDef(label = "寮�濮嬫椂闂�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date start;
+
+ @Column(name = "END_")
+ @PropertyDef(label = "鎴嚦鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date end;
+
+ @Column(name = "PEST_BATCH_ID_", length = 50)
+ @PropertyDef(label = "铏妫�娴嬪崟鍙�")
+ private String pestBatchId;
+
+ @Column(name = "NUM_")
+ @PropertyDef(label = "绗嚑娆＄啅钂�")
+ private Integer num = 0;
- @Column(name = "START_")
- @PropertyDef(label = "寮�濮嬫椂闂�")
- private Date start;
+ @Column(name = "MODE_", length = 1)
+ @PropertyDef(label = "鐔忚捀鏂瑰紡", description = "0:绮潰娼В1:甯冭鍩嬭棌2:鎺㈢3:缁煎悎鏂借嵂")
+ private String mode;
- @Column(name = "END_")
- @PropertyDef(label = "鎴嚦鏃堕棿")
- private Date end;
+ @Column(name = "RECIR_MODE_", length = 1)
+ @PropertyDef(label = "鐜祦鐔忚捀鏂瑰紡", description = "0:鍥哄畾寮忓竷缃舰寮�1:绉诲姩寮忓竷缃舰寮�")
+ private String recirMode;
- @Column(name = "PEST_BATCH_ID_", length = 50)
- @PropertyDef(label = "铏妫�娴嬪崟鍙�")
- private String pestBatchId;
+ @Column(name = "hlxzynhljsjh", length = 1)
+ @PropertyDef(label = "鐜祦鐔忚捀涓庡唴鐜祦鎶�鏈粨鍚�", description = "0:鍒嗗埆浣跨敤_鍥哄畾寮�1:鍒嗗埆浣跨敤_绉诲姩寮�2:浜屽悎涓�搴旂敤_鍗曞悜鎺у埗3:浜屽悎涓�搴旂敤_鍙屽悜鎺у埗")
+ private String hlxzynhljsjh;
- @Column(name = "NUM_")
- @PropertyDef(label = "绗嚑娆＄啅钂�")
- private Integer num = 0;
+ @PropertyDef(label = "鐔忚捀鏂规鍒跺畾")
+ @Column(name = "xzfazd", length = 128)
+ private String xzfazd;
+
+ @PropertyDef(label = "鐔忚捀鏂规璧疯崏浜�")
+ @Column(name = "xzfaqcr", length = 64)
+ private String xzfaqcr;
+
+ @PropertyDef(label = "鐔忚捀鏂规鎵瑰噯浜�")
+ @Column(name = "xzfapzr", length = 64)
+ private String xzfapzr;
+
+ @PropertyDef(label = "鐔忚捀鏂规鎶ュ鎯呭喌")
+ @Column(name = "xzfabbqk", length = 64)
+ private String xzfabbqk;
+
+ @PropertyDef(label = "鏂借嵂浜哄憳璧勮川鎯呭喌")
+ @Column(name = "syryzzqk", length = 64)
+ private String syryzzqk;
+
+ @PropertyDef(label = "鏂借嵂璧勮川瀹℃牳")
+ @Column(name = "syzzsh", length = 64)
+ private String syzzsh;
+
+ @Column(name = "DRUG_NAME_", length = 64)
+ @PropertyDef(label = "鑽墏鍚嶇О")
+ private String drugName;
+
+ @PropertyDef(label = "鍓傚瀷")
+ @Column(name = "jx", length = 64)
+ private String jx;
+
+ @Column(name = "CONCENTRATION_", length = 50)
+ @PropertyDef(label = "鑽墏娴撳害", description = "%")
+ private Double concentration = 0.0;
+
+ @Column(name = "GRAIN_DOSE_")
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�", description = "g/m鲁")
+ private Double grainDose = 0.0;
+
+ @Column(name = "SPACE_DOSE_")
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�", description = "g/m鲁")
+ private Double SpaceDose = 0.0;
+
+ @Column(name = "DOSE_")
+ @PropertyDef(label = "鎬荤敤鑽噺", description = "kg")
+ private Double dose = 0.0;
+
+ @PropertyDef(label = "鏂借嵂鏂规硶", description = "0:娼В娉�1:浠撳鍙戠敓鍣�2:閽㈢摱姘�")
+ @Column(name = "syff", length = 1)
+ private String syff;
+
+ @PropertyDef(label = "杈呭姪鏂借嵂鎺柦")
+ @Column(name = "fzsycs", length = 128)
+ private String fzsycs;
+
+ @PropertyDef(label = "绌烘皵鍛煎惛鍣ㄥ強瀹夊叏妫�鏌ユ儏鍐�")
+ @Column(name = "kqhqjaqjcqk", length = 128)
+ private String kqhqjaqjcqk;
+
+ @PropertyDef(label = "纾峰寲姘㈡娴嬭缃皟璇曟儏鍐�")
+ @Column(name = "lhqjczztsqk", length = 128)
+ private String lhqjczztsqk;
+
+ @PropertyDef(label = "姘ф皵娣卞害妫�娴嬭缃皟璇曟儏鍐�")
+ @Column(name = "yqsdjczztsqk", length = 128)
+ private String yqsdjczztsqk;
+
+ @PropertyDef(label = "纾峰寲姘㈡姤璀︿华瀹夊叏妫�鏌�")
+ @Column(name = "lhqbjyaqjc", length = 128)
+ private String lhqbjyaqjc;
+
+ @PropertyDef(label = "姘ф皵鎶ヨ浠畨鍏ㄦ鏌�")
+ @Column(name = "yqbjyaqjc", length = 128)
+ private String yqbjyaqjc;
+
+ @PropertyDef(label = "琛ヨ嵂鍓嶄粨鍐呯７鍖栨阿娴撳害")
+ @Column(name = "byqcnlhqnd", precision = 20, scale = 3)
+ private double byqcnlhqnd;
+
+ @PropertyDef(label = "纾峰寲姘㈡祿搴﹀崟浣�", description = "1锛歡/m鲁(榛樿);2锛歱pm;3:ml/m鲁;4锛�%VOL")
+ @Column(name = "nlhqnddw", length = 1)
+ private String nlhqnddw = "1";
+
+ @PropertyDef(label = "鐩爣娴撳害", description = "鍗曚綅锛歡/m鲁")
+ @Column(name = "mbnd", precision = 20, scale = 3)
+ private double mbnd;
+
+ @PropertyDef(label = "璁＄畻琛ヨ嵂閲�", description = "鍗曚綅锛歡")
+ @Column(name = "jsbyl", precision = 20, scale = 3)
+ private double jsbyl;
+
+ @PropertyDef(label = "瀹為檯琛ヨ嵂閲�", description = "鍗曚綅锛歡")
+ @Column(name = "sjbyl", precision = 20, scale = 3)
+ private double sjbyl;
+
+ @PropertyDef(label = "琛ヨ嵂鏂规硶")
+ @Column(name = "byff", length = 128)
+ private String byff;
+
+ @PropertyDef(label = "浣滀笟浜烘暟")
+ @Column(name = "zyrs")
+ private Integer zyrs;
+
+ @PropertyDef(label = "琛ヨ嵂浣滀笟鎵瑰噯浜�")
+ @Column(name = "byzypzr", length = 64)
+ private String byzypzr;
+
+ @PropertyDef(label = "鐜板満鎸囨尌浜�")
+ @Column(name = "xczhr", length = 64)
+ private String xczhr;
+
+ @PropertyDef(label = "宄板�兼祿搴�", description = "鍗曚綅锛歡/m鲁")
+ @Column(name = "fznd", precision = 20, scale = 3)
+ private double fznd;
+
+ @PropertyDef(label = "鐩爣娴撳害缁存寔澶╂暟", description = "鍗曚綅锛氬ぉ")
+ @Column(name = "mbndwcts")
+ private Integer mbndwcts;
+
+ @PropertyDef(label = "婕忔皵浣嶇疆鐩戞祴")
+ @Column(name = "lswzjc", length = 128)
+ private String lswzjc;
+
+ @PropertyDef(label = "婕忔皵閮ㄤ綅閲囧彇鐨勮ˉ鏁戞帾鏂�")
+ @Column(name = "lqbwcqdbjcs", length = 128)
+ private String lqbwcqdbjcs;
+
+ @PropertyDef(label = "瀵嗛棴鏃堕棿", description = "鍗曚綅锛氬ぉ")
+ @Column(name = "mbsj")
+ private Integer mbsj;
+
+ @PropertyDef(label = "CT鍊�")
+ @Column(name = "ctz", precision = 20, scale = 3)
+ private double ctz;
+
+ @PropertyDef(label = "鏁ｆ皵鍓嶇７鍖栨阿娴撳害", description = "鍗曚綅锛歡/m鲁")
+ @Column(name = "sqqlhqnd", precision = 20, scale = 3)
+ private double sqqlhqnd;
+
+ @Column(name = "VENTILATE_TIME_")
+ @PropertyDef(label = "鏁ｆ皵鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date ventilateTime;
+
+ @Column(name = "VENTILATE_METHOD_", length = 100)
+ @PropertyDef(label = "鏁ｆ皵鏂规硶")
+ private String ventilateMethod;
+
+ @PropertyDef(label = "鏁ｆ皵鎵瑰噯浜�")
+ @Column(name = "sqpzr", length = 64)
+ private String sqpzr;
+
+ @PropertyDef(label = "鏁ｆ皵鎸佺画澶╂暟", description = "鍗曚綅锛氬ぉ")
+ @Column(name = "sqcsts")
+ private Integer sqcsts;
+
+ @Column(name = "AFTER_PH3_")
+ @PropertyDef(label = "鏁ｆ皵鍚庣７鍖栨阿娴撳害", description = "鍗曚綅锛歡/m鲁")
+ private Double afterPh3;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟鏃堕棿")
+ @Column(name = "czsjzysj")
+ private Date czsjzysj;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟浜烘暟")
+ @Column(name = "czsjzyrs")
+ private Integer czsjzyrs;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦鏂规硶")
+ @Column(name = "czsjff", length = 128)
+ private String czsjff;
+
+ @PropertyDef(label = "娈嬫福鏀堕泦浣滀笟鎵瑰噯浜�")
+ @Column(name = "czsjzypzr", length = 64)
+ private String czsjzypzr;
+
+ @PropertyDef(label = "娈嬫福澶勭悊鎺柦")
+ @Column(name = "czclcs", length = 128)
+ private String czclcs;
+
+ @PropertyDef(label = "娈嬫福澶勭悊浣滀笟浜烘暟")
+ @Column(name = "czclzyrs")
+ private Integer czclzyrs;
+
+ @PropertyDef(label = "娈嬫福澶勭悊鎵瑰噯浜�")
+ @Column(name = "czclpzr", length = 64)
+ private String czclpzr;
+
+ @PropertyDef(label = "鐔忚捀鍚庢椿铏鍑烘儏鍐�")
+ @Column(name = "xzhhcjcqk", length = 128)
+ private String xzhhcjcqk;
+
+ @PropertyDef(label = "鐔忚捀鍚庤櫕鍙ｅ瘑搴�", description = "鍗曚綅锛氬ご/kg")
+ @Column(name = "xzhckmd")
+ private Integer xzhckmd;
+
+ @PropertyDef(label = "鍩瑰吇15澶╁悗娲昏櫕鏁�", description = "鍗曚綅锛氬ご/kg")
+ @Column(name = "pyswthhcs")
+ private Integer pyswthhcs;
+
+ @PropertyDef(label = "鍩瑰吇45澶╁悗娲昏櫕鏁�", description = "鍗曚綅锛氬ご/kg")
+ @Column(name = "pysswthhcs")
+ private Integer pysswthhcs;
- @Column(name = "MODE_", length = 50)
- @PropertyDef(label = "鐔忚捀鏂瑰紡")
- private String mode;
+ /**
+ * 0锛氳壇濂�
+ * 1锛氫竴鑸�
+ * 2锛氫笉濂�
+ */
+ @Column(name = "EVALUATE_", length = 1)
+ @PropertyDef(label = "鐔忚捀璇勪环", description = "0锛氳壇濂� 1锛氫竴鑸� 2锛氫笉濂�")
+ private String evaluate;
- @Column(name = "RECIR_MODE_", length = 50)
- @PropertyDef(label = "鐜祦鐔忚捀鏂瑰紡")
- private String recirMode;
+ @PropertyDef(label = "鐔忚捀璐熻矗浜�")
+ @Column(name = "xzfzr", length = 64)
+ private String xzfzr;
- @Column(name = "DRUG_NAME_", length = 50)
- @PropertyDef(label = "鑽墏鍚嶇О")
- private String drugName;
+ @PropertyDef(label = "鐔忚捀浣滀笟浜哄憳")
+ @Column(name = "xzzyry", length = 128)
+ private String xzzyry;
- @Column(name = "CONCENTRATION_", length = 50)
- @PropertyDef(label = "鑽墏娴撳害",description = "%")
- private Double concentration = 0.0;
+ @Column(name = "USER_", length = 30)
+ @PropertyDef(label = "鎿嶄綔浜�")
+ private String user;
- @Column(name = "GRAIN_DOSE_")
- @PropertyDef(label = "绮爢浣跨敤鍓傞噺",description = "g/m鲁")
- private Double grainDose = 0.0;
+ @PropertyDef(label = "鏇存柊浜�")
+ @Column(name = "UPDATE_USER_", length = 30)
+ private String updateUser;
- @Column(name = "SPACE_DOSE_")
- @PropertyDef(label = "绌洪棿浣跨敤鍓傞噺",description = "g/m鲁")
- private Double SpaceDose =0.0;
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ @Column(name = "UPDATE_TIME_")
+ private Date updateTime;
- @Column(name = "DOSE_")
- @PropertyDef(label = "鎬讳娇鐢ㄥ墏閲�",description = "g/m鲁")
- private Double dose = 0.0;
-
-
- @Column(name = "VENTILATE_TIME_")
- @PropertyDef(label = "鏁ｆ皵鏃堕棿")
- private Date ventilateTime;
-
- @Column(name = "VENTILATE_METHOD_",length = 100)
- @PropertyDef(label = "鏁ｆ皵鏂规硶")
- private String ventilateMethod;
-
- @Column(name = "AFTER_PH3_")
- @PropertyDef(label = "鏁ｆ皵鍚庣７鍖栨阿娴撳害")
- private Double afterPh3;
-
- /**
- * 0锛氳壇濂�
- * 1锛氫竴鑸�
- * 2锛氫笉濂�
- */
- @Column(name = "EVALUATE_",length = 10)
- @PropertyDef(label = "鐔忚捀璇勪环")
- private String evaluate;
-
- @Column(name = "CZSJFF_",length = 100)
- @PropertyDef(label = "娈嬫福鏀堕泦鏂规硶")
- private String czsjff;
-
- @Column(name = "CZCLCS_",length = 100)
- @PropertyDef(label = "娈嬫福澶勭悊鎺柦")
- private String czclcs;
-
- @Column(name = "USER_", length = 30)
- @PropertyDef(label = "鎿嶄綔浜�")
- private String user;
-
- @PropertyDef(label = "鏇存柊浜�")
- @Column(name = "UPDATE_USER_", length = 30)
- private String updateUser;
-
- @PropertyDef(label = "鎿嶄綔鏃堕棿")
- @Column(name = "UPDATE_TIME_")
- private Date updateTime;
-
- @Column(name = "REMARKS_", length = 500)
- @PropertyDef(label = "澶囨敞璇存槑")
- private String remarks;
+ @Column(name = "REMARKS_", length = 500)
+ @PropertyDef(label = "澶囨敞璇存槑")
+ private String remarks;
}
--
Gitblit v1.9.3