From c6a54f63df671de4592e336b9b8cd8406d4e3b51 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 02 六月 2023 16:25:27 +0800
Subject: [PATCH] 解决动态模块冲突

---
 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 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 31f9b9a..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,17 +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 com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
-import org.springblade.core.mp.support.Query;
 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澶辫触閰嶇疆
@@ -47,13 +43,13 @@
 	}
 
 	/**
-	 * 鍙傜収鍒楄〃鏌ヨ
-	 *
-	 * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
-	 * @return 鏌ヨ缁撴灉
-	 */
+     * 鍙傜収鍒楄〃鏌ヨ
+     *
+     * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
+     * @return 鏌ヨ缁撴灉
+     */
 	@Override
-	public R<IPage<BtmTypeVO>> getRefPage(BaseQueryObject baseQueryObject) {
+	public R<Page<BtmTypeVO>> getRefPage(BaseQueryObject baseQueryObject) {
 		return R.fail("鑾峰彇鏁版嵁澶辫触");
 	}
 
@@ -89,4 +85,37 @@
 	public R<List<BtmTypeVO>> selectByIdCollection(List<String> ids) {
 		return R.fail("鑾峰彇鏁版嵁澶辫触");
 	}
+
+	/**
+	 * 鎸夌収涓氬姟绫诲瀷鑾峰彇榛樿瀛楁
+	 *
+	 * @param btmTypeId 涓氬姟绫诲瀷id
+	 * @return 榛樿瀛楁灞炴��
+	 */
+	@Override
+	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