From 04a3c68a77a73e4d1fb4e68bbaf51ae4b1d31219 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 17:41:31 +0800
Subject: [PATCH] 增加锁定
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 28 +++++++---------------------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 11 +++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java | 16 ++++++++++++++++
3 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 59730bd..5200df1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -67,6 +67,13 @@
return R.<Boolean>status(true);
}
+ @PostMapping("/lock")
+ @Operation(summary = "閿佸畾鑺傜偣(绋嬪簭鍖呭悕)")
+ public R<Boolean> lock(@Parameter(description="绋嬪簭鍖呭悕鑺傜偣id)")Long id) {
+ ncNodeService.lock(id);
+ return R.<Boolean>status(true);
+ }
+
@GetMapping("/lazy-list")
@Operation(summary = "鎳掑姞杞藉垪琛�", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯")
public R<List<NcNodeVO>> lazyList(Long parentId) {
@@ -88,28 +95,7 @@
return R.fail("璇疯緭鍏ュ悕绉�");
}
List<NcNodeVO> list = ncNodeService.searchList(queryVO);
- /*
- if(list != null && !list.isEmpty()) {
- for(NcNodeVO ncNodeVO : list) {
- if(!"70".equals(ncNodeVO.getNodeType())){
- break;
- }
- NcProgram program = ncProgramService.getByBindNodeId(ncNodeVO.getId());
- if(program != null) {
- ncNodeVO.setProcessEdition(program.getProcessEdition());
- ncNodeVO.setDrawingNo(program.getDrawingNo());
- ncNodeVO.setMachineCode(program.getMachineCode());
- ncNodeVO.setProcessName(program.getProcessName());
- ncNodeVO.setVersionNumber(program.getVersionNumber());
- //record涓壘涓嶅埌鏃舵湭鍚姩0锛涙壘鍒颁簡闇�瑕佹煡璇㈡祦绋嬪疄渚媔d锛屾槸鍚﹁繍琛屼腑
- ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(program.getId()));
- }
- }
-
- }
-
- */
return R.data(list);
}
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 e62386d..40767ff 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
@@ -55,6 +55,15 @@
public static final String TYPE_PROGRAM_FILE = "70";
/**
+ * 鏈攣瀹�
+ */
+ public static final int UNLOCK = 0;
+ /**
+ * 宸查攣瀹�
+ */
+ public static final int LOCKED = 1;
+
+ /**
* 鏂囦欢鑺傜偣鏂囦欢绫诲瀷锛氱▼搴�
*/
public static final String FILE_CATEGOAY_PROGRAM = "program";
@@ -205,4 +214,11 @@
public void upgradeVersionNUmber() {
this.versionNumber = genNewVersionNumber();
}
+
+ /**
+ * 閿佸畾鑺傜偣
+ */
+ public void lock() {
+ this.isLocked = LOCKED;
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
index 4255df9..158b002 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
@@ -310,4 +310,15 @@
this.updateById(node);
}
+
+ /**
+ * 閿佸畾鑺傜偣
+ * @param id 绋嬪簭鍖呰妭鐐筰d
+ */
+ @Transactional
+ public void lock(Long id) {
+ NcNode node = this.getById(id);
+ node.lock();
+ this.updateById(node);
+ }
}
--
Gitblit v1.9.3