From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期四, 16 一月 2025 18:20:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java index 823735a..f479364 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsStatusServiceI.java @@ -1,11 +1,14 @@ package com.vci.web.service; +import com.vci.corba.common.PLException; import com.vci.corba.omd.stm.StatePool; -import com.vci.starter.web.pagemodel.DataGrid; -import com.vci.starter.web.pagemodel.PageHelper; import com.vci.dto.OsStatusDTO; import com.vci.pagemodel.OsStatusVO; +import com.vci.starter.web.pagemodel.BaseResult; +import com.vci.starter.web.pagemodel.DataGrid; +import com.vci.starter.web.pagemodel.PageHelper; +import java.io.File; import java.util.Collection; import java.util.List; import java.util.Map; @@ -22,14 +25,14 @@ * @param statePool 鐘舵�佹睜鐨勬暟鎹璞� * @return 鏄剧ず瀵硅薄 */ - OsStatusVO statusDO2VO(com.vci.corba.omd.stm.StatePool statePool); + OsStatusVO statusDO2VO(StatePool statePool); /** * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� * @param statePools 鐘舵�佹睜鐨勬暟鎹璞� 闆嗗悎 * @return 鏄剧ず瀵硅薄 */ - List<OsStatusVO> statusDO2VOs(Collection<com.vci.corba.omd.stm.StatePool> statePools); + List<OsStatusVO> statusDO2VOs(Collection<StatePool> statePools); /** * 鏌ヨ鎵�鏈夌殑鐘舵�� @@ -98,9 +101,9 @@ /** * 鍒犻櫎鐘舵�� - * @param oids 涓婚敭 + * @param osStatusDTOS */ - boolean delete(String oids); + boolean deleteStatus(List<OsStatusDTO> osStatusDTOS) throws PLException; /** * 鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄杞崲涓烘暟鎹璞� @@ -108,4 +111,28 @@ * @return 骞冲彴鐨勬暟鎹璞� */ StatePool statusDTO2DO(OsStatusDTO statusDTO); + + /** + * 瀵煎嚭閫変腑鐨勭姸鎬� + * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕 + * @param statusOids 闇�瑕佸鍑虹殑灞炴�у悕绉� + * @return + */ + String exportStatus(String exportFileName,String statusOids,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException; + + /** + * 涓嬭浇鐘舵�佸鍏ユā鏉� + * @param exportFileName + * @return + * @throws PLException + */ + String downloadStatusTemplate(String exportFileName) throws Exception; + + /** + * 瀵煎叆鐘舵�� + * @param file + * @return + */ + BaseResult importStatus(File file) throws Exception; + } -- Gitblit v1.9.3