From 3cb0cef6f7189dcbb537df52cef5921d1d2c3cd9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 26 四月 2023 00:12:23 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/OmdBtmTypeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
similarity index 61%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/OmdBtmTypeClient.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
index ae445bf..5625897 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/OmdBtmTypeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
@@ -3,10 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.vci.ubcs.omd.entity.OmdBtmType;
-import com.vci.ubcs.omd.service.IOmdBtmTypeService;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import com.vci.ubcs.omd.wrapper.OmdBtmTypeWrapper;
+import com.vci.ubcs.omd.entity.BtmType;
+import com.vci.ubcs.omd.service.IBtmTypeService;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -29,9 +29,9 @@
@ApiIgnore
@RestController
@AllArgsConstructor
-public class OmdBtmTypeClient implements IOmdBtmTypeClient{
+public class BtmTypeClient implements IBtmTypeClient {
- private final IOmdBtmTypeService btmTypeService;
+ private final IBtmTypeService btmTypeService;
/**
@@ -41,7 +41,7 @@
* @return 涓氬姟绫诲瀷璇︽儏淇℃伅
*/
@Override
- public R<OmdBtmTypeVO> getDetail(String oid) {
+ public R<BtmTypeVO> getDetail(String oid) {
return R.data(btmTypeService.getBtmTypeByOid(oid));
}
@@ -54,13 +54,13 @@
* @return 鏌ヨ缁撴灉
*/
@Override
- public R<IPage<OmdBtmTypeVO>> getRef(Map<String, Object> condition, Query query, String domain) {
+ public R<IPage<BtmTypeVO>> getRef(Map<String, Object> condition, Query query, String domain) {
Func.requireNotNull(domain,"棰嗗煙鍊�");
- IPage<OmdBtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, OmdBtmType.class).lambda().eq(OmdBtmType::getDomain, domain).orderByAsc(OmdBtmType::getId));
- IPage<OmdBtmTypeVO> pageVO = new Page<>();
+ IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, BtmType.class).lambda().eq(BtmType::getDomain, domain).orderByAsc(BtmType::getId));
+ IPage<BtmTypeVO> pageVO = new Page<>();
BeanUtil.copy(page,pageVO);
- pageVO.setRecords(OmdBtmTypeWrapper.build().listEntityVO(page.getRecords()));
- R<IPage<OmdBtmTypeVO>> r = R.data(pageVO);
+ pageVO.setRecords(BtmTypeWrapper.build().listEntityVO(page.getRecords()));
+ R<IPage<BtmTypeVO>> r = R.data(pageVO);
r.setSuccess(true);
return r;
}
@@ -72,11 +72,11 @@
* @return 涓氬姟瀵硅薄
*/
@Override
- public R<List<OmdBtmTypeVO>> selectByIdCollection(List<String> ids) {
+ public R<List<BtmTypeVO>> selectByIdCollection(List<String> ids) {
Func.requireNotNull(ids,"涓氬姟绫诲瀷鑻辨枃鍚嶇О");
- List<OmdBtmTypeVO> voList = OmdBtmTypeWrapper.build().listEntityVO(
+ List<BtmTypeVO> voList = BtmTypeWrapper.build().listEntityVO(
Optional.ofNullable(btmTypeService.list(
- Wrappers.<OmdBtmType>query().lambda().in(OmdBtmType::getId, ids)
+ Wrappers.<BtmType>query().lambda().in(BtmType::getId, ids)
)
).orElseGet(ArrayList::new)
);
@@ -90,11 +90,11 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
*/
@Override
- public R<List<OmdBtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
+ public R<List<BtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
Func.requireNotNull(pkBtmTypeCollection,"涓氬姟绫诲瀷涓婚敭");
- List<OmdBtmTypeVO> voList = OmdBtmTypeWrapper.build().listEntityVO(
+ List<BtmTypeVO> voList = BtmTypeWrapper.build().listEntityVO(
Optional.ofNullable(btmTypeService.list(
- Wrappers.<OmdBtmType>query().lambda().in(OmdBtmType::getOid, pkBtmTypeCollection)
+ Wrappers.<BtmType>query().lambda().in(BtmType::getOid, pkBtmTypeCollection)
)
).orElseGet(ArrayList::new)
);
--
Gitblit v1.9.3