jialh
1 天以前 dd6687b118561100e1677e88a9c2f5842a54c531
service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java
@@ -121,11 +121,11 @@
                OwnerCarDto ownerCarDto = null;
                doImportData(assetImportLogDetailDto,ownerCarDto);
                updateImportLogDetailState(assetImportLogDetailDto.getDetailId());
                try {
                    Thread.sleep(1000);
                } catch (InterruptedException e) {
                    throw new RuntimeException(e);
                }
//                try {
//                    Thread.sleep(500);
//                } catch (InterruptedException e) {
//                    throw new RuntimeException(e);
//                }
            } catch (Exception e) {
                e.printStackTrace();
@@ -158,7 +158,7 @@
        String otherItem = data.getString("otherItem");
        data.put("otherItem", null);
        ownerCarDto = BeanConvertUtil.covertBean(data, OwnerCarDto.class);
        if (ownerCarDto.getOwnerName() == null || "".equals(ownerCarDto.getOwnerName())) {
        {
            RoomDto roomDto = new RoomDto();
            roomDto.setRoadName(ownerCarDto.getRoadName());
            roomDto.setFloorNum(ownerCarDto.getFloorNum());
@@ -194,18 +194,6 @@
                        ownerCarDto.setOwnerName(ownerDtos.get(0).getName());
                    }
                }
            }
        } else {
            OwnerDto ownerDto = new OwnerDto();
            ownerDto.setName(ownerCarDto.getOwnerName());
            ownerDto.setCommunityId(ownerCarDto.getCommunityId());
            List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
            if (ownerDtos.isEmpty()) {
                ownerCarDto.setRemark("未查询到业主:" + ownerCarDto.getOwnerName());
            } else if (ownerDtos.size() > 1) {
                ownerCarDto.setRemark("存在多个业主:" + ownerCarDto.getOwnerName());
            } else {
                ownerCarDto.setOwnerId(ownerDtos.get(0).getOwnerId());
            }
        }
        ownerCarDto.setOtherItem(o);
@@ -606,15 +594,30 @@
        ownerCarPo.setUnitNum(defaultValue(os[5]));
        ownerCarPo.setRoomNum(defaultValue(os[6]));
        ownerCarPo.setParkingLocation(defaultValue(os[12]));
        if (Vtil.isValidDbDate(ownerCarPo.getStartTime())) {
            ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n启用日期:" + ownerCarPo.getStartTime() + "格式错误");
            ownerCarPo.setStartTime(null);
        }
        if (Vtil.isValidDbDate(ownerCarPo.getEndTime())) {
        try {
            ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
        } catch (Exception e) {
            if (e.getMessage().contains("for column 'end_time' at row 1")){
            ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n注销日期:" + ownerCarPo.getEndTime() + "格式错误");
            ownerCarPo.setEndTime(null);
        }
                try {
        ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
                } catch (Exception e2) {
                    if (e2.getMessage().contains("for column 'start_time' at row 1")) {
                        ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n启用日期:" + ownerCarPo.getStartTime() + "格式错误");
                        ownerCarPo.setStartTime(null);
                        ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
                    }
                }
            }
            else if (e.getMessage().contains("for column 'start_time' at row 1")){
                ownerCarPo.setRemark(Vtil.defaultValue(ownerCarPo.getRemark(), "") + "\n启用日期:" + ownerCarPo.getStartTime() + "格式错误");
                ownerCarPo.setStartTime(null);
                ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
            }
        }
        ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
        parkingSpacePo.setPsId(psId); //车位id
        parkingSpacePo.setState(ownerCarDto.getSpaceSate());
@@ -634,6 +637,7 @@
            feeDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
            if (feeDtos.isEmpty()) {
                ownerCarPo.setRemark("单价`"+ownerCarPo.getUnitPricePerMonth()+"`未查询到收费项");
                return;
            } else if (feeDtos.size() > 1) {
                switch (Vtil.defaultValue(os[12])) {
                    case "地面停车": feeConfigDto.setFeeTypeCd("630000003");break;
@@ -645,6 +649,7 @@
            if (feeDtos.isEmpty()) {
                ownerCarPo.setRemark("单价`"+ownerCarPo.getUnitPricePerMonth()+"`未查询到收费项");
                return;
            }
            else if (feeDtos.size() > 1) {
                throw new IllegalArgumentException("系统错误,查询到的费用项超过一个");