From c8cdec5a84e86c35fbe7d18ca8eefbe5cbf11ba7 Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期二, 08 八月 2023 18:11:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java index 17a191f..897b2e7 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOService.java @@ -1,12 +1,15 @@ package com.vci.ubcs.code.service; +import com.vci.ubcs.code.dto.CodeExportAttrDTO; import com.vci.ubcs.code.dto.CodeOrderDTO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO; import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO; import com.vci.ubcs.code.vo.pagemodel.CodeImportTemplateVO; +import com.vci.ubcs.code.vo.pagemodel.CodeImprotSaveDatVO; import com.vci.ubcs.code.vo.webserviceModel.attrmap.DataObjectVO; import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO; import com.vci.ubcs.starter.web.pagemodel.DataGrid; +import org.springblade.core.tool.api.R; import java.io.File; import java.util.LinkedList; @@ -24,6 +27,14 @@ */ String createImportExcel(String codeClassifyOid,boolean isHistory); + + /** + * 鐢熸垚瀵煎叆鐨勬枃浠� + * @param codeClassifyOid 鍒嗙被鐨勪富閿� + * @return excel鐨勬枃浠跺湴鍧� + */ + String downloadTopImportExcel(String codeClassifyOid); + /** * 鎵归噺鐢宠缂栫爜鏁版嵁 * @param orderDTO 缂栫爜鐢宠淇℃伅锛屽繀椤诲寘鍚垎绫讳富閿拰鐮佹鐨勪俊鎭� @@ -32,6 +43,23 @@ */ CodeImProtRusultVO batchImportCode(CodeOrderDTO orderDTO, File file); + /*** + *鎵归噺鐢宠缂栫爜鏁版嵁 + * @param codeClassifyOid 鍒嗙被鐨勪富閿� + * @param classifyAttr 鍒嗙被璺緞浣跨敤鐨勫睘鎬� + * @param file excel鏂囦欢鐨勪俊鎭� + * @return 鏈夐敊璇俊鎭殑excel + */ + CodeImProtRusultVO batchTopImportCode(String codeClassifyOid,String classifyAttr, File file); + + /** + * 瀵煎叆鍘嗗彶鏁版嵁 + * @param codeClassifyOid 鍒嗙被鐨勪富閿� + * @param classifyAttr 鍒嗙被璺緞浣跨敤鐨勫睘鎬� + * @param file excel鏂囦欢鐨勪俊鎭� + * @return 鏈夐敊璇俊鎭殑excel + */ + CodeImProtRusultVO batchImportHistoryData(String codeClassifyOid,String classifyAttr, File file) throws Throwable; /*** * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆鐨勬暟鎹� * @param codeClassifyOid @@ -48,6 +76,31 @@ */ DataGrid<Map<String, String>> gridRowResemble(String dataOid, String redisOid); + /** + * 瀵煎嚭涓婚搴撶殑鏁版嵁 + * @param exportAttrDTO 瀵煎嚭鐩稿叧鐨勯厤缃紝蹇呴』瑕佹湁涓婚搴撳垎绫荤殑涓婚敭 + * @return 瀵煎嚭鐨別xcel鐨勬枃浠� + */ + String exportCode(CodeExportAttrDTO exportAttrDTO); + + /** + * 鎵归噺鐢宠 + * @param codeImprotSaveDatVOList + * @param isImprot + * @return + */ + R batchImportData(List<CodeImprotSaveDatVO> codeImprotSaveDatVOList, String classifyAttr, boolean isImprot); + + /*** + * + * @param redisOid redisid + * @param codeClassifyOid 瀛樺偍瑙勫垯鐨刼id + * @param dataOids 鎵�闇�鍒犻櫎鐨勬暟鎹� + * @return + */ + R deleteDatas(String redisOid, String codeClassifyOid, String dataOids); + + void batchSyncEditDatas(CodeClassifyVO codeClassifyVO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs); /** -- Gitblit v1.9.3