chengf
2026-03-18 56931dc90c4e070d279a0cbf5822af010c481812
service-job/src/main/java/com/java110/job/importData/adapt/ImportElectricityFeeV2QueueDataAdapt.java
@@ -76,7 +76,7 @@
        addFee(po, data, assetImportLogDetailDto.getLogId(), assetImportLogDetailDto);
        int i = 1;
        try {
            Thread.sleep(100);
            Thread.sleep(300);
        } catch (InterruptedException e) {
            throw new RuntimeException(e);
        }
@@ -84,8 +84,8 @@
    private void addFee(MeterWaterPo po, JSONObject reqJson, String batchId, AssetImportLogDetailDto assetImportLogDetailDto) {
        PayFeePo payFeePo = BeanConvertUtil.covertBean(reqJson, PayFeePo.class);
        payFeePo.setAmount(po.getUnitPrice());
        if (payFeePo.getAmount().equals("")){
        payFeePo.setAmount(Vtil.defaultValueToNumber(po.getUnitPrice()));
        if (payFeePo.getAmount() == null){
            payFeePo.setAmount("-1");
        }
        payFeePo.setFeeTypeCd(po.getFeeTypeCd());
@@ -99,10 +99,10 @@
        if (po.getRemark3() != null){
            po.setRemark(Vtil.defaultValue(po.getRemark()) + po.getRemark3());
        }
        int i = meterWaterInnerServiceSMOImpl.queryMeterWatersCountByPo(po);
        if (i > 0) {
            throw new IllegalArgumentException("重复的电费导入");
        }
//        int i = meterWaterInnerServiceSMOImpl.queryMeterWatersCountByPo(po);
//        if (i > 0) {
//            throw new IllegalArgumentException("重复的电费导入");
//        }
        payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
        payFeePo.setBatchId(batchId);
        payFeePo.setbId("-1");
@@ -115,7 +115,7 @@
        po.setFeeId(payFeePo.getFeeId());
        meterWaterPos.add(po);
        meterWaterInnerServiceSMOImpl.saveMeterWaters(meterWaterPos);
        payFeePo.setTest("导入信息,暂不处理离散");
        int flag = payFeeV1InnerServiceSMOImpl.savePayFee(payFeePo);
        if (flag < 1) {
            throw new CmdException("保存数据失败");
@@ -144,8 +144,7 @@
        }
        OwnerDto ownerDto = new OwnerDto();
        ownerDto.setCommunityId(reqJson.getString("communityId"));
        ownerDto.setRoomId(reqJson.getString("objId"));
        ownerDto.setRoomId(po.getObjId());
        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);