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/controller/BtmTypeController.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdBtmTypeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java
similarity index 76%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdBtmTypeController.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java
index 80e891d..2a88bb7 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdBtmTypeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java
@@ -4,12 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
-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.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.omd.dto.BtmTypeDTO;
+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 io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
@@ -39,12 +38,12 @@
@AllArgsConstructor
@RequestMapping("/btm-type")
@Api(value = "涓氬姟绫诲瀷鎺у埗鍣�", tags = "涓氬姟绫诲瀷鎺у埗鍣�")
-public class OmdBtmTypeController extends BladeController {
+public class BtmTypeController extends BladeController {
/**
* 涓氬姟绫诲瀷鏈嶅姟
*/
- private final IOmdBtmTypeService btmTypeService;
+ private final IBtmTypeService btmTypeService;
/**
@@ -56,7 +55,7 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鏌ョ湅璇︽儏", notes = "浼犲叆涓婚敭")
- public R<OmdBtmTypeVO> detail(String oid) {
+ public R<BtmTypeVO> detail(String oid) {
return R.data(btmTypeService.getBtmTypeByOid(oid));
}
@@ -75,8 +74,8 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
- public R<List<OmdBtmTypeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
- return R.data(OmdBtmTypeWrapper.build().listEntityVO(btmTypeService.list(Condition.getQueryWrapper(condition, OmdBtmType.class).lambda().orderByAsc(OmdBtmType::getId))));
+ public R<List<BtmTypeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
+ return R.data(BtmTypeWrapper.build().listEntityVO(btmTypeService.list(Condition.getQueryWrapper(condition, BtmType.class).lambda().orderByAsc(BtmType::getId))));
}
/**
@@ -93,11 +92,11 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
- public R<IPage<OmdBtmTypeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
- IPage<OmdBtmTypeVO> pageVO = new Page<>();
- IPage<OmdBtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, OmdBtmType.class).lambda().orderByAsc(OmdBtmType::getId));
+ public R<IPage<BtmTypeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
+ IPage<BtmTypeVO> pageVO = new Page<>();
+ IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, BtmType.class).lambda().orderByAsc(BtmType::getId));
BeanUtil.copy(page, pageVO);
- pageVO.setRecords(OmdBtmTypeWrapper.build().listEntityVO(page.getRecords()));
+ pageVO.setRecords(BtmTypeWrapper.build().listEntityVO(page.getRecords()));
return R.data(pageVO);
}
@@ -111,7 +110,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆鍏冩暟鎹璞�")
- public R submit(@Valid @RequestBody OmdBtmTypeDTO dto) {
+ public R submit(@Valid @RequestBody BtmTypeDTO dto) {
CacheUtil.clear(OmdCacheConstant.BTM_CACHE);
return R.status(btmTypeService.submit(dto));
}
--
Gitblit v1.9.3