From 2f28c90930c4535c6549e84653668a4e5dfc1474 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期三, 24 五月 2023 10:05:19 +0800
Subject: [PATCH] 业务类型feign修正
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java | 24 ++++----
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 66 ++++++++++++++++-----
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java | 34 +++++------
3 files changed, 77 insertions(+), 47 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 e2b3bc4..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;
@@ -61,36 +64,33 @@
/**
* 鍙傜収鍒楄〃鏌ヨ
- * @param condition 鏌ヨ鏉′欢
- * @param query 鍒嗛〉鏉′欢
- * @param domain 棰嗗煙鍊�
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
* @return 鏌ヨ缁撴灉
*/
@GetMapping(GET_REF_PAGE)
- R<IPage<BtmTypeVO>> getRefPage(@RequestParam("condition")Map<String,Object> condition, @RequestParam("query")Query query, @RequestParam("domain") String domain);
+ R<IPage<BtmTypeVO>> getRefPage(@RequestBody BaseQueryObject baseQueryObject);
/**
* 鍙傜収鍒楄〃鏌ヨ
- * @param condition 鏌ヨ鏉′欢
- * @param domain 棰嗗煙鍊�
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
* @return 鏌ヨ缁撴灉
*/
- @GetMapping(GET_REF)
- R<List<BtmTypeVO>> getRef(@RequestParam("condition")Map<String,Object> condition,@RequestParam("domain") String domain);
+ @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);
}
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 d1d54a0..31f9b9a 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
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.omd.entity.Attribute;
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;
@@ -48,25 +49,33 @@
/**
* 鍙傜収鍒楄〃鏌ヨ
*
- * @param condition 鏌ヨ鏉′欢
- * @param query 鍒嗛〉鏉′欢
- * @param domain 棰嗗煙鍊�
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
* @return 鏌ヨ缁撴灉
*/
@Override
- public R<IPage<BtmTypeVO>> getRefPage(Map<String, Object> condition, Query query, String domain) {
+ public R<IPage<BtmTypeVO>> getRefPage(BaseQueryObject baseQueryObject) {
return R.fail("鑾峰彇鏁版嵁澶辫触");
}
/**
* 鍙傜収鍒楄〃鏌ヨ
*
- * @param condition 鏌ヨ鏉′欢
- * @param domain 棰嗗煙鍊�
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
* @return 鏌ヨ缁撴灉
*/
@Override
- public R<List<BtmTypeVO>> getRef(Map<String, Object> condition, 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("鑾峰彇鏁版嵁澶辫触");
}
@@ -78,17 +87,6 @@
*/
@Override
public R<List<BtmTypeVO>> selectByIdCollection(List<String> ids) {
- return R.fail("鑾峰彇鏁版嵁澶辫触");
- }
-
- /**
- * 鎵归噺鏍规嵁涓婚敭鑾峰彇涓氬姟绫诲瀷
- *
- * @param pkBtmTypeCollection 涓氬姟绫诲瀷涓婚敭闆嗗悎
- * @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
- */
- @Override
- public R<List<BtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
return R.fail("鑾峰彇鏁版嵁澶辫触");
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
index 1999394..997bea0 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
@@ -7,6 +7,9 @@
import com.vci.ubcs.omd.service.IBtmTypeService;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.PageHelper;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -14,7 +17,9 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
+import org.springframework.cglib.beans.BeanMap;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -34,6 +39,8 @@
private final IBtmTypeService btmTypeService;
+ private final String DOMAIN = "domain";
+
/**
* 鍙傜収鑾峰彇涓氬姟绫诲瀷璇︽儏淇℃伅
@@ -50,16 +57,32 @@
/**
* 鍙傜収鍒楄〃鏌ヨ
*
- * @param condition 鏌ヨ鏉′欢
- * @param query 鍒嗛〉鏉′欢
- * @param domain 棰嗗煙鍊�
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
* @return 鏌ヨ缁撴灉
*/
@Override
- @GetMapping(GET_REF_PAGE)
- public R<IPage<BtmTypeVO>> getRefPage(Map<String, Object> condition, Query query, String domain) {
- Func.requireNotNull(domain,"棰嗗煙鍊�");
- IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, BtmType.class).lambda().eq(BtmType::getDomain, domain).orderByAsc(BtmType::getId));
+ @PostMapping(GET_REF_PAGE)
+ public R<IPage<BtmTypeVO>> getRefPage(BaseQueryObject baseQueryObject) {
+ Map<String, String> conditionMap = baseQueryObject.getConditionMap();
+ if (conditionMap == null){
+ conditionMap = new HashMap<>(16);
+ }
+ if (!conditionMap.containsKey(DOMAIN)){
+ return R.fail("棰嗗煙鍊间笉鑳戒负绌�");
+ }
+ PageHelper pageHelper = baseQueryObject.getPageHelper();
+ if (pageHelper == null){
+ pageHelper = new PageHelper(-1);
+ }
+ String domainValue = conditionMap.get(DOMAIN);
+ VciBaseUtil.alertNotNull(domainValue,"棰嗗煙鍊�");
+ conditionMap.remove(DOMAIN);
+ BtmType queryObj = new BtmType();
+ BeanMap.create(queryObj).putAll(conditionMap);
+ Query query = new Query();
+ query.setSize(pageHelper.getLimit());
+ query.setCurrent(pageHelper.getPage());
+ IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
IPage<BtmTypeVO> pageVO = new Page<>();
BeanUtil.copy(page,pageVO);
pageVO.setRecords(BtmTypeWrapper.build().listEntityVO(page.getRecords()));
@@ -70,16 +93,25 @@
/**
* 鍙傜収鍒楄〃鏌ヨ
- *
- * @param condition 鏌ヨ鏉′欢
- * @param domain 棰嗗煙鍊�
+ * @param baseQueryObject 鏌ヨ鏉′欢瀵硅薄
* @return 鏌ヨ缁撴灉
*/
@Override
- @GetMapping(GET_REF)
- public R<List<BtmTypeVO>> getRef(Map<String, Object> condition, String domain) {
- Func.requireNotNull(domain,"棰嗗煙鍊�");
- List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(condition, BtmType.class).lambda().eq(BtmType::getDomain, domain).orderByAsc(BtmType::getId));
+ @PostMapping(GET_REF)
+ public R<List<BtmTypeVO>> getRef(BaseQueryObject baseQueryObject) {
+ Map<String, String> conditionMap = baseQueryObject.getConditionMap();
+ if (conditionMap == null){
+ conditionMap = new HashMap<>(16);
+ }
+ if (!conditionMap.containsKey(DOMAIN)){
+ return R.fail("棰嗗煙鍊间笉鑳戒负绌�");
+ }
+ String domainValue = conditionMap.get(DOMAIN);
+ VciBaseUtil.alertNotNull(domainValue,"棰嗗煙鍊�");
+ conditionMap.remove(DOMAIN);
+ BtmType queryObj = new BtmType();
+ BeanMap.create(queryObj).putAll(conditionMap);
+ List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
return R.data(BtmTypeWrapper.build().listEntityVO(list));
}
@@ -90,7 +122,7 @@
* @return 涓氬姟瀵硅薄
*/
@Override
- @GetMapping(GET_BY_IDS)
+ @PostMapping(GET_BY_IDS)
public R<List<BtmTypeVO>> selectByIdCollection(List<String> ids) {
Func.requireNotNull(ids,"涓氬姟绫诲瀷鑻辨枃鍚嶇О");
List<BtmTypeVO> voList = BtmTypeWrapper.build().listEntityVO(
@@ -109,8 +141,8 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
*/
@Override
- @GetMapping(GET_BY_OIDS)
- public R<List<BtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
+ @PostMapping(GET_BY_OIDS)
+ public R<List<BtmTypeVO>> listBtmTypeByOidCollection(List<String> pkBtmTypeCollection) {
Func.requireNotNull(pkBtmTypeCollection,"涓氬姟绫诲瀷涓婚敭");
List<BtmTypeVO> voList = BtmTypeWrapper.build().listEntityVO(
Optional.ofNullable(btmTypeService.list(
--
Gitblit v1.9.3