From 178c71496d5508dae69110f4d988cf128723d740 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 14:58:41 +0800
Subject: [PATCH] 配置Modbus协议：增加能耗信息

---
 igds-manager/src/main/java/com/ld/igds/models/OAArchives.java |   94 +++++++++++++++++++++++-----------------------
 1 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java b/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
index 58d62cf..ca62629 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
@@ -2,11 +2,9 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 import lombok.Data;
 
@@ -14,71 +12,73 @@
 
 /**
  * OA-妗ｆ绠＄悊
- * 
+ *
  * @author: andy.jia
  * @description:
  * @version:
  * @data:2020骞�5鏈�30鏃�
- *
  */
 @Data
 @Entity
 @Table(name = "D_OA_ARCHIVES")
 public class OAArchives implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "ID")
-	private String id;
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "ID")
+    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 = "NAME_", length = 100)
-	@PropertyDef(label = "鏂囦欢姝ｅ悕棰�")
-	private String name;
+    @Column(name = "NAME_", length = 100)
+    @PropertyDef(label = "鏂囦欢姝ｅ悕棰�")
+    private String name;
 
-	@Column(name = "CODE_", length = 40)
-	@PropertyDef(label = "妗ｆ缂栫爜")
-	private String code;
+    @Column(name = "CODE_", length = 40)
+    @PropertyDef(label = "妗ｆ缂栫爜")
+    private String code;
 
-	@Column(name = "CATEGORY_", length = 20)
-	@PropertyDef(label = "鏂囦欢鍒嗙被")
-	private String category;
+    @Column(name = "CATEGORY_", length = 20)
+    @PropertyDef(label = "鏂囦欢鍒嗙被")
+    private String category;
 
-	@Column(name = "YEAR_", length = 10)
-	@PropertyDef(label = "褰掓。骞翠唤")
-	private String year;
+    @Column(name = "YEAR_", length = 10)
+    @PropertyDef(label = "褰掓。骞翠唤")
+    private String year;
 
-	@Column(name = "LOCATION_", length = 100)
-	@PropertyDef(label = "妗ｆ瀛樺潃")
-	private String location;
+    @Column(name = "LOCATION_", length = 100)
+    @PropertyDef(label = "妗ｆ瀛樺潃")
+    private String location;
 
-	@Column(name = "SEC_LEVEL_", length = 20)
-	@PropertyDef(label = "瀹夊叏绾у埆")
-	private String secLevel;
+    @Column(name = "SEC_LEVEL_", length = 20)
+    @PropertyDef(label = "瀹夊叏绾у埆")
+    private String secLevel;
 
-	@Column(name = "FILE_NAME_", length = 50)
-	@PropertyDef(label = "闄勪欢鍚嶇О")
-	private String fileName;
+    @Column(name = "FILE_NAME_", length = 50)
+    @PropertyDef(label = "闄勪欢鍚嶇О")
+    private String fileName;
 
-	@Column(name = "UPDATE_TIME_")
-	@PropertyDef(label = "淇敼鏃堕棿", description = "鏈�鍚庝慨鏀规椂闂�")
-	private Date updateTime;
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "淇敼鏃堕棿", description = "鏈�鍚庝慨鏀规椂闂�")
+    private Date updateTime;
 
-	@Column(name = "UPDATE_USER_", length = 30)
-	@PropertyDef(label = "淇敼浜�", description = "鏈�鍚庝慨鏀逛汉")
-	private String updateUser;
+    @Column(name = "UPDATE_USER_", length = 30)
+    @PropertyDef(label = "淇敼浜�", description = "鏈�鍚庝慨鏀逛汉")
+    private String updateUser;
 
-	@Column(name = "REMARK_", length = 255)
-	@PropertyDef(label = "澶囨敞")
-	private String remark;
+    @Column(name = "REMARK_", length = 255)
+    @PropertyDef(label = "澶囨敞")
+    private String remark;
+
+    @Transient
+    private List<FileInfo> fileData;
 
 }

--
Gitblit v1.9.3