From 3d85fd7de42ead48fd50a99ee3d5d29bbd403b3c Mon Sep 17 00:00:00 2001
From: 92895 <928953915>
Date: 星期一, 23 十一月 2020 10:48:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
index 99f4213..8e499ad 100644
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
@@ -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"));
+ }
+
}
@@ -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);
}
}
--
Gitblit v1.8.0