From 0c7d7c2bad82403c7985b10f220427d364bf5504 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Wed, 31 Jan 2024 17:30:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Esensor=E5=92=8Cpoint=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/entity/NPoint.java  | 18 ++++--------------
 src/main/java/com/xydl/cac/entity/NSensor.java | 12 ------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/xydl/cac/entity/NPoint.java b/src/main/java/com/xydl/cac/entity/NPoint.java
index 5388276..9189f99 100644
--- a/src/main/java/com/xydl/cac/entity/NPoint.java
+++ b/src/main/java/com/xydl/cac/entity/NPoint.java
@@ -31,11 +31,11 @@ public class NPoint {
     @Column(name = "sensor_id")
     private String sensorId;
 
-    @Column(name = "filed")
-    private String filed;
+    @Column(name = "field")
+    private String field;
 
-    @Column(name = "filed_desc")
-    private Integer filedDesc;
+    @Column(name = "field_desc")
+    private String fieldDesc;
 
     @Column(name = "point_id")
     private Integer pointId;
@@ -44,14 +44,4 @@ public class NPoint {
     private Integer type;
 
 
-
-    @Transient
-    private List<NPoint> children;
-
-    public void addChild(NPoint item) {
-        if (children == null) {
-            children = new ArrayList<>();
-        }
-        children.add(item);
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/entity/NSensor.java b/src/main/java/com/xydl/cac/entity/NSensor.java
index 37440fc..4402085 100644
--- a/src/main/java/com/xydl/cac/entity/NSensor.java
+++ b/src/main/java/com/xydl/cac/entity/NSensor.java
@@ -7,8 +7,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author jignjing
@@ -46,14 +44,4 @@ public class NSensor {
     @Column(name = "status")
     private Integer status;
 
-
-    @Transient
-    private List<NSensor> children;
-
-    public void addChild(NSensor item) {
-        if (children == null) {
-            children = new ArrayList<>();
-        }
-        children.add(item);
-    }
 }
\ No newline at end of file