From 894a0ce49bab4add5dd9208539dbc03c1c85414b Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期四, 29 八月 2024 17:50:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java index 5931650..96ffd58 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java @@ -4,9 +4,12 @@ import com.vci.corba.omd.atm.AttributeDef; import com.vci.dto.OsAttributeDTO; import com.vci.starter.web.pagemodel.BaseQueryObject; +import com.vci.starter.web.pagemodel.BaseResult; import com.vci.starter.web.pagemodel.DataGrid; import com.vci.pagemodel.OsAttributeVO; +import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.util.Collection; import java.util.List; import java.util.Map; @@ -147,9 +150,26 @@ * 瀵煎嚭閫変腑鐨勫睘鎬� * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕 * @param attrNames 闇�瑕佸鍑虹殑灞炴�у悕绉� + * @param flag 鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷� * @return */ - String exportAttributes(String exportFileName,String attrNames) throws PLException; + String exportAttributes(String exportFileName,String attrNames,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException; + + /** + * 涓嬭浇灞炴�у鍏ユā鏉� + * @param exportFileName + * @return + * @throws PLException + */ + String downloadAttributeTemplate(String exportFileName) throws Exception; + + /** + * 瀵煎叆灞炴�� + * @param file + * @param isContinue 绯荤粺涓嚭鐜伴噸澶嶆槸鍚﹁烦杩囨姤閿欑户缁墽琛� + * @return + */ + BaseResult importAttributes(File file,boolean isContinue/*绯荤粺涓嚭鐜伴噸澶嶆槸鍚﹁烦杩囨姤閿欑户缁墽琛�*/) throws Exception; /** * 鏄惁榛樿鐨勫睘鎬� @@ -158,4 +178,12 @@ */ boolean isDefaultAttr(String attr); + /** + * 鏍规嵁涓氬姟绫诲瀷/閾炬帴绫诲瀷鑾峰彇灞炴�т俊鎭� + * @param btName 涓氬姟绫诲瀷/閾炬帴绫诲瀷 + * @param typeFlag 0:涓氬姟绫诲瀷,1:閾炬帴绫诲瀷 + * @return + */ + List<OsAttributeVO> getOsAttributeVOSByBtName(String btName,int typeFlag)throws Exception; + } -- Gitblit v1.9.3