From 378bd90e53253245defb4c505e7550ad7e1521f2 Mon Sep 17 00:00:00 2001
From: Andy.jia <jiazx0107@163.com>
Date: 星期四, 17 八月 2023 19:40:03 +0800
Subject: [PATCH] 调整MODBUS实现类和数据配置
---
igds-core/src/main/java/com/ld/igds/models/CheckItem.java | 133 +++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 63 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckItem.java b/igds-core/src/main/java/com/ld/igds/models/CheckItem.java
index 897d986..a77405c 100644
--- a/igds-core/src/main/java/com/ld/igds/models/CheckItem.java
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckItem.java
@@ -18,91 +18,98 @@
* @description:
* @version:
* @data:2020骞�4鏈�7鏃�
- *
*/
@Data
@Entity
@Table(name = "D_CHECK_ITEM")
public class CheckItem implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
- @Id
- @Column(name = "CHECK_ID_", length = 40)
- @PropertyDef(label = "妫�娴嬬紪鐮�")
- private String checkId;
+ @Id
+ @Column(name = "CHECK_ID_", length = 40)
+ @PropertyDef(label = "妫�娴嬬紪鐮�")
+ private String checkId;
- @Id
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
+ @Id
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
- @Id
- @Column(name = "STANDARD_ID_", length = 40)
- @PropertyDef(label = "妫�娴嬮」缂栫爜")
- private String standardId;
+ @Id
+ @Column(name = "STANDARD_ID_", length = 10)
+ @PropertyDef(label = "妫�娴嬮」缂栫爜")
+ private String standardId;
- @Column(name = "STANDARD_NAME_", length = 50)
- @PropertyDef(label = "鍖栭獙椤�")
- private String standardName;
+ @Column(name = "STANDARD_NAME_", length = 50)
+ @PropertyDef(label = "鍖栭獙椤�")
+ private String standardName;
- @Column(name = "UNIT_", length = 20)
- @PropertyDef(label = "鍗曚綅")
- private String unit;
+ @Column(name = "UNIT_", length = 20)
+ @PropertyDef(label = "鍗曚綅")
+ private String unit;
- @Column(name = "UPPER_LIMIT_")
- @PropertyDef(label = "鏍囧噯浼愬��")
- private Double upperLimit;
+ @Column(name = "UPPER_LIMIT_")
+ @PropertyDef(label = "鏍囧噯浼愬��")
+ private Double upperLimit;
- @Column(name = "OPERA_SYMBOL_",length = 4)
- @PropertyDef(label = "杩愮畻绗﹀彿")
- private String operaSymbol;
+ @Column(name = "OPERA_SYMBOL_", length = 4)
+ @PropertyDef(label = "杩愮畻绗﹀彿")
+ private String operaSymbol;
-// @Column(name = "LOWER_LIMIT_")
-// @PropertyDef(label = "鏍囧噯涓嬮檺")
-// private Double lowerLimit;
+ @Column(name = "RULE_NUM_")
+ @PropertyDef(label = "鎵ｉ噸绯绘暟")
+ private Double ruleNum;
- @Column(name = "RULE_NUM_")
- @PropertyDef(label = "鎵ｉ噸绯绘暟")
- private Double ruleNum;
+ @Column(name = "RULE_ADD_")
+ @PropertyDef(label = "澧為噸%")
+ private Double ruleAdd;
- @Column(name = "RULE_ADD_")
- @PropertyDef(label = "澧為噸%")
- private Double ruleAdd;
+ @Column(name = "RULE_ADD_END_")
+ @PropertyDef(label = "澧為噸涓婇檺%")
+ private Double ruleAddEnd;
- @Column(name = "RULE_ADD_END_")
- @PropertyDef(label = "澧為噸涓婇檺%")
- private Double ruleAddEnd;
+ @Column(name = "RULE_REDUCE_")
+ @PropertyDef(label = "鎵ｉ噸鍊�%")
+ private Double ruleReduce;
- @Column(name = "RULE_REDUCE_")
- @PropertyDef(label = "鎵ｉ噸鍊�%")
- private Double ruleReduce;
+ @Column(name = "VALUE_", length = 40)
+ @PropertyDef(label = "妫�娴嬪��")
+ private String value;
- @Column(name = "STANDARD_VALUE_", length = 15)
- @PropertyDef(label = "鏍囧噯鍊�,鍙互鏄寖鍥�")
- private String standardValue;
+ @Column(name = "RULE_PRICE_")
+ @PropertyDef(label = "鎵ｈ垂绯绘暟")
+ private Double rulePrice;
- @Column(name = "VALUE_", length = 40)
- @PropertyDef(label = "妫�娴嬪��")
- private String value;
+ @Column(name = "RULE_REDUCE_PRICE_")
+ @PropertyDef(label = "鎵ｈ垂")
+ private Double ruleReducePrice;
- @Column(name = "STANDARD_PRICE_")
- @PropertyDef(label = "鏍囧噯鍗曚环锛堝厓/鏂わ級")
- private Double standardPrice;
+ @Column(name = "ADD_NUM_")
+ @PropertyDef(label = "澧為噸", description = "鍗曚綅锛歬G")
+ private Double addNum;
- @Column(name = "RULE_PRICE_")
- @PropertyDef(label = "鎵ｈ垂绯绘暟")
- private Double rulePrice;
+ @Column(name = "DE_NUM_")
+ @PropertyDef(label = "鎵ｉ噸", description = "鍗曚綅锛歬G")
+ private Double deNum;
- @Column(name = "RULE_REDUCE_PRICE_")
- @PropertyDef(label = "鎵ｈ垂")
- private Double ruleReducePrice;
+ @Column(name = "ADD_PRICE_")
+ @PropertyDef(label = "澧炰环", description = "鍗曚綅锛氬厓")
+ private Double addPrice;
- @Column(name = "REMARKS_", length = 50)
- @PropertyDef(label = "鍖栭獙缁撴灉")
- private String remarks;
-
+ @Column(name = "DE_PRICE_")
+ @PropertyDef(label = "鎵ｄ环", description = "鍗曚綅锛氬厓")
+ private Double dePrice;
+
+ @Column(name = "RESULT_", length = 2)
+ @PropertyDef(label = "妫�楠岀粨鏋�", description = "0=涓嶅悎鏍� 1=鍚堟牸")
+ private String result;
+
+ @Column(name = "REMARKS_", length = 50)
+ @PropertyDef(label = "澶囨敞")
+ private String remarks;
+
}
--
Gitblit v1.9.3