From f22211dcc3767d8fb50a37eb424a258a12fe626b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 15:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
index 964b250..9e10ef7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
@@ -4,10 +4,7 @@
import com.vci.corba.omd.btm.BizType;
import com.vci.dto.OsBtmTypeDTO;
import com.vci.model.IndexObject;
-import com.vci.pagemodel.OsBtmTypeAttributeVO;
-import com.vci.pagemodel.OsBtmTypeVO;
-import com.vci.pagemodel.OsERVO;
-import com.vci.pagemodel.OsUsedAttributeVO;
+import com.vci.pagemodel.*;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
@@ -49,6 +46,11 @@
* @return 涓氬姟绫诲瀷瀵硅薄
*/
List<OsBtmTypeVO> selectAllBtm();
+ /**
+ * 鏌ヨ鎵�鏈夌殑涓氬姟绫诲瀷
+ * @return 涓氬姟绫诲瀷瀵硅薄
+ */
+ List<OsBtmTypeVO> selectAllBtm(Map<String, OsAttributeVO> attributeVOMap);
/**
* 鑾峰彇鍚嶅瓧浠ilter寮�濮嬬殑涓氬姟绫诲瀷(for 鏌ヨ)锛屼富瑕佺敤浜庡睘鎬ф睜鐨勪笟鍔＄被鍨嬮�夋嫨瀵硅瘽妗�
@@ -60,24 +62,38 @@
BizType[] getBizTypes(String btmName) throws PLException;
/**
+ * 涓氬姟绫诲瀷鍒楄〃鏌ヨ锛岄潪鏍戠粨鏋勶細鐢ㄤ簬UI瀹氫箟宸︿晶涓氬姟绫诲瀷鏌ヨ锛屽彧杩斿洖name鍜宭able
+ * @param btmName
+ * @return
+ * @throws PLException
+ */
+ Tree getBizTree(String btmName) throws PLException;
+
+ /**
* 鏌ヨ鎵�鏈夌殑涓氬姟绫诲瀷鏄犲皠
* @return key 鏄笟鍔＄殑鑻辨枃鍚嶇О鐨勫皬鍐�
*/
Map<String,OsBtmTypeVO> selectAllBtmMap();
/**
+ * 鏌ヨ鎵�鏈夌殑涓氬姟绫诲瀷鏄犲皠
+ * @return key 鏄笟鍔＄殑鑻辨枃鍚嶇О鐨勫皬鍐�
+ */
+ Map<String,OsBtmTypeVO> selectAllBtmMap(Map<String, OsAttributeVO> attributeVOMap);
+
+ /**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param btmItems 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- List<OsBtmTypeVO> btmDO2VOs(Collection<BizType> btmItems);
+ List<OsBtmTypeVO> btmDO2VOs(Collection<BizType> btmItems,Map<String, OsAttributeVO> attributeVOMap);
/**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param btmItem 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- OsBtmTypeVO btmDO2VO(BizType btmItem);
+ OsBtmTypeVO btmDO2VO(BizType btmItem, Map<String, OsAttributeVO> attributeVOMap);
/**
* 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
@@ -87,11 +103,27 @@
List<OsBtmTypeVO> listBtmByIds(Collection<String> btmIds);
/**
+ * TODO:灏介噺鍒敤杩欎釜鏂规硶寰堟參锛屽仛浜嗕竴娆″叏鏌ュ啀杞潵杞幓
* 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
* @param id 缂栧彿
* @return 涓氬姟绫诲瀷
*/
- OsBtmTypeVO getBtmById(String id);
+ OsBtmTypeVO getBtmById(String id) throws PLException;
+
+ /**
+ * 浣跨敤绫诲瀷鍚嶈幏鍙栦笟鍔＄被鍨�,鏌ヤ笉鍒扮洿鎺ユ姤閿�
+ * @param btmName 绫诲瀷鍚�
+ * @return 涓氬姟绫诲瀷
+ * @throws
+ */
+ OsBtmTypeVO getBtmByName(String btmName) throws PLException;
+
+ /**
+ * 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
+ * @param id 缂栧彿
+ * @return 涓氬姟绫诲瀷
+ */
+ OsBtmTypeVO getBtmById(String id, Map<String, OsAttributeVO> attributeVOMap);
/**
* 鑾峰彇涓氬姟绫诲瀷鐨勫湪鍝釜灞炴�т腑浣跨敤
@@ -114,14 +146,14 @@
* @param btmId 涓氬姟绫诲瀷鐨勭紪鍙�
* @return 灞炴�х殑鍐呭
*/
- List<OsBtmTypeAttributeVO> listAttributeByBtmId(String btmId);
+ List<OsBtmTypeAttributeVO> listAttributeByBtmId(String btmId) throws PLException;
/**
* 鏍规嵁涓氬姟绫诲瀷鑾峰彇鍖呭惈鐨勫睘鎬�--鍖呭惈鍩虹灞炴��
* @param btmId 涓氬姟绫诲瀷鐨勭紪鍙�
* @return 灞炴�х殑鍐呭
*/
- List<OsBtmTypeAttributeVO> listAttributeByBtmIdHasDefault(String btmId);
+ List<OsBtmTypeAttributeVO> listAttributeByBtmIdHasDefault(String btmId) throws PLException;
/**
* 鍙傜収涓氬姟绫诲瀷
@@ -144,20 +176,20 @@
* @param id 鏋氫妇鐨勮嫳鏂�
* @return 鏋氫妇鐨勫悕绉�
*/
- String getNameById(String id);
+ String getNameById(String id) throws PLException;
/**
* 鏍规嵁涓氬姟绫诲瀷鍜岄摼鎺ョ被鍨嬬敓鎴怑R鍥�
* @param btmId 涓氬姟绫诲瀷涓婚敭
*/
- OsERVO createERDiagram(String btmId);
+ OsERVO createERDiagram(String btmId) throws PLException;
/**
* 鑾峰彇浣跨敤杩欎釜涓氬姟绫诲瀷鐨凟-R鍥�
* @param btmId 涓氬姟绫诲瀷缂栧彿
* @return 鎵ц缁撴灉
*/
- OsERVO createERUsed(String btmId);
+ OsERVO createERUsed(String btmId) throws PLException;
/**
* 鑾峰彇鎵�鏈変笟鍔＄被鍨嬶紙鏍戝舰缁撴瀯锛�
@@ -276,7 +308,7 @@
/**
* 瀵煎嚭涓氬姟绫诲瀷
* oid 涓氬姟绫诲瀷鍚嶇О
- * @return 鍒涘缓缁撴灉
+ * @return
*/
void expData(String oid, HttpServletResponse response) throws PLException, IOException;
--
Gitblit v1.9.3