From 4ee71cd7bebbdf60e538913f5f5de4ecb0de1473 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 05 一月 2024 10:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 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 a2f104a..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
@@ -19,15 +19,27 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.entity.CodeClassify;
+import com.vci.ubcs.code.entity.CodeClassifyTemplateAttr;
import com.vci.ubcs.code.mapper.CodeClassifyMapper;
+import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
+import com.vci.ubcs.code.service.MdmEngineService;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.Tree;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
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;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
/**
* 涓婚搴撳畾涔夎〃 Feign瀹炵幇绫�
@@ -40,9 +52,9 @@
@AllArgsConstructor
public class CodeClassifyClient implements ICodeClassifyClient {
- private final ICodeClassifyService plCodeClassifyService;
-
- CodeClassifyMapper codeClassifyMapper;
+ private final ICodeClassifyService codeClassifyService;
+ private final MdmEngineService engineService;
+ private final CodeClassifyMapper codeClassifyMapper;
@Override
@GetMapping(TOP)
@@ -54,4 +66,44 @@
return BladePage.of(page);
}
+ /**
+ * 鑾峰彇鎵�鏈変笂绾ц妭鐐圭殑oid
+ * @param oid
+ * @return
+ */
+ public R<List<String>> selectAllParentOid(String oid){
+ return R.data(codeClassifyService.selectAllParentOid(oid));
+ }
+
+ /***
+ * 鑾峰彇涓婚搴撳垎绫诲眰绾ф爲
+ * @param treeQueryObject
+ * @return 涓婚搴撳垎绫�
+ */
+ @Override
+ @PostMapping(CODE_CLASSIFY_TREE)
+ public List<Tree> referCodeClassifyTree(TreeQueryObject treeQueryObject) {
+ return codeClassifyService.treeCodeClassify(treeQueryObject);
+ }
+
+ @Override
+ @GetMapping(CODE_ATTRIBUTE_LIST)
+ public List<CodeClassifyTemplateAttrVO> listCodeAttributeByClassId(String codeClassifyId) {
+ CodeClassifyTemplateVO codeClassifyTemplateVO=engineService.getUsedTemplateByClassifyOid(codeClassifyId,true);
+ return codeClassifyTemplateVO.getAttributes();
+ }
+
+ /**
+ * 鏍规嵁鍒嗙被id锛岃幏鍙栧垎绫�
+ * @param classifyId
+ * @return
+ */
+
+ @Override
+ @GetMapping(CODE_GETBYID)
+ public CodeClassify getById(String classifyId) {
+ return codeClassifyService.getById(classifyId);
+ }
+
+
}
--
Gitblit v1.9.3