From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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 c5a2a05..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,13 +1,12 @@
package com.java110.fee.api;
-import com.java110.dto.meterWater.MeterWaterDto;
+import com.alibaba.fastjson.JSONObject;
+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;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = "/meterWater")
@@ -28,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();
@@ -53,6 +52,28 @@
@RequestMapping(value = "/queryExportRoomAndMeterWater", method = RequestMethod.GET)
public ResponseEntity<String> queryExportRoomAndMeterWater(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "meterType") String meterType) {
- return queryPreMeterWaterImpl.queryExportRoomAndMeterWater(communityId,meterType);
+ return queryPreMeterWaterImpl.queryExportRoomAndMeterWater(communityId, meterType);
}
+
+ /**
+ * 瀵煎叆姘寸數鎶勮〃
+ *
+ * @param reqString 璇锋眰鎶ユ枃
+ * @return
+ * @serviceCode /meterWater/importMeterWater
+ * @path /app/meterWater/importMeterWater
+ */
+ @RequestMapping(value = "/importMeterWater", method = RequestMethod.POST)
+ 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", "璇锋眰淇℃伅涓湭鍖呭惈璐圭敤绫诲瀷");
+ Assert.hasKeyAndValue(reqJson, "batchId", "璇锋眰淇℃伅涓湭鍖呭惈鎵规鍙�");
+ Assert.hasKeyAndValue(reqJson, "meterType", "璇锋眰淇℃伅涓湭鍖呭惈鎶勮〃绫诲瀷");
+ return queryPreMeterWaterImpl.importMeterWater(reqJson);
+ }
+
+
}
--
Gitblit v1.8.0