From 0d4c4c0075a7285efa8f91540d81f66590ad9062 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 7 Mar 2024 09:44:36 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20json=E4=B8=8D=E8=BF=94=E5=9B=9Enull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/entity/Bdz.java               | 2 ++
 src/main/java/com/xydl/cac/entity/IcdConfigType.java     | 2 ++
 src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java  | 2 ++
 src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java | 2 ++
 src/main/java/com/xydl/cac/entity/Jg.java                | 2 ++
 src/main/java/com/xydl/cac/entity/Lx.java                | 2 ++
 src/main/java/com/xydl/cac/entity/Modev.java             | 2 ++
 src/main/java/com/xydl/cac/entity/ModevType.java         | 2 ++
 src/main/java/com/xydl/cac/entity/ModevTypePoint.java    | 3 ++-
 src/main/java/com/xydl/cac/entity/N103Point.java         | 7 ++-----
 src/main/java/com/xydl/cac/entity/N103Sensor.java        | 3 ++-
 src/main/java/com/xydl/cac/entity/NPoint.java            | 7 ++-----
 src/main/java/com/xydl/cac/entity/NSensor.java           | 6 ++----
 src/main/java/com/xydl/cac/entity/Rptparamindex.java     | 2 ++
 src/main/java/com/xydl/cac/entity/Unit.java              | 2 ++
 src/main/java/com/xydl/cac/entity/Zsb.java               | 2 ++
 16 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/xydl/cac/entity/Bdz.java b/src/main/java/com/xydl/cac/entity/Bdz.java
index 43dd867..70b2ea5 100644
--- a/src/main/java/com/xydl/cac/entity/Bdz.java
+++ b/src/main/java/com/xydl/cac/entity/Bdz.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -15,6 +16,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigType.java b/src/main/java/com/xydl/cac/entity/IcdConfigType.java
index d8ef1f0..1a95f9e 100644
--- a/src/main/java/com/xydl/cac/entity/IcdConfigType.java
+++ b/src/main/java/com/xydl/cac/entity/IcdConfigType.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,6 +12,7 @@ import javax.persistence.*;
 import java.util.LinkedHashMap;
 import java.util.List;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java b/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java
index 36f79f3..42ed674 100644
--- a/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java
+++ b/src/main/java/com/xydl/cac/entity/IcdConfigTypeAtt.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,6 +12,7 @@ import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java b/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java
index 85ba695..7717f36 100644
--- a/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java
+++ b/src/main/java/com/xydl/cac/entity/IcdConfigTypeInst.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/Jg.java b/src/main/java/com/xydl/cac/entity/Jg.java
index 4a581f8..a187624 100644
--- a/src/main/java/com/xydl/cac/entity/Jg.java
+++ b/src/main/java/com/xydl/cac/entity/Jg.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -16,6 +17,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/Lx.java b/src/main/java/com/xydl/cac/entity/Lx.java
index 5edaec0..d0d2291 100644
--- a/src/main/java/com/xydl/cac/entity/Lx.java
+++ b/src/main/java/com/xydl/cac/entity/Lx.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,6 +13,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.math.BigDecimal;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/Modev.java b/src/main/java/com/xydl/cac/entity/Modev.java
index 187c6cc..527d118 100644
--- a/src/main/java/com/xydl/cac/entity/Modev.java
+++ b/src/main/java/com/xydl/cac/entity/Modev.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,6 +14,7 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Date;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/ModevType.java b/src/main/java/com/xydl/cac/entity/ModevType.java
index d555847..8705be9 100644
--- a/src/main/java/com/xydl/cac/entity/ModevType.java
+++ b/src/main/java/com/xydl/cac/entity/ModevType.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -10,6 +11,7 @@ import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/ModevTypePoint.java b/src/main/java/com/xydl/cac/entity/ModevTypePoint.java
index f3ce217..e3bbdbe 100644
--- a/src/main/java/com/xydl/cac/entity/ModevTypePoint.java
+++ b/src/main/java/com/xydl/cac/entity/ModevTypePoint.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,7 +13,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
-
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/N103Point.java b/src/main/java/com/xydl/cac/entity/N103Point.java
index f3fe6be..dbb8672 100644
--- a/src/main/java/com/xydl/cac/entity/N103Point.java
+++ b/src/main/java/com/xydl/cac/entity/N103Point.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -8,12 +9,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.util.List;
 
-/**
- * @author jignjing
- * @date 2024-01-31
- **/
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/N103Sensor.java b/src/main/java/com/xydl/cac/entity/N103Sensor.java
index 80518bb..7f29c58 100644
--- a/src/main/java/com/xydl/cac/entity/N103Sensor.java
+++ b/src/main/java/com/xydl/cac/entity/N103Sensor.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,7 +12,7 @@ import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
-
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/NPoint.java b/src/main/java/com/xydl/cac/entity/NPoint.java
index bc8c334..dffe1bc 100644
--- a/src/main/java/com/xydl/cac/entity/NPoint.java
+++ b/src/main/java/com/xydl/cac/entity/NPoint.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -8,13 +9,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author jignjing
- * @date 2024-01-31
- **/
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/NSensor.java b/src/main/java/com/xydl/cac/entity/NSensor.java
index de1afe9..95402e3 100644
--- a/src/main/java/com/xydl/cac/entity/NSensor.java
+++ b/src/main/java/com/xydl/cac/entity/NSensor.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,10 +12,7 @@ import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author jignjing
- * @date 2024-01-31
- **/
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/Rptparamindex.java b/src/main/java/com/xydl/cac/entity/Rptparamindex.java
index e5ca887..6b02366 100644
--- a/src/main/java/com/xydl/cac/entity/Rptparamindex.java
+++ b/src/main/java/com/xydl/cac/entity/Rptparamindex.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,6 +13,7 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/Unit.java b/src/main/java/com/xydl/cac/entity/Unit.java
index 0c458a5..e92388c 100644
--- a/src/main/java/com/xydl/cac/entity/Unit.java
+++ b/src/main/java/com/xydl/cac/entity/Unit.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -10,6 +11,7 @@ import lombok.NoArgsConstructor;
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor
diff --git a/src/main/java/com/xydl/cac/entity/Zsb.java b/src/main/java/com/xydl/cac/entity/Zsb.java
index 1a056b8..347e2d8 100644
--- a/src/main/java/com/xydl/cac/entity/Zsb.java
+++ b/src/main/java/com/xydl/cac/entity/Zsb.java
@@ -1,5 +1,6 @@
 package com.xydl.cac.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -15,6 +16,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 @Builder
 @AllArgsConstructor