From c2538085f897faa67abf32f23fc006e816df3c09 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 18 七月 2024 18:20:23 +0800
Subject: [PATCH] 文件采集完成 - 数采
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 03d5367..3421f3d 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -9,7 +9,6 @@
import java.io.Serializable;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -26,7 +25,7 @@
@ApiModelProperty(value = "璁惧鍚嶇О")
private String deviceName;
- @ValueTableShow(value = 2, name = "en璁惧鍚嶇О")
+ @ValueTableShow(value = 2, name = "璁惧鍚嶇ОEN")
@ApiModelProperty(value = "en璁惧鍚嶇О")
private String enDeviceName;
@@ -53,7 +52,7 @@
@ValueTableShow(8)
@ApiModelProperty(value = "璐疆鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String acquisitionDate;
+ private LocalDateTime acquisitionDate;
@ValueTableShow(value = 9, name = "鍚敤鏃ユ湡")
@ApiModelProperty(value = "鍚敤鏃ユ湡")
@@ -97,7 +96,7 @@
private Integer deviceStatus;
@ValueTableShow(20)
- @ApiModelProperty(value = "鏍″噯鍛ㄦ湡锛堟湀锛�")
+ @ApiModelProperty(value = "鏍″噯鍛ㄦ湡(鏈�)")
private String calibrationDate;
@ApiModelProperty(value = "鍥剧墖涓婁紶")
@@ -119,4 +118,17 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
+ @ApiModelProperty("鏂囦欢鍚庣紑")
+ private String fileType;
+
+ @ApiModelProperty("閲囬泦鍦板潃")
+ private String collectUrl;
+
+ @ApiModelProperty("瀛樺偍鍦板潃")
+ private String storageUrl;
+
+ @ApiModelProperty("鏄惁涓烘暟閲囪澶�")
+ @TableField(exist = false)
+ private Boolean isItADataAcquisitionDevice;
}
--
Gitblit v1.9.3