feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.54</version>
+	<version>1.0.55</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/property/service/impl/BuildingTreeServiceImpl.java

@@ -11,9 +11,7 @@ import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.BuildingTreeServiceI;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -100,13 +98,24 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			for (int j = 3; j <= lastRowNum; j++) {
 				Row row = sheet.getRow(j);
 				TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-				String phase = row.getCell(0).getStringCellValue().trim();
-				String building = row.getCell(1).getStringCellValue().trim();
-				String unit = row.getCell(2).getStringCellValue().trim();
-				String level = row.getCell(3).getStringCellValue().trim();
-				String roomNo = row.getCell(4).getStringCellValue().trim();
-				
+				String phase = null;
+				String building = null;
+				String unit = null;
+				String level = null;
+				String roomNo = null;
 				int currentRow = j+1;
+				try {
+					phase = getStringOfCell(row.getCell(0));
+					building = getStringOfCell(row.getCell(1));
+					unit = getStringOfCell(row.getCell(2));
+					level = getStringOfCell(row.getCell(3));
+					roomNo = getStringOfCell(row.getCell(4));
+				} catch (Exception e) {
+					e.printStackTrace();
+					responseBean.addError(String.format("第 %d 行, 格式错误, 数据只能为字符或数字格式", currentRow));
+					return responseBean;
+				}
+
 				if (StringUtils.isEmpty(phase)){
 					responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
 					return responseBean;
@@ -154,6 +163,17 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		responseBean.addSuccess(data);
 		return responseBean;
 	}
+
+	private String getStringOfCell(Cell cell) throws Exception {
+		CellType cellTypeEnum = cell.getCellTypeEnum();
+		if (cellTypeEnum.equals(CellType.STRING)) {
+			return cell.getStringCellValue().trim();
+		} else if (cellTypeEnum.equals(CellType.NUMERIC)) {
+			return String.valueOf((int) cell.getNumericCellValue()).trim();
+		} else {
+			throw new Exception("数据内容格式错误");
+		}
+	}
 	
 	/**
 	 * 上传小区的基础数据