From 3aae81075a18a11d6b605c7583eb03b75366b466 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 四月 2024 00:08:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java
index 4613774..87ff975 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java
@@ -11,7 +11,7 @@
import com.vci.ubcs.omd.entity.BtmType;
import com.vci.ubcs.omd.repeater.DomainRepeater;
import com.vci.ubcs.omd.service.IBtmTypeService;
-import com.vci.ubcs.omd.vo.BtmTypeTreeVO;
+import com.vci.ubcs.omd.vo.BtmTreeVO;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.DomainVO;
import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
@@ -50,7 +50,6 @@
* 涓氬姟绫诲瀷鏈嶅姟
*/
private final IBtmTypeService btmTypeService;
-
/**
* 鏌ョ湅璇︽儏
@@ -106,7 +105,6 @@
return R.data(pageVO);
}
-
/**
* 鏂板鎴栦慨鏀�
*
@@ -161,7 +159,7 @@
@GetMapping("/tree-domain")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "涓氬姟绫诲瀷鏍戝舰缁撴瀯", notes = "涓氬姟绫诲瀷鏍戝舰缁撴瀯")
- public R<List<BtmTypeTreeVO>> treeDomain(){
+ public R<List<BtmTreeVO>> treeDomain(){
return R.data(btmTypeService.treeDomain());
}
@@ -212,4 +210,17 @@
}
return R.data(btmTypeService.saveFromTable(btmTypeDTOList,domain));
}
+
+ /**
+ * 鑾峰彇榛樿灞炴��
+ * @param defaultAttrType
+ * @return
+ */
+ @GetMapping("/getDefaultAttr")
+ @ApiOperation(value = "鑾峰彇榛樿灞炴��",notes = "鑾峰彇榛樿灞炴��")
+ @ApiOperationSupport(order = 10)
+ public R getDefaultAttr(String defaultAttrType){
+ return R.data(this.btmTypeService.getDefaultAttr(defaultAttrType));
+ }
+
}
--
Gitblit v1.9.3