From 8b829bfb8646454fa435c319eacda055d53ed2ba Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 02 九月 2025 22:45:24 +0800
Subject: [PATCH] 首页零组件号加入防抖处理
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 e5ca25d..af018b9 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
@@ -4,21 +4,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
-import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
@@ -43,7 +39,7 @@
private final NcNodeService ncNodeService;
private final ProgramFlowStatusQueryService programFlowStatusQueryService;
private final FlowProgramFileService flowProgramFileService;
- private final QinzheFgbService qinzheFgbService;
+ private final TaskDispatchService taskDispatchService;
/**
* 鏂板
*/
@@ -71,9 +67,21 @@
@PostMapping("/lock")
@Operation(summary = "閿佸畾鑺傜偣(绋嬪簭鍖呭悕)")
- public R<Boolean> lock(@Parameter(description="绋嬪簭鍖呭悕鑺傜偣id)")Long id) {
- ncNodeService.lock(id);
+ public R<Boolean> lock(@Parameter(description="绋嬪簭鍖呭悕鑺傜偣id)")Long id,@Parameter(description="閿佸畾鍘熷洜)")String remark) {
+ ncNodeService.lock(id,remark);
return R.<Boolean>status(true);
+ }
+
+ @GetMapping("/query-lock-remark")
+ @Operation(summary = "鏌ヨ閿佸畾鍘熷洜")
+ public R<String> queryLockRemark(@Parameter(description="绋嬪簭鍖呭悕鑺傜偣id)")Long id) {
+
+ NcNode node = ncNodeService.getById(id);
+ if(node.hasLocked()){
+ return R.data(node.getRemark());
+ }else{
+ return R.data(StringUtils.EMPTY);
+ }
}
@GetMapping("/lazy-list")
@@ -100,13 +108,13 @@
return R.data(list);
}
- @GetMapping("/search")
- @Operation(summary = "棣栭〉鎼滅储", description = "鎼滅储鎸囧畾闆剁粍浠跺彿")
- public R<List<Long>> search(NcNodeQueryVO queryVO) {
+ @GetMapping("/search-list2")
+ @Operation(summary = "娑夊瘑缃戦椤垫悳绱�", description = "鎼滅储鎸囧畾闆剁粍浠跺彿")
+ public R<List<NcNodeVO>> search(NcNodeQueryVO queryVO) {
if(Func.isEmpty(queryVO.getDrawingNo())){
return R.fail("璇疯緭鍏ラ浂缁勪欢鍙�");
}
- List<Long> list = ncNodeService.searchDrawing(queryVO);
+ List<NcNodeVO> list = ncNodeService.searchList2(queryVO);
return R.data(list);
}
@@ -114,7 +122,7 @@
@GetMapping("/drawing-no-pick")
@Operation(summary = "棣栭〉鎼滅储闆剁粍浠朵笅鎷夋暟鎹�", description = "鎼滅储鎸囧畾闆剁粍浠跺彿")
public R<List<String>> drawingNoPick(String drawingNo) {
- return R.data(qinzheFgbService.seletDropList(drawingNo));
+ return R.data(taskDispatchService.drawingNoSeletDropList(drawingNo));
}
@GetMapping("/history-by-nodeid")
--
Gitblit v1.9.3