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/SysLaboratoryContainer.java | 183 ++++++++++++---------------------------------
1 files changed, 51 insertions(+), 132 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java b/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java
index cf51f47..95bbd41 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java
@@ -1,158 +1,77 @@
package com.nanometer.smartlab.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
import java.io.Serializable;
import java.sql.Timestamp;
+import java.util.*;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
/**
* Created by johnny on 17/11/23.
*/
+@Getter
+@Setter
@SuppressWarnings("serial")
+@JsonInclude(NON_NULL)
+@JsonIgnoreProperties(value = {"handler"})
public class SysLaboratoryContainer implements Serializable {
- private String id;
- private String laboratoryId;
- private String laboratoryName;
- private String type;
- private String laboratoryType;
- private String containerCode;
+ private Long id;
+ private Long laboratoryId;
+ private Long type;
+ private String containerCode;
private String infoCode;
- private String structure;
private String name;
+ private Long structure;
private Timestamp createTime;
private Timestamp updateTime;
private ValidFlag validFlag;
- private String characterLeft;
- private String characterRight;
+ private Long characterLeft;
+ private Long characterRight;
private String controllerCode;
+ private Double temp;
+ private Integer humidity;
+ private Double voc1;
+ private String flag;
+ private String project;
+
+
+
+
+
+
+ //非数据库字段
+ private String laboratoryName;
+ private String laboratoryType;
private String controllerName;
+ private List<String> projects;
- public String getControllerName() {
- return controllerName;
+ public List<String> getProjects() {
+ if (projects == null && project != null){
+ this.projects = Arrays.asList(this.project.split(","));
+ }
+ return projects;
}
- public void setControllerName(String controllerName) {
- this.controllerName = controllerName;
+
+ public String getProject() {
+ if (this.project == null){
+ this.project = "";
+ if (projects != null && projects.size() > 0) {
+ projects.forEach(pro->{
+ this.project += ",";
+ this.project += pro;
+ });
+ this.project = this.project.substring(1);
+ }
+ }
+ return project;
}
- public String getLaboratoryName() {
- return laboratoryName;
- }
-
- public void setLaboratoryName(String laboratoryName) {
- this.laboratoryName = laboratoryName;
- }
-
- public String getLaboratoryType() {
- return laboratoryType;
- }
-
- public void setLaboratoryType(String laboratoryType) {
- this.laboratoryType = laboratoryType;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getLaboratoryId() {
- return laboratoryId;
- }
-
- public void setLaboratoryId(String laboratoryId) {
- this.laboratoryId = laboratoryId;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getContainerCode() {
- return containerCode;
- }
-
- public void setContainerCode(String containerCode) {
- this.containerCode = containerCode;
- }
-
- public String getInfoCode() {
- return infoCode;
- }
-
- public void setInfoCode(String infoCode) {
- this.infoCode = infoCode;
- }
-
- public String getStructure() {
- return structure;
- }
-
- public void setStructure(String structure) {
- this.structure = structure;
- }
-
- public Timestamp getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Timestamp createTime) {
- this.createTime = createTime;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-
- public ValidFlag getValidFlag() {
- return validFlag;
- }
-
- public void setValidFlag(ValidFlag validFlag) {
- this.validFlag = validFlag;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCharacterLeft() {
- return characterLeft;
- }
-
- public void setCharacterLeft(String characterLeft) {
- this.characterLeft = characterLeft;
- }
-
- public String getCharacterRight() {
- return characterRight;
- }
-
- public void setCharacterRight(String characterRight) {
- this.characterRight = characterRight;
- }
-
- public String getControllerCode() {
- return controllerCode;
- }
-
- public void setControllerCode(String controllerCode) {
- this.controllerCode = controllerCode;
- }
}
--
Gitblit v1.9.2