From 8e450b9761175acfcb8d421d81b7bf8ff37169f9 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 13 六月 2023 14:49:36 +0800
Subject: [PATCH] 元数据Feign增加查询全部的接口
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeFallback.java | 11 ++++++++++-
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeClient.java | 10 ++++++++++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java | 16 ++++++++++++++++
3 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeClient.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeClient.java
index a002604..b9742fa 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeClient.java
@@ -18,6 +18,7 @@
import com.vci.ubcs.omd.entity.Attribute;
+import com.vci.ubcs.omd.vo.AttributeVO;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
@@ -41,6 +42,8 @@
String GET_BY_ID = API_PREFIX + "/attribute/get-by-id";
String GET_LIST = API_PREFIX + "/attribute/get-list";
+ String GET_ALL = API_PREFIX + "/attribute/get-all";
+
/**
* 鑾峰彇鍏冩暟鎹璞�
@@ -57,4 +60,11 @@
*/
@GetMapping(GET_LIST)
R<List<Attribute>> getList(@RequestParam("key") String key);
+
+ /**
+ * 鑾峰彇鍏ㄩ儴灞炴��
+ * @return 鏌ヨ缁撴灉
+ */
+ @GetMapping(GET_ALL)
+ R<List<AttributeVO>> getAll();
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeFallback.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeFallback.java
index f358100..7080831 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeFallback.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeFallback.java
@@ -17,6 +17,7 @@
package com.vci.ubcs.omd.feign;
import com.vci.ubcs.omd.entity.Attribute;
+import com.vci.ubcs.omd.vo.AttributeVO;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Component;
@@ -39,5 +40,13 @@
return R.fail("鑾峰彇鏁版嵁澶辫触");
}
-
+ /**
+ * 鎸夐鍩熻幏鍙栧叏閮ㄥ睘鎬�
+ *
+ * @return 鏌ヨ缁撴灉
+ */
+ @Override
+ public R<List<AttributeVO>> getAll() {
+ return R.fail("鑾峰彇鏁版嵁澶辫触");
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java
index f246a67..dcfbc4f 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java
@@ -1,7 +1,11 @@
package com.vci.ubcs.omd.feign;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.omd.entity.Attribute;
import com.vci.ubcs.omd.service.IAttributeService;
+import com.vci.ubcs.omd.vo.AttributeVO;
+import com.vci.ubcs.omd.wrapper.AttributeWrapper;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tenant.annotation.NonDS;
@@ -40,4 +44,16 @@
condition.put("key",key);
return R.data(service.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getId)));
}
+
+ /**
+ * 鎸夐鍩熻幏鍙栧叏閮ㄥ睘鎬�
+ *
+ * @return 鏌ヨ缁撴灉
+ */
+ @Override
+ @GetMapping(GET_ALL)
+ public R<List<AttributeVO>> getAll() {
+ List<AttributeVO> voList = AttributeWrapper.build().listEntityVO(service.list());
+ return R.data(voList);
+ }
}
--
Gitblit v1.9.3