From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
index 057a1ef..9e7d424 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
@@ -43,7 +43,11 @@
/**
* 鍔犲伐鏈哄簥
*/
- public static final String TYPE_MACHINE_CODE = "50";
+ //public static final String TYPE_MACHINE_CODE = "50";
+ /**
+ * 鍔犲伐鏈哄簥
+ */
+ public static final String TYPE_MACHINE_GROUP = "50";
/**
* 绋嬪簭鍖呭悕
*/
@@ -89,9 +93,9 @@
private String machineCode;
/**
- * 鏂囦欢绫诲瀷锛屽彧鏈�
+ * 鏈哄簥缁勫瓧鍏稿悧
*/
- //private String fileCategory;
+ private String machineGroupCode;
/**
* 宸ュ簭锛屽鈥滅簿閾ｂ��
*/
@@ -152,6 +156,11 @@
* 绋嬪簭缂栧彿锛堢▼搴忓寘鍚嶈妭鐐归渶瑕侊級
*/
private String programNo;
+
+ /**
+ * 鍘嗗彶搴忓垪鍙�
+ */
+ private Long hisSerial;
/**
* 娴佺▼绋嬪簭鏂囦欢id锛屽彧鏈夌▼搴忔枃浠讹紙70锛夌被鍨嬬殑鑺傜偣鏈夋鍊�
@@ -242,4 +251,16 @@
public boolean hasLocked() {
return this.isLocked != null && this.isLocked == LOCKED;
}
+
+ public String subNodeParentIds(){
+ return this.parentIds+","+this.getId();
+ }
+
+ /**
+ * 缁勮绋嬪簭鍚嶇О
+ * @return 绋嬪簭鍚嶇О
+ */
+ public String programName(){
+ return this.drawingNo+"-"+this.getProcessNo()+"-"+this.getProcessEdition();
+ }
}
--
Gitblit v1.9.3