From 74be20dfb5b244bbae3387db7a1aecb9fc1a21bd Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期三, 16 六月 2021 18:22:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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
old mode 100644
new mode 100755
index 99f4213..7546986
--- 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鏁版嵁
*/
@@ -135,7 +156,17 @@
String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/meterWater/importMeterWater";
- this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+ ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ throw new IllegalArgumentException(responseEntity.getBody());
+ }
+
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ if (ResultVo.CODE_OK != paramOut.getInteger("code")) {
+ throw new IllegalArgumentException(paramOut.getString("msg"));
+ }
+
}
@@ -169,8 +200,8 @@
String startTime = excelDoubleToDate(os[4].toString());
String endTime = excelDoubleToDate(os[6].toString());
- Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD hh:mm:ss 鏂囨湰鏍煎紡");
- Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD hh:mm:ss 鏂囨湰鏍煎紡");
+ Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
+ Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
importRoomFee = new ImportExportMeterWaterDto();
@@ -179,8 +210,8 @@
importRoomFee.setRoomNum(os[2].toString());
importRoomFee.setPreDegrees(os[3].toString());
importRoomFee.setPreReadingTime(startTime);
- importRoomFee.setCurDegrees(endTime);
- importRoomFee.setCurReadingTime(os[6].toString());
+ importRoomFee.setCurDegrees(os[5].toString());
+ importRoomFee.setCurReadingTime(endTime);
rooms.add(importRoomFee);
}
}
--
Gitblit v1.8.0