优化diamante

Your Name

2023-08-26 7958f1dddb8a7f4e70d232b07a7703955ecedae0

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

old mode 100644
new mode 100755
@@ -1,14 +1,15 @@
package com.java110.fee.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.importFee.ImportFeeDto;
import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
import com.java110.dto.importData.ImportFeeDto;
import com.java110.dto.importData.ImportFeeDetailDto;
import com.java110.fee.bmo.importFee.IFeeSharingBMO;
import com.java110.fee.bmo.importFee.IGetImportFeeBMO;
import com.java110.fee.bmo.importFeeDetail.IDeleteImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.IGetImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.ISaveImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.IUpdateImportFeeDetailBMO;
import com.java110.po.importFeeDetail.ImportFeeDetailPo;
import com.java110.po.importFee.ImportFeeDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,9 @@

    @Autowired
    private IGetImportFeeBMO getImportFeeBMOImpl;

    @Autowired
    private IFeeSharingBMO feeSharingBMOImpl;

    /**
     * 微信保存消息模板
@@ -104,7 +108,8 @@
                                                       @RequestParam(value = "floorNum", required = false) String floorNum,
                                                       @RequestParam(value = "unitNum", required = false) String unitNum,
                                                       @RequestParam(value = "roomNum", required = false) String roomNum,
                                                       @RequestParam(value = "importFeeId") String importFeeId) {
                                                       @RequestParam(value = "feeId", required = false) String feeId,
                                                       @RequestParam(value = "importFeeId", required = false) String importFeeId) {
        ImportFeeDetailDto importFeeDetailDto = new ImportFeeDetailDto();
        importFeeDetailDto.setPage(page);
        importFeeDetailDto.setRow(row);
@@ -113,6 +118,7 @@
        importFeeDetailDto.setFloorNum(floorNum);
        importFeeDetailDto.setUnitNum(unitNum);
        importFeeDetailDto.setRoomNum(roomNum);
        importFeeDetailDto.setFeeId(feeId);
        return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
    }

@@ -128,11 +134,45 @@
    @RequestMapping(value = "/queryImportFee", method = RequestMethod.GET)
    public ResponseEntity<String> queryImportFee(@RequestParam(value = "communityId") String communityId,
                                                 @RequestParam(value = "page") int page,
                                                 @RequestParam(value = "importFeeId", required = false) String importFeeId,
                                                 @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,

                                                 @RequestParam(value = "row") int row) {
        ImportFeeDto importFeeDto = new ImportFeeDto();
        importFeeDto.setPage(page);
        importFeeDto.setRow(row);
        importFeeDto.setImportFeeId(importFeeId);
        importFeeDto.setFeeTypeCd(feeTypeCd);
        importFeeDto.setCommunityId(communityId);
        return getImportFeeBMOImpl.get(importFeeDto);
    }

    /**
     * 费用公摊
     *
     * @param reqJson 公摊信息
     * @return
     * @serviceCode /importFee/feeSharing
     * @path /app/importFee/feeSharing
     */
    @RequestMapping(value = "/feeSharing", method = RequestMethod.POST)
    public ResponseEntity<String> feeSharing(@RequestBody String reqJson,
                                             @RequestHeader(value = "store-id") String storeId,
                                             @RequestHeader(value = "user-id") String userId) {
        JSONObject reqObj = JSONObject.parseObject(reqJson);
        Assert.hasKeyAndValue(reqObj, "communityId", "未包含小区ID");
        Assert.hasKeyAndValue(reqObj, "totalDegrees", "未包含使用量");
        Assert.hasKeyAndValue(reqObj, "scope", "未包含公摊范围");
        Assert.hasKeyAndValue(reqObj, "formulaId", "未包含公摊公式");
        Assert.hasKeyAndValue(reqObj, "feeName", "未包含费用名称");
        Assert.hasKeyAndValue(reqObj, "startTime", "未包含开始时间");
        Assert.hasKeyAndValue(reqObj, "endTime", "未包含结束时间");
        Assert.hasKeyAndValue(reqObj, "objId", "未包含公摊对象");
        Assert.hasKeyAndValue(reqObj, "feeTypeCd", "未包含费用类型");
        Assert.hasKeyAndValue(reqObj, "roomType", "未包含房屋类型");
        reqObj.put("storeId", storeId);
        reqObj.put("userId", userId);

        return feeSharingBMOImpl.share(reqObj);
    }
}