优化代码

java110

2021-03-19 c121328501fe358d93dc404868d9638f48482388

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

@@ -2,7 +2,8 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.importFee.ImportFeeDto;
import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
import com.java110.dto.importFee.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;
@@ -33,13 +34,16 @@
    @Autowired
    private IGetImportFeeBMO getImportFeeBMOImpl;

    @Autowired
    private IFeeSharingBMO feeSharingBMOImpl;

    /**
     * 微信保存消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /importFeeDetail/saveImportFeeDetail
     * @path /app/importFeeDetail/saveImportFeeDetail
     * @serviceCode /importFee/saveImportFeeDetail
     * @path /app/importFee/saveImportFeeDetail
     */
    @RequestMapping(value = "/saveImportFeeDetail", method = RequestMethod.POST)
    public ResponseEntity<String> saveImportFeeDetail(@RequestBody JSONObject reqJson) {
@@ -56,8 +60,8 @@
     *
     * @param reqJson
     * @return
     * @serviceCode /importFeeDetail/updateImportFeeDetail
     * @path /app/importFeeDetail/updateImportFeeDetail
     * @serviceCode /importFee/updateImportFeeDetail
     * @path /app/importFee/updateImportFeeDetail
     */
    @RequestMapping(value = "/updateImportFeeDetail", method = RequestMethod.POST)
    public ResponseEntity<String> updateImportFeeDetail(@RequestBody JSONObject reqJson) {
@@ -75,8 +79,8 @@
     *
     * @param reqJson
     * @return
     * @serviceCode /importFeeDetail/deleteImportFeeDetail
     * @path /app/importFeeDetail/deleteImportFeeDetail
     * @serviceCode /importFee/deleteImportFeeDetail
     * @path /app/importFee/deleteImportFeeDetail
     */
    @RequestMapping(value = "/deleteImportFeeDetail", method = RequestMethod.POST)
    public ResponseEntity<String> deleteImportFeeDetail(@RequestBody JSONObject reqJson) {
@@ -94,17 +98,25 @@
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /importFeeDetail/queryImportFeeDetail
     * @path /app/importFeeDetail/queryImportFeeDetail
     * @serviceCode /importFee/queryImportFeeDetail
     * @path /app/importFee/queryImportFeeDetail
     */
    @RequestMapping(value = "/queryImportFeeDetail", method = RequestMethod.GET)
    public ResponseEntity<String> queryImportFeeDetail(@RequestParam(value = "communityId") String communityId,
                                                       @RequestParam(value = "page") int page,
                                                       @RequestParam(value = "row") int row) {
                                                       @RequestParam(value = "row") int row,
                                                       @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) {
        ImportFeeDetailDto importFeeDetailDto = new ImportFeeDetailDto();
        importFeeDetailDto.setPage(page);
        importFeeDetailDto.setRow(row);
        importFeeDetailDto.setCommunityId(communityId);
        importFeeDetailDto.setImportFeeId(importFeeId);
        importFeeDetailDto.setFloorNum(floorNum);
        importFeeDetailDto.setUnitNum(unitNum);
        importFeeDetailDto.setRoomNum(roomNum);
        return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
    }

@@ -114,17 +126,51 @@
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /importFeeDetail/queryImportFeeDetail
     * @serviceCode /importFee/queryImportFee
     * @path /app/importFee/queryImportFee
     */
    @RequestMapping(value = "/queryImportFee", method = RequestMethod.GET)
    public ResponseEntity<String> queryImportFee(@RequestParam(value = "communityId") String communityId,
                                                       @RequestParam(value = "page") int page,
                                                       @RequestParam(value = "row") int row) {
                                                 @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);
    }
}