From fa3ec77225c230a44e107cd188d26e1d974d8029 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 05 一月 2024 15:59:43 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java
index da5f0d1..43e60a9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java
@@ -32,6 +32,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.vci.ubcs.code.service.ICodeClassifyService;
+import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -51,11 +52,9 @@
@AllArgsConstructor
public class CodeClassifyClient implements ICodeClassifyClient {
- private final ICodeClassifyService plCodeClassifyService;
- private final ICodeClassifyTemplateAttrService codeClassifyTemplateAttrService;
-
+ private final ICodeClassifyService codeClassifyService;
private final MdmEngineService engineService;
- CodeClassifyMapper codeClassifyMapper;
+ private final CodeClassifyMapper codeClassifyMapper;
@Override
@GetMapping(TOP)
@@ -67,6 +66,15 @@
return BladePage.of(page);
}
+ /**
+ * 鑾峰彇鎵�鏈変笂绾ц妭鐐圭殑oid
+ * @param oid
+ * @return
+ */
+ public R<List<String>> selectAllParentOid(String oid){
+ return R.data(codeClassifyService.selectAllParentOid(oid));
+ }
+
/***
* 鑾峰彇涓婚搴撳垎绫诲眰绾ф爲
* @param treeQueryObject
@@ -75,7 +83,7 @@
@Override
@PostMapping(CODE_CLASSIFY_TREE)
public List<Tree> referCodeClassifyTree(TreeQueryObject treeQueryObject) {
- return plCodeClassifyService.referTree(treeQueryObject);
+ return codeClassifyService.treeCodeClassify(treeQueryObject);
}
@Override
@@ -85,5 +93,17 @@
return codeClassifyTemplateVO.getAttributes();
}
+ /**
+ * 鏍规嵁鍒嗙被id锛岃幏鍙栧垎绫�
+ * @param classifyId
+ * @return
+ */
+
+ @Override
+ @GetMapping(CODE_GETBYID)
+ public CodeClassify getById(String classifyId) {
+ return codeClassifyService.getById(classifyId);
+ }
+
}
--
Gitblit v1.9.3