From f60ff0a216d1ca6ecea8a35e9b54c66bccd25dd2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 15 十一月 2023 10:32:29 +0800
Subject: [PATCH] 整合代码

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java |   63 +++++++++++++++++++++++++++----
 1 files changed, 55 insertions(+), 8 deletions(-)

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 997bea0..e5a6b3a 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
@@ -1,6 +1,7 @@
 package com.vci.ubcs.omd.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vci.ubcs.omd.entity.BtmType;
@@ -62,7 +63,7 @@
 	 */
 	@Override
 	@PostMapping(GET_REF_PAGE)
-	public R<IPage<BtmTypeVO>> getRefPage(BaseQueryObject baseQueryObject) {
+	public R<Page<BtmTypeVO>> getRefPage(BaseQueryObject baseQueryObject) {
 		Map<String, String> conditionMap = baseQueryObject.getConditionMap();
 		if (conditionMap == null){
 			conditionMap = new HashMap<>(16);
@@ -77,17 +78,21 @@
 		String domainValue = conditionMap.get(DOMAIN);
 		VciBaseUtil.alertNotNull(domainValue,"棰嗗煙鍊�");
 		conditionMap.remove(DOMAIN);
-		BtmType queryObj = new BtmType();
-		BeanMap.create(queryObj).putAll(conditionMap);
+//		BtmType queryObj = new BtmType();
+//		BeanMap.create(queryObj).putAll(conditionMap);
+		Map<String, Object> condition = new HashMap<>(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<>();
+		IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition,BtmType.class).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
+		if (CollectionUtils.isEmpty(page.getRecords())){
+			return R.data(null);
+		}
+		Page<BtmTypeVO> pageVO = new Page<>();
 		BeanUtil.copy(page,pageVO);
 		pageVO.setRecords(BtmTypeWrapper.build().listEntityVO(page.getRecords()));
-		R<IPage<BtmTypeVO>> r = R.data(pageVO);
-		r.setSuccess(true);
+		R<Page<BtmTypeVO>> r = R.data(pageVO);
+//		r.setSuccess(true);
 		return r;
 	}
 
@@ -111,7 +116,10 @@
 		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));
+		List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
+		if (CollectionUtils.isEmpty(list)){
+			return R.data(new ArrayList<>());
+		}
 		return R.data(BtmTypeWrapper.build().listEntityVO(list));
 	}
 
@@ -131,6 +139,9 @@
 				)
 			).orElseGet(ArrayList::new)
 		);
+		if (CollectionUtils.isEmpty(voList)){
+			return R.data(new ArrayList<>(),"鏆傛棤鏁版嵁鎵胯浇锛�");
+		}
 		return R.data(voList);
 	}
 
@@ -152,4 +163,40 @@
 		);
 		return R.data(voList);
 	}
+
+	/**
+	 * 鑾峰彇涓氬姟绫诲瀷锛屽彧鏈夐粯璁ゅ瓧娈�
+	 *
+	 * @param btmTypeId 涓氬姟绫诲瀷id
+	 * @return 榛樿瀛楁灞炴��
+	 */
+	@Override
+	@GetMapping(GET_DEFAULT_ATTR_BY_BTM_ID)
+	public R<BtmTypeVO> getDefaultAttrByBtmId(String btmTypeId) {
+		return R.data(Optional.ofNullable(btmTypeService.getDefaultAttrByBtmId(btmTypeId)).orElseGet(BtmTypeVO::new));
+	}
+
+	/**
+	 * 鑾峰彇涓氬姟绫诲瀷锛屾湁鎵�鏈夌殑瀛楁
+	 *
+	 * @param btmTypeId 涓氬姟绫诲瀷id
+	 * @return 鎵�鏈夊瓧娈�
+	 */
+	@Override
+	@GetMapping(GET_ALL_ATTR_BY_BTM_ID)
+	public R<BtmTypeVO> getAllAttributeByBtmId(String btmTypeId) {
+		return R.data(Optional.ofNullable(btmTypeService.getAllAttributeByBtmId(btmTypeId)).orElseGet(BtmTypeVO::new));
+	}
+
+	/**
+	 * 鑾峰彇涓氬姟绫诲瀷锛屾湁鎵�鏈夌殑瀛楁
+	 *
+	 * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
+	 * @return 鎵�鏈夊瓧娈�
+	 */
+	@Override
+	@GetMapping(GET_ALL_ATTR_BY_BTM_OID)
+	public R<BtmTypeVO> getAllAttributeByBtmOid(String btmTypeOid) {
+		return R.data(Optional.ofNullable(btmTypeService.getAllAttributeByBtmOid(btmTypeOid)).orElseGet(BtmTypeVO::new));
+	}
 }

--
Gitblit v1.9.3