From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
old mode 100644
new mode 100755
index 276b403..0447401
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -22,7 +22,9 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -234,8 +236,8 @@
paramIn.put("psId", savedParkingSpaceInfo.getString("psId"));
paramIn.put("storeId", result.getStoreId());
paramIn.put("sellOrHire", parkingSpace.getSellOrHire());
- paramIn.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- paramIn.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ paramIn.put("startTime", parkingSpace.getStartTime());
+ paramIn.put("endTime", parkingSpace.getEndTime());
if ("H".equals(parkingSpace.getSellOrHire())) {
paramIn.put("cycles", "0");
@@ -720,10 +722,42 @@
importParkingSpace.setCarType(os[7].toString());
importParkingSpace.setCarColor(os[8].toString());
importParkingSpace.setSellOrHire(os[9].toString());
+
+ String startTime = excelDoubleToDate(os[10].toString());
+ String endTime = excelDoubleToDate(os[11].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 鏂囨湰鏍煎紡");
+ importParkingSpace.setStartTime(startTime);
+ importParkingSpace.setEndTime(endTime);
}
parkingSpaces.add(importParkingSpace);
}
+ }
+
+ //瑙ｆ瀽Excel鏃ユ湡鏍煎紡
+ public static String excelDoubleToDate(String strDate) {
+ if (strDate.length() == 5) {
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Date tDate = DoubleToDate(Double.parseDouble(strDate));
+ return sdf.format(tDate);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return strDate;
+ }
+ }
+ return strDate;
+ }
+
+
+ //瑙ｆ瀽Excel鏃ユ湡鏍煎紡
+ public static Date DoubleToDate(Double dVal) {
+ Date tDate = new Date();
+ long localOffset = tDate.getTimezoneOffset() * 60000; //绯荤粺鏃跺尯鍋忕Щ 1900/1/1 鍒� 1970/1/1 鐨� 25569 澶�
+ tDate.setTime((long) ((dVal - 25569) * 24 * 3600 * 1000 + localOffset));
+
+ return tDate;
}
/**
@@ -752,7 +786,7 @@
Assert.hasValue(os[3], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬫ゼ灞備负绌�");
Assert.hasValue(os[4], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬫埛鍨嬩负绌�");
Assert.hasValue(os[5], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屽缓绛戦潰绉负绌�");
- if (!StringUtil.isNullOrNone(os[6])) {
+ if (os.length > 6 && !StringUtil.isNullOrNone(os[6])) {
Assert.hasValue(os[7], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬭垂鐢ㄤ负绌�");
Assert.hasValue(os[8], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛岃垂鐢ㄥ埌鏈熸椂闂翠负绌�");
}
@@ -763,17 +797,18 @@
importRoom.setSection(os[4].toString());
importRoom.setBuiltUpArea(Double.parseDouble(os[5].toString()));
- if (!StringUtil.isNullOrNone(os[6])) {
+ if (os.length > 6 && !StringUtil.isNullOrNone(os[6])) {
importRoom.setRoomFeeId(os[7].toString());
importRoom.setFeeEndDate(os[8].toString());
}
- if (StringUtil.isNullOrNone(os[6])) {
+ if (os.length < 7 || StringUtil.isNullOrNone(os[6])) {
rooms.add(importRoom);
continue;
}
importRoom.setImportOwner(getImportOwner(owners, os[6].toString()));
rooms.add(importRoom);
} catch (Exception e) {
+ logger.error("鎴垮眿鏁版嵁鏍￠獙澶辫触", e);
throw new IllegalArgumentException("鎴垮眿淇℃伅sheet涓" + (osIndex + 1) + "琛屾暟鎹敊璇紝璇锋鏌�" + e.getLocalizedMessage());
}
}
--
Gitblit v1.8.0