Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -135,7 +135,17 @@

			String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/meterWater/importMeterWater";

			this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
			ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);

			if (responseEntity.getStatusCode() != HttpStatus.OK) {
			throw new IllegalArgumentException(responseEntity.getBody());
			}

			JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
			if (ResultVo.CODE_OK != paramOut.getInteger("code")) {
			throw new IllegalArgumentException(paramOut.getString("msg"));
			}

			}


			@@ -169,8 +179,8 @@

			String startTime = excelDoubleToDate(os[4].toString());
			String endTime = excelDoubleToDate(os[6].toString());
			Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "行开始时间格式错误请填写YYYY-MM-DD hh:mm:ss 文本格式");
			Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD hh:mm:ss 文本格式");
			Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误请填写YYYY-MM-DD 文本格式");
			Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误请填写YYYY-MM-DD 文本格式");


			importRoomFee = new ImportExportMeterWaterDto();
			@@ -179,8 +189,8 @@
			importRoomFee.setRoomNum(os[2].toString());
			importRoomFee.setPreDegrees(os[3].toString());
			importRoomFee.setPreReadingTime(startTime);
			importRoomFee.setCurDegrees(endTime);
			importRoomFee.setCurReadingTime(os[6].toString());
			importRoomFee.setCurDegrees(os[5].toString());
			importRoomFee.setCurReadingTime(endTime);
			rooms.add(importRoomFee);
			}
			}