From b5fd4d5dd05e13af32ad50334f5e2f0f8aa56d59 Mon Sep 17 00:00:00 2001
From: lyh <liuyuanheng@xalxzn.com>
Date: 星期六, 14 六月 2025 23:56:26 +0800
Subject: [PATCH] 工控网解析 涉密网产品结构树（添加权限）、nc文件、刀具列表、程序加工确认表
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java
index 81e49a1..f390a20 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductMix.java
@@ -29,13 +29,13 @@
private Long parentId;
// 鍚嶇О
@TableField(value = "tree_name")
- private String name;
+ private String treeName;
// code
@TableField(value = "tree_code")
- private String code;
+ private String treeCode;
// 绫诲瀷
@TableField(value = "tree_type")
- private Integer type;
+ private Integer treeType;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@TableField(value = "create_time")
private Date createTime;
@@ -43,17 +43,19 @@
//灞曠ず鍚嶇О
private transient String label;
+ //绫诲瀷 鏂逛究鍓嶇灞曠ず
+ private transient Integer type;
private transient List<ProductMix> children = new ArrayList<>();
- public ProductMix(Long id, Long parentId, String name, String code, Integer type, Date createTime) {
+ public ProductMix(Long id, Long parentId, String treeName, String trrCode, Integer type, Date createTime) {
this.id = id;
this.parentId = parentId;
- this.name = name;
- this.code = code;
+ this.treeName = treeName;
+ this.treeCode = trrCode;
this.type = type;
this.children = new ArrayList<>();
- this.label="["+code+"]"+name;
+ this.label="["+ trrCode +"]"+ treeName;
this.createTime = createTime;
}
--
Gitblit v1.9.3