From dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 25 四月 2023 22:58:51 +0800
Subject: [PATCH] omd服务校正
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.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/OmdAttributeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
similarity index 72%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
index b6045dd..e6200a9 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.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.OmdAttributeDTO;
-import com.vci.ubcs.omd.entity.OmdAttribute;
-import com.vci.ubcs.omd.service.IOmdAttributeService;
-import com.vci.ubcs.omd.vo.OmdAttributeVO;
-import com.vci.ubcs.omd.wrapper.OmdAttributeWrapper;
-import com.vci.ubcs.system.vo.DictVO;
+import com.vci.ubcs.omd.dto.AttributeDTO;
+import com.vci.ubcs.omd.entity.Attribute;
+import com.vci.ubcs.omd.service.IAttributeService;
+import com.vci.ubcs.omd.vo.AttributeVO;
+import com.vci.ubcs.omd.wrapper.AttributeWrapper;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
@@ -37,11 +36,11 @@
@AllArgsConstructor
@RequestMapping("/attribute")
@Api(value = "鍏冩暟鎹帶鍒跺櫒", tags = "鍏冩暟鎹帶鍒跺櫒")
-public class OmdAttributeController extends BladeController {
+public class AttributeController extends BladeController {
/**
* 鍏冩暟鎹湇鍔�
*/
- private final IOmdAttributeService attributeService;
+ private final IAttributeService attributeService;
/**
* 鏌ョ湅璇︽儏
@@ -51,7 +50,7 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鏌ョ湅璇︽儏", notes = "浼犲叆涓婚敭")
- public R<OmdAttributeVO> detail(Long id) {
+ public R<AttributeVO> detail(Long id) {
return R.data(attributeService.getAttributeDetail(id));
}
@@ -66,8 +65,8 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
- public R<List<OmdAttributeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
- return R.data(OmdAttributeWrapper.build().listEntityVO(attributeService.list(Condition.getQueryWrapper(condition, OmdAttribute.class).lambda().orderByAsc(OmdAttribute::getKey))));
+ public R<List<AttributeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
+ return R.data(AttributeWrapper.build().listEntityVO(attributeService.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey))));
}
/**
@@ -80,11 +79,11 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
- public R<IPage<OmdAttributeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
- IPage<OmdAttributeVO> pageVO = new Page<>();
- IPage<OmdAttribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, OmdAttribute.class).lambda().orderByAsc(OmdAttribute::getKey));
+ public R<IPage<AttributeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
+ IPage<AttributeVO> pageVO = new Page<>();
+ IPage<Attribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey));
BeanUtil.copy(page,pageVO);
- pageVO.setRecords( OmdAttributeWrapper.build().listEntityVO(page.getRecords()));
+ pageVO.setRecords( AttributeWrapper.build().listEntityVO(page.getRecords()));
return R.data(pageVO);
}
@@ -97,7 +96,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆鍏冩暟鎹璞�")
- public R submit(@Valid @RequestBody OmdAttributeDTO dto) {
+ public R submit(@Valid @RequestBody AttributeDTO dto) {
CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
return R.status(attributeService.submit(dto));
}
--
Gitblit v1.9.3