From 76293d27f60ca77343e77d35bfbfae97cdc6035f Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期三, 24 五月 2023 18:34:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java
index 78fb003..741d9bd 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
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.RequestParam;
import java.util.Collection;
@@ -20,8 +23,8 @@
* @date 2023/4/24
*/
@FeignClient(
- value = AppConstant.APPLICATION_NAME_OMD,
- fallback = IDictClientFallback.class
+ value = AppConstant.APPLICATION_NAME_OMD
+ //fallback = IBtmTypeFallback.class
)
public interface IBtmTypeClient {
@@ -31,6 +34,10 @@
String API_PREFIX = "/client";
/**
* 鍙傜収鍒楄〃鏌ヨ
+ */
+ String GET_REF_PAGE = API_PREFIX + "/btm-type/get-ref-page";
+ /**
+ * 鍙傜収鍒楄〃鏌ヨ鏃犲垎椤�
*/
String GET_REF = API_PREFIX + "/btm-type/get-ref";
/**
@@ -57,27 +64,33 @@
/**
* 鍙傜収鍒楄〃鏌ヨ
- * @param condition 鏌ヨ鏉′欢
- * @param query 鍒嗛〉鏉′欢
- * @param domain 棰嗗煙鍊�
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
* @return 鏌ヨ缁撴灉
*/
- @GetMapping(GET_REF)
- R<IPage<BtmTypeVO>> getRef(@RequestParam("condition")Map<String,Object> condition, @RequestParam("query")Query query, @RequestParam("domain") String domain);
+ @GetMapping(GET_REF_PAGE)
+ R<IPage<BtmTypeVO>> getRefPage(@RequestBody BaseQueryObject baseQueryObject);
+
+ /**
+ * 鍙傜収鍒楄〃鏌ヨ
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
+ * @return 鏌ヨ缁撴灉
+ */
+ @PostMapping(GET_REF)
+ R<List<BtmTypeVO>> getRef(@RequestBody BaseQueryObject baseQueryObject);
/**
* 鏍规嵁鑻辨枃鍚嶇О鎵归噺鏌ヨ瀵硅薄
* @param ids 瀵硅薄鑻辨枃鍚嶇О 浣嗘槸涓嶈兘瓒呰繃1000
* @return 涓氬姟瀵硅薄
*/
- @GetMapping(GET_BY_IDS)
- R<List<BtmTypeVO>> selectByIdCollection(List<String> ids);
+ @PostMapping(GET_BY_IDS)
+ R<List<BtmTypeVO>> selectByIdCollection(@RequestBody List<String> ids);
/**
* 鎵归噺鏍规嵁涓婚敭鑾峰彇涓氬姟绫诲瀷
* @param pkBtmTypeCollection 涓氬姟绫诲瀷涓婚敭闆嗗悎
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
*/
- @GetMapping(GET_BY_OIDS)
- R<List<BtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection);
+ @PostMapping(GET_BY_OIDS)
+ R<List<BtmTypeVO>> listBtmTypeByOidCollection(@RequestBody List<String> pkBtmTypeCollection);
}
--
Gitblit v1.9.3