From 842d6752d6e646fcc516e82da0f98f17a63ffcb8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 21 八月 2025 21:07:36 +0800
Subject: [PATCH] 勤哲修改接口增加
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java | 7 ++-----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 6 +++---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 7 ++-----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java | 8 ++++----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeOldQueryVO.java | 27 +++++++++++++++++++++++++++
5 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
index 2dbcd42..1302a04 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
@@ -47,12 +47,12 @@
String programPkgName = NcNodeService.genProgramName(props.getDrawingNo(),props.getProcessNo());
createProgramNodes(props);
- String processEdition = props.getProcessEdition();
//TODO 鍋忕鍗曪紝鍜屽凡缁忓浐鍖栫殑绋嬪簭锛屾病鏈夊鐞�,:宸茬粡澶勭悊娌℃湁楠岃瘉
NcNode packageNode;
if(FlowContants.Y.equals(props.getHasCuredProgram()) && FlowContants.Y.equals(props.getCureProgramUseable())){
- //鏈夊浐鍖栵紝涓旂▼搴忓彲鐢紝浠庡浐鍖栨爲鏌ヨ鑺傜偣
- packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition());
+ //鏈夊浐鍖栵紝涓旂▼搴忓彲鐢紝浠庡浐鍖栨爲鏌ヨ鑺傜偣.浣跨敤娴佺▼涓繚瀛樼殑鑺傜偣
+ //packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition());
+ packageNode = ncNodeService.getById(props.getCuredNodeId());
}else if(Func.isNotBlank(props.getDeviation())){
//鏈夊亸绂诲崟
packageNode = ncNodeService.getLastEditionDeviationProgramPackage(programPkgName,props.getProcessEdition());
@@ -72,7 +72,7 @@
*/
void createProgramNodes(FlowProgramProperties progProperties){
if(FlowContants.N.equals(progProperties.getHasCuredProgram())) {
- //鏃犲浐鍖�(璇曞垏鎴栬�呭亸绂�)
+ //鏃犲浐鍖�:(璇曞垏鎴栬�呭亸绂�)
ncNodeAutoCreateService.createNodeTreeWithProgram(progProperties);
}else{
//鏈夊浐鍖栵紝绋嬪簭涓嶅彲鐢�
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 ffe2552..e5ca25d 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
@@ -89,17 +89,17 @@
}
return R.data(list);
}
- /*
+
@GetMapping("/search-list")
@Operation(summary = "鏌ヨ鏍戠姸鍒楄〃", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯锛堟煡璇笓鐢級")
- public R<List<NcNodeVO>> searchList(NcNodeQueryVO queryVO) {
+ public R<List<NcNodeVO>> searchList(NcNodeOldQueryVO queryVO) {
if(Func.isEmpty(queryVO.getName())){
return R.fail("璇疯緭鍏ュ悕绉�");
}
List<NcNodeVO> list = ncNodeService.searchList(queryVO);
return R.data(list);
- }*/
+ }
@GetMapping("/search")
@Operation(summary = "棣栭〉鎼滅储", description = "鎼滅储鎸囧畾闆剁粍浠跺彿")
public R<List<Long>> search(NcNodeQueryVO queryVO) {
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
index 766b340..14a7aab 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
@@ -5,10 +5,7 @@
import org.springblade.core.mp.mapper.BladeMapper;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcNodeProgramVO;
-import org.springblade.mdm.program.vo.NcNodeQueryVO;
-import org.springblade.mdm.program.vo.NcNodeVO;
+import org.springblade.mdm.program.vo.*;
import java.util.List;
@@ -24,7 +21,7 @@
*/
NcNode getLastProgramNode(String name);
- List<NcNodeVO> searchList(NcNodeQueryVO queryVO);
+ List<NcNodeVO> searchList(NcNodeOldQueryVO queryVO);
List<NcNodeVO> searchListInIds(List<Long> ids);
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 122d9e8..ecca16d 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
@@ -122,8 +122,7 @@
* @param queryVO
* @return
*/
- /*
- public List<NcNodeVO> searchList(NcNodeQueryVO queryVO) {
+ public List<NcNodeVO> searchList(NcNodeOldQueryVO queryVO) {
//1.鏍规嵁鍏宠繘瀛楀拰鑺傜偣绫诲瀷鏌ヨ鍒濆鍒楄〃,鏌ヨ鐨勫師濮嬪垪琛紝闇�瑕乭asChild瀛楁锛屾墍浠ヤ娇鐢╩apper.xml
List<NcNodeVO> oriList = this.getBaseMapper().searchList(queryVO);
if ("10".equals(queryVO.getNodeType())) {
@@ -133,8 +132,6 @@
List<NcNodeVO> allVos = new ArrayList<NcNodeVO>();//宸茬粡鍔犲叆杩囩殑鑺傜偣锛岀敤浜庡幓閲�
List<NcNodeVO> rootVos = new ArrayList<NcNodeVO>();
-
- //List<NcNode> rootNodes = new ArrayList<>();
for(NcNodeVO vo : oriList){
allVos.add(vo);
@@ -154,7 +151,7 @@
}
return rootVos;
}
-*/
+
void addNodeChildren(NcNodeVO node, List<NcNodeVO> allNodes) {
for(NcNodeVO vo : allNodes){
if(Objects.equals(vo.getParentId(), node.getId())){
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeOldQueryVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeOldQueryVO.java
new file mode 100644
index 0000000..76f99c8
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeOldQueryVO.java
@@ -0,0 +1,27 @@
+package org.springblade.mdm.program.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+
+@Schema(description = "棣栭〉鏍戞煡璇㈠弬鏁板璞�")
+@Setter
+@Getter
+public class NcNodeOldQueryVO {
+ private String name;
+
+ @Schema(description = "闆剁粍浠跺彿")
+ private String nodeType;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Schema(description = "璧峰鏃堕棿")
+ private LocalDateTime createTimeBegin;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Schema(description = "缁撴潫鏃堕棿")
+ private LocalDateTime createTimeEnd;
+
+}
--
Gitblit v1.9.3