From 8954429263a75e3c7d19db20a60370fca005f2bd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 15:44:49 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 c61c5fb..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();
@@ -70,6 +70,8 @@
Assert.hasKeyAndValue(reqJson, "configId", "璇锋眰淇℃伅涓湭鍖呭惈璐圭敤椤�");
Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰淇℃伅涓湭鍖呭惈鍟嗘埛淇℃伅");
Assert.hasKeyAndValue(reqJson, "feeTypeCd", "璇锋眰淇℃伅涓湭鍖呭惈璐圭敤绫诲瀷");
+ Assert.hasKeyAndValue(reqJson, "batchId", "璇锋眰淇℃伅涓湭鍖呭惈鎵规鍙�");
+ Assert.hasKeyAndValue(reqJson, "meterType", "璇锋眰淇℃伅涓湭鍖呭惈鎶勮〃绫诲瀷");
return queryPreMeterWaterImpl.importMeterWater(reqJson);
}
--
Gitblit v1.8.0