From 5b17ee47dd478e02b6b5c060e7190e8e9d095fc0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 17:53:01 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
index 1360fb4..7546986 100755
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
@@ -70,6 +70,27 @@
}
}
+ @Override
+ public ResponseEntity<String> importExcelData2(IPageData pd, MultipartFile uploadFile) {
+ try {
+ ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+ //InputStream is = uploadFile.getInputStream();
+
+ Workbook workbook = ImportExcelUtils.createWorkbook(uploadFile); //宸ヤ綔绨�
+
+ List<ImportExportMeterWaterDto> rooms = new ArrayList<ImportExportMeterWaterDto>();
+
+ //鑾峰彇妤间俊鎭�
+ getRooms(workbook, rooms);
+ // 淇濆瓨鏁版嵁
+ return dealExcelData(pd, rooms, result);
+ } catch (Exception e) {
+ logger.error("瀵煎叆澶辫触 ", e);
+ return new ResponseEntity<String>("闈炲父鎶辨瓑锛屾偍濉啓鐨勬ā鏉挎暟鎹湁璇細" + e.getMessage(), HttpStatus.BAD_REQUEST);
+ }
+ }
+
/**
* 澶勭悊ExcelData鏁版嵁
*/
--
Gitblit v1.8.0