From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java b/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
old mode 100644
new mode 100755
index 38e32d7..b4a9d63
--- a/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
@@ -1,7 +1,7 @@
package com.java110.fee.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.meterWater.MeterWaterDto;
+import com.java110.dto.meter.MeterWaterDto;
import com.java110.fee.bmo.meterWater.IQueryPreMeterWater;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,8 +27,8 @@
*/
@RequestMapping(value = "/queryPreMeterWater", method = RequestMethod.GET)
public ResponseEntity<String> queryPreMeterWater(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "objId") String objId,
- @RequestParam(value = "objType") String objType,
+ @RequestParam(value = "objId", required = false) String objId,
+ @RequestParam(value = "objType", required = false) String objType,
@RequestParam(value = "roomNum", required = false) String roomNum,
@RequestParam(value = "meterType", required = false) String meterType) {
MeterWaterDto meterWaterDto = new MeterWaterDto();
@@ -58,19 +58,21 @@
/**
* 瀵煎叆姘寸數鎶勮〃
*
- * @param reqJson 璇锋眰鎶ユ枃
+ * @param reqString 璇锋眰鎶ユ枃
* @return
* @serviceCode /meterWater/importMeterWater
* @path /app/meterWater/importMeterWater
*/
@RequestMapping(value = "/importMeterWater", method = RequestMethod.POST)
- public ResponseEntity<String> importMeterWater(@RequestBody String reqJson) {
-
+ public ResponseEntity<String> importMeterWater(@RequestBody String reqString) {
+ JSONObject reqJson = JSONObject.parseObject(reqString);
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰淇℃伅涓湭鍖呭惈灏忓尯淇℃伅");
Assert.hasKeyAndValue(reqJson, "configId", "璇锋眰淇℃伅涓湭鍖呭惈璐圭敤椤�");
Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰淇℃伅涓湭鍖呭惈鍟嗘埛淇℃伅");
Assert.hasKeyAndValue(reqJson, "feeTypeCd", "璇锋眰淇℃伅涓湭鍖呭惈璐圭敤绫诲瀷");
- return queryPreMeterWaterImpl.importMeterWater(JSONObject.parseObject(reqJson));
+ Assert.hasKeyAndValue(reqJson, "batchId", "璇锋眰淇℃伅涓湭鍖呭惈鎵规鍙�");
+ Assert.hasKeyAndValue(reqJson, "meterType", "璇锋眰淇℃伅涓湭鍖呭惈鎶勮〃绫诲瀷");
+ return queryPreMeterWaterImpl.importMeterWater(reqJson);
}
--
Gitblit v1.8.0