From 4e43292ef963be988afdb83e3888e91adeac4e17 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 14 九月 2024 15:40:32 +0800
Subject: [PATCH] 优化代码
---
springboot/src/main/java/com/java110/boot/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java b/springboot/src/main/java/com/java110/boot/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java
index f7793b7..7d6b34e 100644
--- a/springboot/src/main/java/com/java110/boot/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java
+++ b/springboot/src/main/java/com/java110/boot/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java
@@ -31,7 +31,12 @@
public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {
List<ImportExportMeterWaterDto> rooms = new ArrayList<ImportExportMeterWaterDto>();
//鑾峰彇妤间俊鎭�
- getRooms(workbook, rooms);
+ if(paramIn.containsKey("importMeterDynamic") ){
+ getRooms2(workbook, rooms);
+ }else{
+ getRooms(workbook, rooms);
+ }
+
generatorBatch(paramIn);
for (ImportExportMeterWaterDto importRoomFee : rooms) {
importRoomFee.setBatchId(paramIn.getString("batchId"));
@@ -97,5 +102,49 @@
}
+ private void getRooms2(Workbook workbook, List<ImportExportMeterWaterDto> rooms) {
+ Sheet sheet = null;
+ sheet = ImportExcelUtils.getSheet(workbook, "鎴垮眿璐圭敤淇℃伅");
+ List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
+ ImportExportMeterWaterDto importRoomFee = null;
+ for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
+ Object[] os = oList.get(osIndex);
+ if (osIndex == 0 || osIndex == 1) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
+ continue;
+ }
+ if (StringUtil.isNullOrNone(os[0])) {
+ continue;
+ }
+ Assert.hasValue(os[1], (osIndex + 1) + "鍗曞厓缂栧彿涓嶈兘涓虹┖");
+ Assert.hasValue(os[2], (osIndex + 1) + "鎴垮眿缂栧彿涓嶈兘涓虹┖");
+ Assert.hasValue(os[4], (osIndex + 1) + "鍗曚环涓嶈兘涓虹┖");
+ Assert.hasValue(os[5], (osIndex + 1) + "涓婃湡搴︽暟涓嶈兘涓虹┖");
+ Assert.hasValue(os[6], (osIndex + 1) + "涓婃湡搴︽暟鏃堕棿涓嶈兘涓虹┖");
+ Assert.hasValue(os[7], (osIndex + 1) + "鏈湡搴︽暟涓嶈兘涓虹┖");
+ Assert.hasValue(os[8], (osIndex + 1) + "鏈湡搴︽暟鏃堕棿涓嶈兘涓虹┖");
+
+//
+
+ String startTime = excelDoubleToDate(os[6].toString());
+ String endTime = excelDoubleToDate(os[8].toString());
+ 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();
+ importRoomFee.setFloorNum(os[0].toString());
+ importRoomFee.setUnitNum(os[1].toString());
+ importRoomFee.setRoomNum(os[2].toString());
+ importRoomFee.setPrice(Double.parseDouble(os[4].toString()));
+ importRoomFee.setPreDegrees(os[5].toString());
+ importRoomFee.setPreReadingTime(startTime);
+ importRoomFee.setCurDegrees(os[7].toString());
+ importRoomFee.setCurReadingTime(endTime);
+ rooms.add(importRoomFee);
+ if (Double.parseDouble(importRoomFee.getCurDegrees()) < Double.parseDouble(importRoomFee.getPreDegrees())) {
+ throw new IllegalArgumentException((osIndex + 1) + "琛屾湰鏈熻鏁板皬浜庝笂鏈熻鏁�");
+ }
+ }
+ }
}
--
Gitblit v1.8.0