From 0178d9e48a87629f8b5f5f5075409d9ab6d29d87 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 30 八月 2023 17:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java
index 69a0465..6e1762c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java
@@ -16,16 +16,13 @@
*/
package com.vci.ubcs.omd.feign;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.vci.ubcs.omd.entity.Attribute;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.omd.vo.BtmTypeVO;
-import org.springblade.core.mp.support.Query;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Component;
-import java.util.Collection;
import java.util.List;
-import java.util.Map;
/**
* Feign澶辫触閰嶇疆
@@ -46,15 +43,35 @@
}
/**
+ * 鍙傜収鍒楄〃鏌ヨ
+ *
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
+ * @return 鏌ヨ缁撴灉
+ */
+ @Override
+ public R<Page<BtmTypeVO>> getRefPage(BaseQueryObject baseQueryObject) {
+ return R.fail("鑾峰彇鏁版嵁澶辫触");
+ }
+
+ /**
* 鍙傜収鍒楄〃鏌ヨ
*
- * @param condition 鏌ヨ鏉′欢
- * @param query 鍒嗛〉鏉′欢
- * @param domain 棰嗗煙鍊�
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
* @return 鏌ヨ缁撴灉
*/
@Override
- public R<IPage<BtmTypeVO>> getRef(Map<String, Object> condition, Query query, String domain) {
+ public R<List<BtmTypeVO>> getRef(BaseQueryObject baseQueryObject) {
+ return R.fail("鑾峰彇鏁版嵁澶辫触");
+ }
+
+ /**
+ * 鎵归噺鏍规嵁涓婚敭鑾峰彇涓氬姟绫诲瀷
+ *
+ * @param pkBtmTypeCollection 涓氬姟绫诲瀷涓婚敭闆嗗悎
+ * @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
+ */
+ @Override
+ public R<List<BtmTypeVO>> listBtmTypeByOidCollection(List<String> pkBtmTypeCollection) {
return R.fail("鑾峰彇鏁版嵁澶辫触");
}
@@ -70,13 +87,35 @@
}
/**
- * 鎵归噺鏍规嵁涓婚敭鑾峰彇涓氬姟绫诲瀷
+ * 鎸夌収涓氬姟绫诲瀷鑾峰彇榛樿瀛楁
*
- * @param pkBtmTypeCollection 涓氬姟绫诲瀷涓婚敭闆嗗悎
- * @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
+ * @param btmTypeId 涓氬姟绫诲瀷id
+ * @return 榛樿瀛楁灞炴��
*/
@Override
- public R<List<BtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
+ public R<BtmTypeVO> getDefaultAttrByBtmId(String btmTypeId) {
+ return R.fail("鑾峰彇鏁版嵁澶辫触");
+ }
+
+ /**
+ * 鎸変笟鍔＄被鍨媔d鑾峰彇鎵�鏈夌殑瀛楁
+ *
+ * @param btmTypeId 涓氬姟绫诲瀷id
+ * @return 鎵�鏈夊瓧娈�
+ */
+ @Override
+ public R<BtmTypeVO> getAllAttributeByBtmId(String btmTypeId) {
+ return R.fail("鑾峰彇鏁版嵁澶辫触");
+ }
+
+ /**
+ * 鎸変笟鍔＄被鍨嬩富閿幏鍙栨墍鏈夌殑瀛楁
+ *
+ * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
+ * @return 鎵�鏈夊瓧娈�
+ */
+ @Override
+ public R<BtmTypeVO> getAllAttributeByBtmOid(String btmTypeOid) {
return R.fail("鑾峰彇鏁版嵁澶辫触");
}
}
--
Gitblit v1.9.3