chengf
2026-03-11 b88a288f4f787b509463678e3cd9ccfa3f37014b
service-job/src/main/java/com/java110/job/importData/adapt/ImportMeterWaterFeeV2QueueDataAdapt.java
@@ -73,9 +73,17 @@
    private void doImportData(AssetImportLogDetailDto assetImportLogDetailDto) {
        JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
        MeterWaterPo po = BeanConvertUtil.covertBean(data, MeterWaterPo.class);
        if (po.getCommunityId() == null) {
            throw new IllegalArgumentException("未查询到小区:" + po.getCommunityCode() + po.getCommunityName());
        }
        validateRoom(po, assetImportLogDetailDto);
        addFee(po, data, assetImportLogDetailDto.getLogId(), assetImportLogDetailDto);
        int i = 1;
        try {
            Thread.sleep(1000);
        } catch (InterruptedException e) {
            throw new RuntimeException(e);
        }
    }
    private void addFee(MeterWaterPo po, JSONObject reqJson, String batchId, AssetImportLogDetailDto assetImportLogDetailDto) {
@@ -93,10 +101,14 @@
        payFeePo.setEndTime(po.getPreReadingTime());
        payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
        payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
        payFeePo.setState(FeeDto.STATE_FINISH);
        payFeePo.setState(FeeDto.STATE_DOING);
        payFeePo.setIncomeObjId("102025062610470035");
        int i = meterWaterInnerServiceSMOImpl.queryMeterWatersCount(BeanConvertUtil.covertBean(BeanConvertUtil.beanCovertMap(po), MeterWaterDto.class));
        if (po.getRemark3() != null){
            po.setRemark(Vtil.defaultValue(po.getRemark()) + po.getRemark3());
        }
        int i = meterWaterInnerServiceSMOImpl.queryMeterWatersCountByPo(po);
        if (i > 0) {
            throw new IllegalArgumentException("重复的水费导入");
        }
@@ -147,7 +159,11 @@
            feeAttrPo = new FeeAttrPo();
            feeAttrPo.setCommunityId(reqJson.getString("communityId"));
            feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
            feeAttrPo.setValue(ownerDtos.get(0).getOwnerId());
            if (ownerDtos.size() > 1) {
                feeAttrPo.setValue("导入信息中不存在业主");
            }else {
                feeAttrPo.setValue(ownerDtos.get(0).getOwnerId());
            }
            feeAttrPo.setFeeId(payFeePo.getFeeId());
            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
            flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -158,7 +174,11 @@
            feeAttrPo = new FeeAttrPo();
            feeAttrPo.setCommunityId(reqJson.getString("communityId"));
            feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
            feeAttrPo.setValue(ownerDtos.get(0).getLink());
            if (ownerDtos.size() > 1) {
                feeAttrPo.setValue("导入信息中不存在业主");
            }else {
                feeAttrPo.setValue(ownerDtos.get(0).getLink());
            }
            feeAttrPo.setFeeId(payFeePo.getFeeId());
            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
            flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -169,7 +189,11 @@
            feeAttrPo = new FeeAttrPo();
            feeAttrPo.setCommunityId(reqJson.getString("communityId"));
            feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
            feeAttrPo.setValue(ownerDtos.get(0).getName());
            if (ownerDtos.size() > 1) {
                feeAttrPo.setValue("导入信息中不存在业主");
            }else {
                feeAttrPo.setValue(ownerDtos.get(0).getName());
            }
            feeAttrPo.setFeeId(payFeePo.getFeeId());
            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
            flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -181,9 +205,9 @@
    private void validateRoom(MeterWaterPo po, AssetImportLogDetailDto assetImportLogDetailDto) {
        RoomDto roomDto = new RoomDto();
        roomDto.setCommunityId(po.getCommunityId());
        roomDto.setRoadName(po.getRoadName());
        roomDto.setFloorNum(Vtil.defaultValueToNumber(po.getFloorNum()));
        roomDto.setCommunityId(po.getCommunityId());
        roomDto.setUnitNum(Vtil.defaultValueToNumber(po.getUnitNum()));
        roomDto.setRoomNum(Vtil.defaultValueToNumber(po.getRoomNum()));
        if (roomDto.getRoomNum().isEmpty()) {
@@ -191,7 +215,11 @@
        }
        List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
        if (roomDtos.isEmpty()) {
            throw new IllegalArgumentException("未查询到房屋:" + po.getObjName());
            po.setObjId("1");
            po.setRemark3("\n\n房屋:" +
                    roomDto.getCommunityId() + "-" + roomDto.getRoadName() + "-" + roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" +
                    roomDto.getRoomNum() + "不存在,该费用存入公司账户");
//            throw new IllegalArgumentException("未查询到房屋:" + po.getObjName());
//            ImportOwnerRoomDto importOwnerRoomDto = new ImportOwnerRoomDto();//房屋
//            importOwnerRoomDto.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
//            importOwnerRoomDto.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
@@ -227,7 +255,10 @@
//            }
//            po.setObjId(importOwnerRoomDto.getRoomId());
        } else if (roomDtos.size() > 1) {
            throw new IllegalArgumentException("存在重复的房屋:" + po.getObjName());
            po.setObjId("1");
            po.setRemark3("\n\n房屋:" +
                    roomDto.getCommunityId() + "-" + roomDto.getRoadName() + "-" + roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" +
                    roomDto.getRoomNum() + "存在重复的房屋,该费用存入公司账户");
        } else {
            po.setObjId(roomDtos.get(0).getRoomId());
        }