diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index 9a0b1ce..fd88c31 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -77,7 +77,7 @@ private String operatorRoleTip; @Autowired - public void setEquipmentInfoService(IEquipmentInfoService equipmentInfoService,ISubcontractorService subcontractorService){ + public void setEquipmentInfoService(IEquipmentInfoService equipmentInfoService, ISubcontractorService subcontractorService) { this.equipmentInfoService = equipmentInfoService; this.subcontractorService = subcontractorService; } @@ -111,7 +111,7 @@ eze = ze; } } - if(CollectionUtils.isEmpty(multipartFileList) || Objects.isNull(eze)){ + if (CollectionUtils.isEmpty(multipartFileList) || Objects.isNull(eze)) { //无证书或证书文件非pdf或无Excel throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES); } @@ -134,13 +134,13 @@ for (int i = 0; i < minioNameList.size(); i++) { minioMap.put(multipartFileList.get(i).getOriginalFilename(), minioNameList.get(i)); } - saveImport(certificateImportList,minioMap); + saveImport(certificateImportList, minioMap); } catch (ExcelDataConvertException ex) { log.error(ex.getMessage()); - throw new BusinessException(1500, String.format("第%d行，第%d列数据转换失败：日期格式不正确",ex.getRowIndex(),ex.getColumnIndex()+1)); + throw new BusinessException(1500, String.format("第%d行，第%d列数据转换失败：日期格式不正确", ex.getRowIndex(), ex.getColumnIndex() + 1)); - }finally { + } finally { in.close(); zin.closeEntry(); zin.close(); @@ -149,16 +149,16 @@ return ReturnUtil.success(); } - void validImport(List list){ - if(CollectionUtils.isEmpty(list)){ + void validImport(List list) { + if (CollectionUtils.isEmpty(list)) { throw new BusinessException(BusinessExceptionEnum.IMPORT_NO_DATA); } List subcontractorList = new ArrayList<>(); List subcontractorNos = list.stream().map(SubcontractCertificateImportDTO::getSubcontractorNo).filter(ObjectUtil::isNotEmpty).distinct().collect(Collectors.toList()); - if(CollUtil.isNotEmpty(subcontractorNos)){ + if (CollUtil.isNotEmpty(subcontractorNos)) { QueryWrapper subcontractorQueryWrapper = new QueryWrapper<>(); - subcontractorQueryWrapper.in("subcontractor_no",subcontractorNos); + subcontractorQueryWrapper.in("subcontractor_no", subcontractorNos); // subcontractorQueryWrapper.eq("approval_status", ApprovalStatusEnum.PASSED); subcontractorList = subcontractorService.list(subcontractorQueryWrapper); } @@ -166,10 +166,10 @@ List equipmentInfoList = new ArrayList<>(); List equipmentNos = list.stream().map(SubcontractCertificateImportDTO::getEquipmentNo).filter(ObjectUtil::isNotEmpty).distinct().collect(Collectors.toList()); - if(CollUtil.isNotEmpty(equipmentNos)){ + if (CollUtil.isNotEmpty(equipmentNos)) { QueryWrapper equipmentInfoQueryWrapper = new QueryWrapper<>(); - equipmentInfoQueryWrapper.in("equipment_no",equipmentNos); - equipmentInfoQueryWrapper.eq("is_del",0); + equipmentInfoQueryWrapper.in("equipment_no", equipmentNos); + equipmentInfoQueryWrapper.eq("is_del", 0); equipmentInfoList = equipmentInfoService.list(equipmentInfoQueryWrapper); } @@ -187,32 +187,32 @@ if (StrUtil.isBlank(importDTO.getSubcontractorNo())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位编号不能为空")); } - Optional subcontractorOpt = subcontractorList.stream().filter(s->s.getSubcontractorNo().equals(importDTO.getSubcontractorNo())).findFirst(); - if(subcontractorOpt.isPresent()){ + Optional subcontractorOpt = subcontractorList.stream().filter(s -> s.getSubcontractorNo().equals(importDTO.getSubcontractorNo())).findFirst(); + if (subcontractorOpt.isPresent()) { Subcontractor subcontractor = subcontractorOpt.get(); - if(!subcontractor.getCompanyName().equals(importDTO.getSubcontractorName())){ + if (!subcontractor.getCompanyName().equals(importDTO.getSubcontractorName())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位名称与名录不一致")); } importDTO.setSubcontractorId(subcontractor.getId()); - }else { + } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位不存在")); } // 受检设备 if (StrUtil.isBlank(importDTO.getEquipmentNo())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "受检设备编号不能为空")); } - Optional equipmentInfoOpt = equipmentInfoList.stream().filter(s->s.getEquipmentNo().equals(importDTO.getEquipmentNo())).findFirst(); - if(equipmentInfoOpt.isPresent()){ + Optional equipmentInfoOpt = equipmentInfoList.stream().filter(s -> s.getEquipmentNo().equals(importDTO.getEquipmentNo())).findFirst(); + if (equipmentInfoOpt.isPresent()) { EquipmentInfo equipmentInfo = equipmentInfoOpt.get(); - if(!equipmentInfo.getEquipmentName().equals(importDTO.getEquipmentName()) - ||!equipmentInfo.getModel().equals(importDTO.getEquipmentModel()) - ||!equipmentInfo.getManufactureNo().equals(importDTO.getEquipmentManufactureNo()) - ||(StrUtil.isNotEmpty(equipmentInfo.getHelpInstruction()) && !equipmentInfo.getHelpInstruction().equals(importDTO.getHelpInstruction()))){ + if (!equipmentInfo.getEquipmentName().equals(importDTO.getEquipmentName()) + || !equipmentInfo.getModel().equals(importDTO.getEquipmentModel()) + || !equipmentInfo.getManufactureNo().equals(importDTO.getEquipmentManufactureNo()) + || (StrUtil.isNotEmpty(equipmentInfo.getHelpInstruction()) && !equipmentInfo.getHelpInstruction().equals(importDTO.getHelpInstruction()))) { throw new BusinessException(1500, String.format(validMsg, i + 1, "受检设备信息与设备台账不一致")); } importDTO.setEquipmentId(equipmentInfo.getId()); - }else { + } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "受检设备编号不存在")); } // 检定校准日期 @@ -224,28 +224,28 @@ throw new BusinessException(1500, String.format(validMsg, i + 1, "证书有效期不能为空")); } // 计量标识 - if (StrUtil.isBlank(importDTO.getMeterIdentify())){ - throw new BusinessException(1500, String.format(validMsg, i + 1, "计量标识不能为空")); - } - Optional dictOpt = meterIdentityDicts.stream().filter(s->s.getCode().equals(importDTO.getMeterIdentify())).findFirst(); - if(!dictOpt.isPresent()){ - throw new BusinessException(1500, String.format(validMsg, i + 1, "计量标识不合法")); + if (StrUtil.isNotBlank(importDTO.getMeterIdentify())) { + Optional dictOpt = meterIdentityDicts.stream().filter(s -> s.getCode().equals(importDTO.getMeterIdentify())).findFirst(); + if (!dictOpt.isPresent()) { + throw new BusinessException(1500, String.format(validMsg, i + 1, "计量标识不合法")); + } } // 证书文件 - if(StrUtil.isBlank(importDTO.getCertificateReport())){ + if (StrUtil.isBlank(importDTO.getCertificateReport())) { throw new BusinessException(1500, String.format(validMsg, i + 1, "证书报告附件不能为空")); } + } } - void saveImport(List list,Map minioMap){ + void saveImport(List list, Map minioMap) { AuthUser user = permissionContext.getAuthService().getLoginUser(); List resultList = new ArrayList<>(); list.forEach(cert -> { List excelFileList = Arrays.asList(cert.getCertificateReport().split(";")); excelFileList.forEach(f -> { SubcontractCertificate certificate = new SubcontractCertificate(); - BeanUtil.copyProperties(cert,certificate); + BeanUtil.copyProperties(cert, certificate); certificate.setCertificateReport(minioMap.get(f)); certificate.setCreateUserId(user.getId()); certificate.setCreateUserName(user.getName()); @@ -261,11 +261,11 @@ Map> equipmentMaps = resultList.stream().collect(Collectors.groupingBy(SubcontractCertificate::getEquipmentId)); for (Long equipmentId : equipmentMaps.keySet()) { List subList = equipmentMaps.get(equipmentId); - if(subList.size() > 1){ + if (subList.size() > 1) { subList.sort(Comparator.comparing(SubcontractCertificate::getCertificateValid)); } - SubcontractCertificate latest = subList.get(subList.size()-1); - equipmentInfoService.updateCertificateInfo(equipmentId,latest.getSubcontractorName(),latest.getCheckDate(),latest.getCertificateValid(),latest.getMeterIdentify()); + SubcontractCertificate latest = subList.get(subList.size() - 1); + equipmentInfoService.updateCertificateInfo(equipmentId, latest.getSubcontractorName(), latest.getCheckDate(), latest.getCertificateValid(), latest.getMeterIdentify()); } } @@ -274,30 +274,30 @@ @Transactional public void saveOrUpdateInfo(SubcontractCertificate entity) { this.saveOrUpdate(entity); - equipmentInfoService.updateCertificateInfo(entity.getEquipmentId(),entity.getSubcontractorName(),entity.getCheckDate(),entity.getCertificateValid(),entity.getMeterIdentify()); + equipmentInfoService.updateCertificateInfo(entity.getEquipmentId(), entity.getSubcontractorName(), entity.getCheckDate(), entity.getCertificateValid(), entity.getMeterIdentify()); } @Override public void removeInfo(Long id) { SubcontractCertificate certificate = this.getById(id); this.removeById(id); - equipmentInfoService.removeCertificateInfo(certificate.getEquipmentId(),id); + equipmentInfoService.removeCertificateInfo(certificate.getEquipmentId(), id); } @Override public Page listScopePage(Page page, String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd, - String equipmentManufactureNo,String equipmentManufacturer, - String certificateValidStart,String certificateValidEnd, + String equipmentManufactureNo, String equipmentManufacturer, + String certificateValidStart, String certificateValidEnd, String checkDateStart, String checkDateEnd) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, createTimeStart, createTimeEnd, - equipmentManufactureNo,equipmentManufacturer, - certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); - List list = this.baseMapper.listScopePage(dataScope,page,queryWrapper); + equipmentManufactureNo, equipmentManufacturer, + certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); + List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); for (SubcontractCertificate certificate : list) { warp(certificate); } @@ -309,23 +309,23 @@ public List listScope(String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd, - String equipmentManufactureNo,String equipmentManufacturer, - String certificateValidStart,String certificateValidEnd, + String equipmentManufactureNo, String equipmentManufacturer, + String certificateValidStart, String certificateValidEnd, String checkDateStart, String checkDateEnd, List ids) { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper; - if(CollUtil.isNotEmpty(ids)){ + if (CollUtil.isNotEmpty(ids)) { queryWrapper = new QueryWrapper<>(); - queryWrapper.in("c.id",ids); - }else { + queryWrapper.in("c.id", ids); + } else { queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, createTimeStart, createTimeEnd, - equipmentManufactureNo,equipmentManufacturer, - certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); + equipmentManufactureNo, equipmentManufacturer, + certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); } - List list = this.baseMapper.listScope(dataScope,queryWrapper); + List list = this.baseMapper.listScope(dataScope, queryWrapper); for (SubcontractCertificate certificate : list) { warp(certificate); } @@ -353,46 +353,46 @@ private QueryWrapper commonQuery(String certificateNo, String certificateName, String equipmentNo, String equipmentName, String subcontractorName, String createTimeStart, String createTimeEnd, - String equipmentManufactureNo,String equipmentManufacturer, - String certificateValidStart,String certificateValidEnd, - String checkDateStart, String checkDateEnd){ + String equipmentManufactureNo, String equipmentManufacturer, + String certificateValidStart, String certificateValidEnd, + String checkDateStart, String checkDateEnd) { QueryWrapper queryWrapper = new QueryWrapper<>(); // 操作手仅能看到自己负责的 AuthUser authUser = permissionContext.getAuthService().getLoginUser(); if (authUser.getRoleTips().contains(operatorRoleTip)) { - queryWrapper.eq("c.create_user_id",authUser.getId()); + queryWrapper.eq("c.create_user_id", authUser.getId()); } - if(StrUtil.isNotEmpty(certificateNo)){ - queryWrapper.like("c.certificate_no",certificateNo); + if (StrUtil.isNotEmpty(certificateNo)) { + queryWrapper.like("c.certificate_no", certificateNo); } - if(StrUtil.isNotEmpty(certificateName)){ - queryWrapper.like("c.certificate_name",certificateName); + if (StrUtil.isNotEmpty(certificateName)) { + queryWrapper.like("c.certificate_name", certificateName); } - if(StrUtil.isNotEmpty(equipmentNo)){ - queryWrapper.like("e.equipment_no",equipmentNo); + if (StrUtil.isNotEmpty(equipmentNo)) { + queryWrapper.like("e.equipment_no", equipmentNo); } - if(StrUtil.isNotEmpty(equipmentName)){ - queryWrapper.like("e.equipment_name",equipmentName); + if (StrUtil.isNotEmpty(equipmentName)) { + queryWrapper.like("e.equipment_name", equipmentName); } - if(StrUtil.isNotEmpty(equipmentManufactureNo)){ - queryWrapper.like("e.manufacture_no",equipmentManufactureNo); + if (StrUtil.isNotEmpty(equipmentManufactureNo)) { + queryWrapper.like("e.manufacture_no", equipmentManufactureNo); } - if(StrUtil.isNotEmpty(equipmentManufacturer)){ - queryWrapper.like("e.manufacturer",equipmentManufacturer); + if (StrUtil.isNotEmpty(equipmentManufacturer)) { + queryWrapper.like("e.manufacturer", equipmentManufacturer); } - if(StrUtil.isNotEmpty(subcontractorName)){ - queryWrapper.like("s.company_name",subcontractorName); + if (StrUtil.isNotEmpty(subcontractorName)) { + queryWrapper.like("s.company_name", subcontractorName); } - if(StrUtil.isNotEmpty(createTimeStart)){ - queryWrapper.ge("c.create_time",createTimeStart); + if (StrUtil.isNotEmpty(createTimeStart)) { + queryWrapper.ge("c.create_time", createTimeStart); } - if(StrUtil.isNotEmpty(createTimeEnd)){ - queryWrapper.le("c.create_time",createTimeEnd); + if (StrUtil.isNotEmpty(createTimeEnd)) { + queryWrapper.le("c.create_time", createTimeEnd); } - queryWrapper.ge(StrUtil.isNotEmpty(certificateValidStart),"c.certificate_valid",certificateValidStart); - queryWrapper.le(StrUtil.isNotEmpty(certificateValidEnd),"c.certificate_valid",certificateValidEnd); - queryWrapper.ge(StrUtil.isNotEmpty(checkDateStart),"c.check_date",checkDateStart); - queryWrapper.le(StrUtil.isNotEmpty(checkDateEnd),"c.check_date",checkDateEnd); + queryWrapper.ge(StrUtil.isNotEmpty(certificateValidStart), "c.certificate_valid", certificateValidStart); + queryWrapper.le(StrUtil.isNotEmpty(certificateValidEnd), "c.certificate_valid", certificateValidEnd); + queryWrapper.ge(StrUtil.isNotEmpty(checkDateStart), "c.check_date", checkDateStart); + queryWrapper.le(StrUtil.isNotEmpty(checkDateEnd), "c.check_date", checkDateEnd); return queryWrapper; } }