Lianxun_Java.git

			@@ -505,7 +505,12 @@
			paramIn.put("ownerTypeCd", "1001");
			paramIn.put("idCard", owner.getIdCard());
			responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);

			if (responseEntity.getStatusCode() == HttpStatus.OK) {
			JSONObject body = JSONObject.parseObject(responseEntity.getBody());
			if(body.containsKey("code") && body.getIntValue("code") != 0){
			throw new IllegalArgumentException(body.getString("msg"));
			}
			savedOwnerInfo = getExistsOwner(pd, result, owner);
			owner.setOwnerId(savedOwnerInfo.getString("ownerId"));
			}
			@@ -708,10 +713,10 @@
			if (StringUtil.isNullOrNone(os[0])) {
			continue;
			}
			Assert.hasLength(os[0].toString(), "车位信息选项中" + (osIndex + 1) + "行停车场编号为空");
			Assert.hasLength(os[1].toString(), "车位信息选项中" + (osIndex + 1) + "行车位编码为空");
			Assert.hasLength(os[2].toString(), "车位信息选项中" + (osIndex + 1) + "行停车场类型为空");
			Assert.hasLength(os[3].toString(), "车位信息选项中" + (osIndex + 1) + "行面积为空，没有请填写规定值如10");
			Assert.hasValue(os[0], "车位信息选项中" + (osIndex + 1) + "行停车场编号为空");
			Assert.hasValue(os[1], "车位信息选项中" + (osIndex + 1) + "行车位编码为空");
			Assert.hasValue(os[2], "车位信息选项中" + (osIndex + 1) + "行停车场类型为空");
			Assert.hasValue(os[3], "车位信息选项中" + (osIndex + 1) + "行面积为空，没有请填写规定值如10");
			importParkingSpace = new ImportParkingSpace();
			importParkingSpace.setPaNum(os[0].toString());
			importParkingSpace.setPsNum(os[1].toString());
			@@ -755,14 +760,14 @@
			if (StringUtil.isNullOrNone(os[0])) {
			continue;
			}
			Assert.hasLength(os[1].toString(), "房屋信息选项中" + (osIndex + 1) + "行楼栋编号为空");
			Assert.hasLength(os[2].toString(), "房屋信息选项中" + (osIndex + 1) + "行单元编号为空");
			Assert.hasLength(os[3].toString(), "房屋信息选项中" + (osIndex + 1) + "行房屋楼层为空");
			Assert.hasLength(os[4].toString(), "房屋信息选项中" + (osIndex + 1) + "行房屋户型为空");
			Assert.hasLength(os[5].toString(), "房屋信息选项中" + (osIndex + 1) + "行建筑面积为空");
			Assert.hasValue(os[1], "房屋信息选项中" + (osIndex + 1) + "行楼栋编号为空");
			Assert.hasValue(os[2], "房屋信息选项中" + (osIndex + 1) + "行单元编号为空");
			Assert.hasValue(os[3], "房屋信息选项中" + (osIndex + 1) + "行房屋楼层为空");
			Assert.hasValue(os[4], "房屋信息选项中" + (osIndex + 1) + "行房屋户型为空");
			Assert.hasValue(os[5], "房屋信息选项中" + (osIndex + 1) + "行建筑面积为空");
			if (!StringUtil.isNullOrNone(os[6])) {
			Assert.hasLength(os[7].toString(), "房屋信息选项中" + (osIndex + 1) + "行房屋费用为空");
			Assert.hasLength(os[8].toString(), "房屋信息选项中" + (osIndex + 1) + "行费用到期时间为空");
			Assert.hasValue(os[7], "房屋信息选项中" + (osIndex + 1) + "行房屋费用为空");
			Assert.hasValue(os[8], "房屋信息选项中" + (osIndex + 1) + "行费用到期时间为空");
			}
			importRoom = new ImportRoom();
			importRoom.setRoomNum(os[0].toString());
			@@ -771,7 +776,7 @@
			importRoom.setSection(os[4].toString());
			importRoom.setBuiltUpArea(Double.parseDouble(os[5].toString()));

			if (!StringUtil.isEmpty(os[6].toString())) {
			if (!StringUtil.isNullOrNone(os[6])) {
			importRoom.setRoomFeeId(os[7].toString());
			importRoom.setFeeEndDate(os[8].toString());
			}
			@@ -803,22 +808,22 @@
			if (StringUtil.isNullOrNone(os[0])) {
			continue;
			}
			Assert.hasLength(os[0].toString(), "费用设置选项中" + (osIndex + 1) + "行费用编号为空");
			Assert.hasLength(os[1].toString(), "费用设置选项中" + (osIndex + 1) + "行费用类型为空");
			Assert.hasLength(os[2].toString(), "费用设置选项中" + (osIndex + 1) + "行收费项目为空");
			Assert.hasLength(os[3].toString(), "费用设置选项中" + (osIndex + 1) + "行费用标识为空");
			Assert.hasLength(os[4].toString(), "费用设置选项中" + (osIndex + 1) + "行费用类型为空");
			Assert.hasLength(os[5].toString(), "费用设置选项中" + (osIndex + 1) + "行缴费周期为空");
			Assert.hasValue(os[0], "费用设置选项中" + (osIndex + 1) + "行费用编号为空");
			Assert.hasValue(os[1], "费用设置选项中" + (osIndex + 1) + "行费用类型为空");
			Assert.hasValue(os[2], "费用设置选项中" + (osIndex + 1) + "行收费项目为空");
			Assert.hasValue(os[3], "费用设置选项中" + (osIndex + 1) + "行费用标识为空");
			Assert.hasValue(os[4], "费用设置选项中" + (osIndex + 1) + "行费用类型为空");
			Assert.hasValue(os[5], "费用设置选项中" + (osIndex + 1) + "行缴费周期为空");
			Assert.isInteger(os[5].toString(), "费用设置选项中" + (osIndex + 1) + "行缴费周期不是正整数");
			Assert.hasLength(os[6].toString(), "费用设置选项中" + (osIndex + 1) + "行出账类型为空");
			Assert.hasValue(os[6], "费用设置选项中" + (osIndex + 1) + "行出账类型为空");
			Assert.isDate(os[7].toString(), DateUtil.DATE_FORMATE_STRING_B, "费用设置选项中" + (osIndex + 1) + "行计费起始时间不是有效时间格式请输入类似2020-06-01");
			Assert.isDate(os[8].toString(), DateUtil.DATE_FORMATE_STRING_B, "费用设置选项中" + (osIndex + 1) + "行计费终止时间不是有效时间格式请输入类似2037-01-01");
			Assert.hasLength(os[9].toString(), "费用设置选项中" + (osIndex + 1) + "行计算公式为空");
			Assert.hasValue(os[9], "费用设置选项中" + (osIndex + 1) + "行计算公式为空");
			if (!"1001".equals(os[9].toString()) && !"2002".equals(os[9].toString())) {
			throw new IllegalArgumentException("费用设置选项中" + (osIndex + 1) + "行计算公式错误请填写1001 或者2002");
			}
			Assert.hasLength(os[10].toString(), "费用设置选项中" + (osIndex + 1) + "行计费单价为空");
			Assert.hasLength(os[11].toString(), "费用设置选项中" + (osIndex + 1) + "行固定费用为空");
			Assert.hasValue(os[10], "费用设置选项中" + (osIndex + 1) + "行计费单价为空");
			Assert.hasValue(os[11], "费用设置选项中" + (osIndex + 1) + "行固定费用为空");
			importFee = new ImportFee();
			importFee.setId(os[0].toString());
			importFee.setFeeTypeCd("物业费".equals(os[1]) ? "888800010001" : "888800010002");
			@@ -899,9 +904,9 @@
			if (StringUtil.isNullOrNone(os[0])) {
			continue;
			}
			Assert.hasLength(os[0].toString(), "业主信息选项中" + (osIndex + 1) + "行业主编号为空");
			Assert.hasLength(os[1].toString(), "业主信息选项中" + (osIndex + 1) + "行业主名称为空");
			Assert.hasLength(os[2].toString(), "业主信息选项中" + (osIndex + 1) + "行业主性别为空");
			Assert.hasValue(os[0], "业主信息选项中" + (osIndex + 1) + "行业主编号为空");
			Assert.hasValue(os[1], "业主信息选项中" + (osIndex + 1) + "行业主名称为空");
			Assert.hasValue(os[2], "业主信息选项中" + (osIndex + 1) + "行业主性别为空");
			String tel = StringUtil.isNullOrNone(os[4]) ? "19999999999" : os[4].toString();
			String idCard = StringUtil.isNullOrNone(os[5]) ? "10000000000000000001" : os[5].toString();
			String age = StringUtil.isNullOrNone(os[3]) ? CommonUtil.getAgeByCertId(idCard) : os[3].toString();
			@@ -937,10 +942,10 @@
			continue;
			}

			Assert.hasLength(os[0].toString(), "楼栋单元选项中" + (osIndex + 1) + "行楼栋号为空");
			Assert.hasLength(os[1].toString(), "楼栋单元选项中" + (osIndex + 1) + "行单元编号为空");
			Assert.hasLength(os[2].toString(), "楼栋单元选项中" + (osIndex + 1) + "行总楼层为空");
			Assert.hasLength(os[3].toString(), "楼栋单元选项中" + (osIndex + 1) + "行是否有电梯为空");
			Assert.hasValue(os[0], "楼栋单元选项中" + (osIndex + 1) + "行楼栋号为空");
			Assert.hasValue(os[1], "楼栋单元选项中" + (osIndex + 1) + "行单元编号为空");
			Assert.hasValue(os[2], "楼栋单元选项中" + (osIndex + 1) + "行总楼层为空");
			Assert.hasValue(os[3], "楼栋单元选项中" + (osIndex + 1) + "行是否有电梯为空");
			importFloor = new ImportFloor();
			importFloor.setFloorNum(os[0].toString());
			importFloor.setUnitNum(os[1].toString());