Lianxun_Java.git

			@@ -8,7 +8,7 @@
			import com.java110.core.smo.ISaveTransactionLogSMO;
			import com.java110.dto.RoomDto;
			import com.java110.dto.assetImportLog.AssetImportLogDto;
			import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto;
			import com.java110.dto.assetImportLog.AssetImportLogDetailDto;
			import com.java110.dto.owner.OwnerDto;
			import com.java110.entity.assetImport.*;
			import com.java110.entity.component.ComponentValidateResult;
			@@ -17,7 +17,7 @@
			import org.apache.poi.ss.usermodel.Sheet;
			import org.apache.poi.ss.usermodel.Workbook;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import com.java110.core.log.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.http.HttpMethod;
			import org.springframework.http.HttpStatus;
			@@ -444,6 +444,7 @@
			AssetImportLogDetailDto assetImportLogDetailDto = null;
			try {
			for (ImportRoom room : rooms) {
			paramIn = new JSONObject();
			JSONObject savedRoomInfo = getExistsRoom(pd, result, room);
			if (savedRoomInfo != null) {
			//如果空闲入住一下
			@@ -462,7 +463,6 @@
			}
			continue;
			}
			paramIn = new JSONObject();
			//保存房屋
			apiUrl = "room.saveRoom";

			@@ -867,7 +867,8 @@
			long failCount = 0L;
			AssetImportLogDetailDto assetImportLogDetailDto = null;
			try {
			for (ImportFloor importFloor : floors) {
			for (int floorIndex = 0; floorIndex < floors.size(); floorIndex++) {
			ImportFloor importFloor = floors.get(floorIndex);
			paramIn = new JSONObject();
			//先保存楼栋信息
			JSONObject savedFloorInfo = getExistsFloor(pd, result, importFloor);
			@@ -879,6 +880,7 @@
			paramIn.put("userId", result.getUserId());
			paramIn.put("name", importFloor.getFloorNum() + "栋");
			paramIn.put("floorArea", 1.00);
			paramIn.put("seq",floorIndex+1);

			responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
			savedFloorInfo = getExistsFloor(pd, result, importFloor);