From 3dd88eb315a90c2b793e10b0b987a6c3b09a8650 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 14 八月 2024 16:44:35 +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 | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 e8abcb5..1256d2a 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
@@ -3,6 +3,7 @@
import com.vci.corba.common.PLException;
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;
@@ -11,7 +12,9 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.pagemodel.Tree;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.ParseException;
import java.util.Collection;
@@ -187,7 +190,7 @@
* @param bizTypes
* @return
*/
- boolean addBtmTypes(List<BizType> bizTypes);
+ //boolean addBtmTypes(List<BizType> bizTypes);
/**
* 淇敼涓氬姟绫诲瀷
@@ -249,26 +252,39 @@
BaseResult deleteAllType() throws PLException;
/**
- * 鏍规嵁涓氬姟绫诲瀷鍚嶇О鍜屽叾涓嬬殑灞炴�у悕绉拌幏鍙栦篃鏈夌殑绱㈠紩
- * @param btmName
- * @param attrName
+ * 鏍规嵁涓氬姟绫诲瀷鍚嶇О鍜岀储寮曞悕绉版煡璇㈣幏鍙栧凡鏈夌殑绱㈠紩
+ * @param conditionMap 鏍规嵁鏌ヨ鏉′欢浼犲弬: typename:涓氬姟绫诲瀷鍚�;indexname:绱㈠紩鍚�
* @return
*/
- List<String> getIndexByBtmAndAttrName(String btmName,String attrName);
+ List<IndexObject> getIndexByCondition(Map<String,String> conditionMap) throws PLException;
/**
* 鏍规嵁涓氬姟绫诲瀷鍚嶇О鍜屽叾涓嬬殑灞炴�у悕绉板垹闄ょ储寮�
* @param btmName
- * @param attrName
+ * @param indexName
* @return
*/
- boolean delIndexByBtmAndAttrName(String btmName,String attrName);
+ boolean delIndex(String btmName,String indexName) throws PLException;
/**
* 缁欎笟鍔＄被鍨嬩笅鐨勬寚瀹氬睘鎬ф柊澧炵储寮�
- * @param addMap 濡傦細(btmName:part attrName:name indexName: PARTNAMEINDEX)
+ * @param indexObjectList
* @return
*/
- boolean addIndex(Map<String,String> addMap);
+ boolean addIndex(List<IndexObject> indexObjectList) throws PLException;
+
+ /**
+ * 瀵煎嚭涓氬姟绫诲瀷
+ * name 涓氬姟绫诲瀷鍚嶇О
+ * @return 鍒涘缓缁撴灉
+ */
+ void expData(String oid, HttpServletResponse response) throws PLException, IOException;
+
+ /**
+ * 瀵煎叆涓氬姟绫诲瀷
+ * @param file 涓婁紶鐨勬枃浠�
+ * @return
+ */
+ BaseResult impData(MultipartFile file) throws Exception;
}
--
Gitblit v1.9.3