From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/entity/SysContainerSensors.java |  146 ++++++------------------------------------------
 1 files changed, 18 insertions(+), 128 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/entity/SysContainerSensors.java b/src/main/java/com/nanometer/smartlab/entity/SysContainerSensors.java
index 5da523f..5d85ceb 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysContainerSensors.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysContainerSensors.java
@@ -1,8 +1,17 @@
 package com.nanometer.smartlab.entity;
 
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
 import java.util.Date;
 
-public class SysContainerSensors {
+@Getter
+@Setter
+public class SysContainerSensors implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
     public final static int TYPE_LABORATORY_CONTAINER = 1;
     public final static int TYPE_WAREHOUSE_CONTAINER = 2;
 
@@ -14,33 +23,26 @@
     public final static int FLAG_VOC1_INDEX = 4;
 
 
-    private String id;
-
-    private String containerId;
-
-    private String warehouseContainerName;
-    private String laboratoryContainerName;
-
+    private Long id;
+    private Long containerId;
     private Double temp;
-
     private Integer humidity;
-
     private Double voc1;
-
     private String flag;
-
     private Integer type;
-
     private Date updateTime;
 
+
+
+
+   //非数据库字段
+    private String warehouseContainerName;
+    private String laboratoryContainerName;
     private String laboratoryName;
     private String warehouseName;
-
     private String laboratoryId;
     private String warehouseId;
 
-
-    private static final long serialVersionUID = 1L;
 
 
     public boolean isLowTempAlert(){
@@ -76,117 +78,5 @@
             return flag.charAt(FLAG_VOC1_INDEX)=='1';
         }
         return false;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getContainerId() {
-        return containerId;
-    }
-
-    public void setContainerId(String containerId) {
-        this.containerId = containerId;
-    }
-
-    public Double getTemp() {
-        return temp;
-    }
-
-    public void setTemp(Double temp) {
-        this.temp = temp;
-    }
-
-    public Integer getHumidity() {
-        return humidity;
-    }
-
-    public void setHumidity(Integer humidity) {
-        this.humidity = humidity;
-    }
-
-    public Double getVoc1() {
-        return voc1;
-    }
-
-    public void setVoc1(Double voc1) {
-        this.voc1 = voc1;
-    }
-
-    public String getFlag() {
-        return flag;
-    }
-
-    public void setFlag(String flag) {
-        this.flag = flag;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getLaboratoryName() {
-        return laboratoryName;
-    }
-
-    public void setLaboratoryName(String laboratoryName) {
-        this.laboratoryName = laboratoryName;
-    }
-
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
-
-    public String getLaboratoryId() {
-        return laboratoryId;
-    }
-
-    public void setLaboratoryId(String laboratoryId) {
-        this.laboratoryId = laboratoryId;
-    }
-
-    public String getWarehouseId() {
-        return warehouseId;
-    }
-
-    public void setWarehouseId(String warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseContainerName() {
-        return warehouseContainerName;
-    }
-
-    public void setWarehouseContainerName(String warehouseContainerName) {
-        this.warehouseContainerName = warehouseContainerName;
-    }
-
-    public String getLaboratoryContainerName() {
-        return laboratoryContainerName;
-    }
-
-    public void setLaboratoryContainerName(String laboratoryContainerName) {
-        this.laboratoryContainerName = laboratoryContainerName;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.2