优化添加设备 功能

wuxw

2022-07-19 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54

 service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java

old mode 100644
new mode 100755
@@ -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);
    }