From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeDeptWell.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeDeptWell.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeDeptWell.java
index 5eb85b0..a247737 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeDeptWell.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeDeptWell.java
@@ -5,27 +5,53 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
@Data
public class TreeDeptWell {
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
private Long deptId;
/** 鐖堕儴闂↖D */
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
private Long parentId;
/** 绁栫骇鍒楄〃 */
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
private String ancestors;
/** 閮ㄩ棬鍚嶇О */
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
private String deptName;
- /** 鏄剧ず椤哄簭 */
- private Integer orderNum;
+// /** 鏄剧ず椤哄簭 */
+// @JsonInclude(JsonInclude.Include.NON_EMPTY)
+// private Integer orderNum;
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private Integer id;
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private String equipName;
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private String equipNumber;
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private String equipKey;
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private String equipLevel;
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private String measureDate;
+// @JsonInclude(JsonInclude.Include.NON_EMPTY)
+// private Long WellDeptId;
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private BigDecimal longitude;
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private BigDecimal latitude;
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private BigDecimal altitude;
+// @JsonInclude(JsonInclude.Include.NON_EMPTY)
+// private String ancestor;
- private List<HealthVo> well = new ArrayList<>();
-
- @TableField(exist = false)
- private List<TreeDeptWell> children = new ArrayList<TreeDeptWell>();
+ private List<TreeDeptWell> children = new ArrayList<>();
}
--
Gitblit v1.9.3