From 2d079ac843ebcb335f2ef7d6952f9700a16fddde Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 05 五月 2021 14:11:00 +0800
Subject: [PATCH] 游湖阿底阿妈

---
 service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 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..c61c5fb
--- 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.alibaba.fastjson.JSONObject;
 import com.java110.dto.meterWater.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")
@@ -53,6 +52,26 @@
     @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", "璇锋眰淇℃伅涓湭鍖呭惈璐圭敤绫诲瀷");
+        return queryPreMeterWaterImpl.importMeterWater(reqJson);
+    }
+
+
 }

--
Gitblit v1.8.0