From cba16d090ad6df9299ff4fdd4c4839939e0b0e13 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Sat, 25 May 2024 09:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coal/device/dto/CreateDeviceDto.java      | 10 ++++++++++
 .../lihongjie/coal/device/dto/DeviceDto.java  | 10 ++++++++++
 .../coal/device/dto/UpdateDeviceDto.java      | 11 +++++++++++
 .../coal/device/entity/DeviceEntity.java      | 11 +++++++++++
 src/main/resources/config/dictionary.json     | 19 +++++++++++++++++++
 5 files changed, 61 insertions(+)

diff --git a/src/main/java/cn/lihongjie/coal/device/dto/CreateDeviceDto.java b/src/main/java/cn/lihongjie/coal/device/dto/CreateDeviceDto.java
index b9b48136..3e270ff9 100644
--- a/src/main/java/cn/lihongjie/coal/device/dto/CreateDeviceDto.java
+++ b/src/main/java/cn/lihongjie/coal/device/dto/CreateDeviceDto.java
@@ -41,6 +41,16 @@ public class CreateDeviceDto extends OrgCommonDto {
 
     private List<DevicePartVo> parts;
 
+
+    private LocalDateTime purchaseDate;
+
+    private Integer deviceCount;
+
+    private String deviceUnit;
+
+
+    private String deviceStatus;
+
     @JsonProperty("dReserve1") private Double dReserve1;
     @JsonProperty("dReserve2") private Double dReserve2;
     @JsonProperty("dReserve3") private Double dReserve3;
diff --git a/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java b/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java
index bfcf4870..afe33cec 100644
--- a/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java
+++ b/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java
@@ -61,6 +61,16 @@ public class DeviceDto extends OrgCommonDto {
     private String archiveStatusName;
 
 
+
+    private LocalDateTime purchaseDate;
+
+    private Integer deviceCount;
+
+    private String deviceUnit;
+
+
+    private String deviceStatus;
+
     @JsonProperty("dReserve1") private Double dReserve1;
     @JsonProperty("dReserve2") private Double dReserve2;
     @JsonProperty("dReserve3") private Double dReserve3;
diff --git a/src/main/java/cn/lihongjie/coal/device/dto/UpdateDeviceDto.java b/src/main/java/cn/lihongjie/coal/device/dto/UpdateDeviceDto.java
index b6cef962..c305938b 100644
--- a/src/main/java/cn/lihongjie/coal/device/dto/UpdateDeviceDto.java
+++ b/src/main/java/cn/lihongjie/coal/device/dto/UpdateDeviceDto.java
@@ -39,6 +39,17 @@ public class UpdateDeviceDto extends OrgCommonDto {
 
     private List<DevicePartVo> parts;
 
+
+
+    private LocalDateTime purchaseDate;
+
+    private Integer deviceCount;
+
+    private String deviceUnit;
+
+
+    private String deviceStatus;
+
     @JsonProperty("dReserve1") private Double dReserve1;
     @JsonProperty("dReserve2") private Double dReserve2;
     @JsonProperty("dReserve3") private Double dReserve3;
diff --git a/src/main/java/cn/lihongjie/coal/device/entity/DeviceEntity.java b/src/main/java/cn/lihongjie/coal/device/entity/DeviceEntity.java
index 4250368c..7809f2a9 100644
--- a/src/main/java/cn/lihongjie/coal/device/entity/DeviceEntity.java
+++ b/src/main/java/cn/lihongjie/coal/device/entity/DeviceEntity.java
@@ -42,6 +42,17 @@ public class DeviceEntity extends OrgCommonEntity {
     @ColumnDefault("'0'")
     private String archiveStatus = "0";
 
+
+    private LocalDateTime purchaseDate;
+
+    private Integer deviceCount;
+
+    private String deviceUnit;
+
+
+    private String deviceStatus;
+
+
     private Double dReserve1;
     private Double dReserve2;
     private Double dReserve3;
diff --git a/src/main/resources/config/dictionary.json b/src/main/resources/config/dictionary.json
index 88b6e65b..3d65f0c2 100644
--- a/src/main/resources/config/dictionary.json
+++ b/src/main/resources/config/dictionary.json
@@ -2091,6 +2091,25 @@
       }
     ]
   },
+
+  {
+    "code": "device.status",
+    "name": "设备状态",
+    "item": [
+      {
+        "code": "0",
+        "name": "在用"
+      },
+      {
+        "code": "1",
+        "name": "停用"
+      },
+      {
+        "code": "2",
+        "name": "报废"
+      }
+    ]
+  },
   {
     "code": "excel.generator.datasource.type",
     "name": "excel生成器数据源类型",