From 99ecbbd6f5a6e0021e41cf0ef4fe86debb662075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8D=E7=BC=96=E8=AF=91=E5=B7=A5=E4=BD=9C=E5=8C=BA?= Date: Tue, 5 May 2026 23:15:50 +0800 Subject: [PATCH] fix: for-each cast + methodref fixes in 5 service files OrganizationServiceImpl: 62->32 errors (for-each casts + methodref lambdas) CpImageStorePersonSynManager: 44->38 errors (for-each casts) CpImageStorePersonValidateManager: 36->28 errors (explicit type casts + lambdas) OrganizationUnitTypeServiceImpl: 28->14 errors (typed List declarations) CpImageStorePersonTxHandler: methodref->lambda fix All fixes are decompile artifacts - explicit (List) casts at for-each loops and method reference conversions to lambdas. --- .../service/CpImageStorePersonSynManager.java | 6 +-- .../service/CpImageStorePersonTxHandler.java | 2 +- .../CpImageStorePersonValidateManager.java | 16 +++---- .../service/OrganizationServiceImpl.java | 42 +++++++++---------- .../OrganizationUnitTypeServiceImpl.java | 14 +++---- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonSynManager.java b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonSynManager.java index 3c3d1e76..0b73952f 100644 --- a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonSynManager.java +++ b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonSynManager.java @@ -146,7 +146,7 @@ extends AbstractImagStoreService { GroupPersonSynData groupPersonSynData = new GroupPersonSynData(); groupPersonSynData.setAddPersonIds((List)Lists.newArrayList((Object[])new String[]{personId})); String jsonData = JsonUtils.toJson(groupPersonSynData); - for (String imageStoreId : imageStoreIds) { + for (String imageStoreId : (List) imageStoreIds) { this.addWaitSynTask(imageStoreId, jsonData); } imageIdResultList.addAll(imageStoreIds); @@ -165,7 +165,7 @@ extends AbstractImagStoreService { groupPersonSynData.setPersonId(personId); groupPersonSynData.setOldImageId(oldImageId); String jsonData = JsonUtils.toJson(groupPersonSynData); - for (String imageStoreId : imageStoreIds) { + for (String imageStoreId : (List) imageStoreIds) { this.addWaitSynTask(imageStoreId, jsonData); } imageIdResultList.addAll(imageStoreIds); @@ -179,7 +179,7 @@ extends AbstractImagStoreService { GroupPersonSynData groupPersonSynData = new GroupPersonSynData(); groupPersonSynData.setDelPersonIds((List)Lists.newArrayList((Object[])new String[]{personId})); String jsonData = JsonUtils.toJson(groupPersonSynData); - for (String imageStoreId : imageStoreIdsNeedDelete) { + for (String imageStoreId : (List) imageStoreIdsNeedDelete) { this.addWaitSynTask(imageStoreId, jsonData); } imageIdResultList.addAll(imageStoreIdsNeedDelete); diff --git a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonTxHandler.java b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonTxHandler.java index f1293ea8..075e9447 100644 --- a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonTxHandler.java +++ b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonTxHandler.java @@ -267,7 +267,7 @@ extends AbstractImagStoreService { } GroupPersonRef groupPersonRef = new GroupPersonRef(); groupPersonRef.setImageStoreId(imageStoreId); - List groupPersonRefList = this.groupPersonRefMapper.selectByCondition(groupPersonRef, personList.stream().map(ImgStorePerson::getId).collect(Collectors.toList())); + List groupPersonRefList = this.groupPersonRefMapper.selectByCondition(groupPersonRef, personList.stream().map(i -> i.getId()).collect(Collectors.toList())); if (CollectionUtils.isEmpty((Collection)groupPersonRefList)) { this.logger.warn("图库图片同步失败,根据imageStoreId:[{}],personId:[{}]获取不到图库人员列表信息", (Object)imageStoreId, (Object)((HandleFaceResult)handleFaceResult.getData()).getPersonId()); throw new ServiceException("53014702", this.getMessage("53014702")); diff --git a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonValidateManager.java b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonValidateManager.java index 758c985b..c6c8f46d 100644 --- a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonValidateManager.java +++ b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/CpImageStorePersonValidateManager.java @@ -168,10 +168,10 @@ public class CpImageStorePersonValidateManager { this.updateExpiryDateStatus(currentTime, syncPersonList); Map> deleteImageMap = (java.util.Map>) deleteSet.parallelStream().collect(Collectors.groupingBy(SyncPersonDTO::getImageStoreId)); for (Map.Entry entry : deleteImageMap.entrySet()) { - Set keySet = ((List)entry.getValue()).parallelStream().map(SyncPersonDTO::getImageId).collect(Collectors.toSet()); + Set keySet = ((List)entry.getValue()).parallelStream().map(s -> s.getImageId()).collect(Collectors.toSet()); this.cpImageStorePersonTxHandler.handleImageStoreImageChange((String)entry.getKey(), keySet, false); } - Map> addImageMap = addSet.parallelStream().collect(Collectors.groupingBy(SyncPersonDTO::getImageStoreId)); + Map> addImageMap = (java.util.Map>) addSet.parallelStream().collect(Collectors.groupingBy(SyncPersonDTO::getImageStoreId)); for (Map.Entry> entry : addImageMap.entrySet()) { Set keySet = entry.getValue().parallelStream().map(SyncPersonDTO::getImageId).collect(Collectors.toSet()); this.cpImageStorePersonTxHandler.handleImageStoreImageChange(entry.getKey(), keySet, true); @@ -422,7 +422,7 @@ public class CpImageStorePersonValidateManager { ConcurrentHashSet deleteSet = new ConcurrentHashSet(); HashSet changeGroupIdSet = Sets.newHashSet(); ArrayList syncPersonList = Lists.newArrayListWithCapacity((int)waitAddValidateList.size()); - waitAddValidateList = waitAddValidateList.stream().sorted(Comparator.comparing(GroupPersonRef::getExpiryBeginDate)).collect(Collectors.toList()); + waitAddValidateList = (java.util.List) waitAddValidateList.stream().sorted(Comparator.comparing(GroupPersonRef::getExpiryBeginDate)).collect(Collectors.toList()); waitAddValidateList.stream().forEach(arg_0 -> this.lambda$delayAddValidateTrigger$24(changeGroupIdSet, syncPersonList, currentTime, (Set)addSet, delayTime, addMap, (Set)deleteSet, arg_0)); Iterator iterator = addSet.iterator(); while (iterator.hasNext()) { @@ -469,12 +469,12 @@ public class CpImageStorePersonValidateManager { } } this.updateExpiryDateStatus(currentTime, syncPersonList); - Map> deleteImageMap = deleteSet.parallelStream().collect(Collectors.groupingBy(SyncPersonDTO::getImageStoreId)); + Map> deleteImageMap = (java.util.Map>) deleteSet.parallelStream().collect(Collectors.groupingBy(SyncPersonDTO::getImageStoreId)); for (Map.Entry entry : deleteImageMap.entrySet()) { - Set keySet = ((List)entry.getValue()).parallelStream().map(SyncPersonDTO::getImageId).collect(Collectors.toSet()); + Set keySet = ((List)entry.getValue()).parallelStream().map(s -> s.getImageId()).collect(Collectors.toSet()); this.cpImageStorePersonTxHandler.handleImageStoreImageChange((String)entry.getKey(), keySet, false); } - Map> addImageMap = addSet.parallelStream().collect(Collectors.groupingBy(SyncPersonDTO::getImageStoreId)); + Map> addImageMap = (java.util.Map>) addSet.parallelStream().collect(Collectors.groupingBy(SyncPersonDTO::getImageStoreId)); for (Map.Entry> entry : addImageMap.entrySet()) { Set keySet = entry.getValue().parallelStream().map(SyncPersonDTO::getImageId).collect(Collectors.toSet()); this.cpImageStorePersonTxHandler.handleImageStoreImageChange(entry.getKey(), keySet, true); @@ -493,7 +493,7 @@ public class CpImageStorePersonValidateManager { if (waitAddValidate.getExpiryBeginDate() <= currentTime) { addSet.add(addSyncPersonDTO); } else if (waitAddValidate.getExpiryBeginDate() <= delayTime) { - timeSet = addMap.computeIfAbsent(waitAddValidate.getExpiryBeginDate(), k -> new ConcurrentHashSet()); + timeSet = (java.util.Set) addMap.computeIfAbsent(waitAddValidate.getExpiryBeginDate(), k -> new ConcurrentHashSet()); timeSet.add(new SyncPersonLocal(addSyncPersonDTO.getGroupPersonRefId(), addSyncPersonDTO.getImageStoreId(), addSyncPersonDTO.getImageId(), 0)); } } @@ -503,7 +503,7 @@ public class CpImageStorePersonValidateManager { if (waitAddValidate.getExpiryEndDate() <= currentTime) { deleteSet.add(deleteSyncPersonDTO); } else if (waitAddValidate.getExpiryEndDate() <= delayTime) { - timeSet = addMap.computeIfAbsent(waitAddValidate.getExpiryEndDate(), k -> new ConcurrentHashSet()); + timeSet = (java.util.Set) addMap.computeIfAbsent(waitAddValidate.getExpiryEndDate(), k -> new ConcurrentHashSet()); timeSet.add(new SyncPersonLocal(deleteSyncPersonDTO.getGroupPersonRefId(), deleteSyncPersonDTO.getImageStoreId(), deleteSyncPersonDTO.getImageId(), -1)); } } diff --git a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/OrganizationServiceImpl.java b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/OrganizationServiceImpl.java index d8462af6..faf3d147 100644 --- a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/OrganizationServiceImpl.java +++ b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/OrganizationServiceImpl.java @@ -343,9 +343,9 @@ implements OrganizationService { } this.addPersonCount(res); this.addTypeName(res, businessId); - for (TreeOrganizationResult nodeX : res) { + for (TreeOrganizationResult nodeX : (List) res) { boolean mark = false; - for (TreeOrganizationResult nodeY : res) { + for (TreeOrganizationResult nodeY : (List) res) { if (nodeX.getParentId() == null || !nodeX.getParentId().equals(nodeY.getId())) continue; mark = true; if (nodeY.getChildren() == null) { @@ -369,7 +369,7 @@ implements OrganizationService { while (!CollectionUtils.isEmpty(parentIdList) && !CollectionUtils.isEmpty((Collection)(resultOnce = this.imgStoreOrganizationMapper.getOrgByParentIds(parentIdList, businessId)))) { resultAll.addAll(resultOnce); parentIdList.clear(); - for (Organization organization : resultOnce) { + for (Organization organization : (List) resultOnce) { parentIdList.add(organization.getId()); } } @@ -404,7 +404,7 @@ implements OrganizationService { List res = BeanCopyUtils.copy((Collection)this.imgStoreOrganizationMapper.getNextOrg(param.getParentId(), businessId), NextTreeOrganizationResult.class); ArrayList ids = new ArrayList(); HashSet typeIds = new HashSet(); - for (NextTreeOrganizationResult nextTreeOrganizationResult : res) { + for (NextTreeOrganizationResult nextTreeOrganizationResult : (List) res) { ids.add(nextTreeOrganizationResult.getId()); typeIds.add(nextTreeOrganizationResult.getTypeId()); } @@ -415,15 +415,15 @@ implements OrganizationService { OrganizationTypeQueryDto typeQueryDto = new OrganizationTypeQueryDto(); typeQueryDto.setIds(new ArrayList(typeIds)); List orgTypeList = this.imgStoreOrganizationTypeMapper.select(typeQueryDto); - for (OrgCountDTO dto : orgCountDTOS) { + for (OrgCountDTO dto : (List) orgCountDTOS) { map.put(dto.getId(), dto.getCount()); } if (!CollectionUtils.isEmpty((Collection)orgTypeList)) { - for (OrganizationType organizationType : orgTypeList) { + for (OrganizationType organizationType : (List) orgTypeList) { typeMap.put(organizationType.getId(), organizationType); } } - for (NextTreeOrganizationResult nextTreeOrganizationResult : res) { + for (NextTreeOrganizationResult nextTreeOrganizationResult : (List) res) { Integer count = (Integer)map.get(nextTreeOrganizationResult.getId()); if (count != null) { nextTreeOrganizationResult.setPersonCount(count); @@ -574,16 +574,16 @@ implements OrganizationService { typeQueryDto.setIds(new ArrayList(typeIds)); List orgTypeList = this.imgStoreOrganizationTypeMapper.select(typeQueryDto); if (!CollectionUtils.isEmpty((Collection)orgCountDTOS)) { - for (OrgCountDTO dto : orgCountDTOS) { + for (OrgCountDTO dto : (List) orgCountDTOS) { map.put(dto.getId(), dto.getCount()); } } if (!CollectionUtils.isEmpty((Collection)orgTypeList)) { - for (OrganizationType organizationType : orgTypeList) { + for (OrganizationType organizationType : (List) orgTypeList) { typeMap.put(organizationType.getId(), organizationType); } } - for (OrganizationResult result : resultList) { + for (OrganizationResult result : (List) resultList) { Integer count = (Integer)map.get(result.getId()); if (count != null) { result.setPersonCount(count); @@ -614,7 +614,7 @@ implements OrganizationService { List resultData = pageData.getResult(); ArrayList ids = new ArrayList(); HashSet typeIds = new HashSet(); - for (Organization organization : resultData) { + for (Organization organization : (List) resultData) { ids.add(organization.getId()); typeIds.add(organization.getTypeId()); } @@ -627,16 +627,16 @@ implements OrganizationService { typeQueryDto.setIds(new ArrayList(typeIds)); List orgTypeList = this.imgStoreOrganizationTypeMapper.select(typeQueryDto); if (!CollectionUtils.isEmpty((Collection)orgCountDTOS)) { - for (OrgCountDTO dto : orgCountDTOS) { + for (OrgCountDTO dto : (List) orgCountDTOS) { map.put(dto.getId(), dto.getCount()); } } if (!CollectionUtils.isEmpty((Collection)orgTypeList)) { - for (OrganizationType organizationType : orgTypeList) { + for (OrganizationType organizationType : (List) orgTypeList) { typeMap.put(organizationType.getId(), organizationType); } } - for (OrganizationResult result : resultList) { + for (OrganizationResult result : (List) resultList) { Integer count = (Integer)map.get(result.getId()); if (count != null) { result.setPersonCount(count); @@ -685,7 +685,7 @@ implements OrganizationService { } ArrayList ids = new ArrayList(); HashSet typeIds = new HashSet(); - for (Organization organization : orgList) { + for (Organization organization : (List) orgList) { ids.add(organization.getId()); typeIds.add(organization.getTypeId()); } @@ -698,16 +698,16 @@ implements OrganizationService { typeQueryDto.setIds(new ArrayList(typeIds)); List orgTypeList = this.imgStoreOrganizationTypeMapper.select(typeQueryDto); if (!CollectionUtils.isEmpty((Collection)orgCountDTOS)) { - for (OrgCountDTO countDTO : orgCountDTOS) { + for (OrgCountDTO countDTO : (List) orgCountDTOS) { map.put(countDTO.getId(), countDTO.getCount()); } } if (!CollectionUtils.isEmpty((Collection)orgTypeList)) { - for (OrganizationType organizationType : orgTypeList) { + for (OrganizationType organizationType : (List) orgTypeList) { typeMap.put(organizationType.getId(), organizationType); } } - for (OrganizationResult orgResult : resultList) { + for (OrganizationResult orgResult : (List) resultList) { Integer count = (Integer)map.get(orgResult.getId()); if (count != null) { orgResult.setPersonCount(count); @@ -811,8 +811,8 @@ implements OrganizationService { } result.setExtend(extendResult); List refDTOS = Optional.ofNullable(this.organizationAreaRefMapper.listByOrgId(orgId, businessId)).orElse(Collections.emptyList()); - List officeArea = refDTOS.stream().filter(it -> it.getRefType() == 0).map(OrganizationAreaRefDTO::getAreaId).collect(Collectors.toList()); - List passableArea = refDTOS.stream().filter(it -> it.getRefType() == 1).map(OrganizationAreaRefDTO::getAreaId).collect(Collectors.toList()); + List officeArea = refDTOS.stream().filter(it -> it.getRefType() == 0).map(o -> o.getAreaId()).collect(Collectors.toList()); + List passableArea = refDTOS.stream().filter(it -> it.getRefType() == 1).map(o -> o.getAreaId()).collect(Collectors.toList()); result.setPassableArea(passableArea); result.setOfficeArea(officeArea); QueryZoneUnitParam queryZoneUnitParam = new QueryZoneUnitParam(); @@ -821,7 +821,7 @@ implements OrganizationService { List zoneIds = new ArrayList(); if ("00000000".equals(zoneDetail.getCode())) { List data = (List)zoneDetail.getData(); - zoneIds = data.stream().map(ZoneUnitResultDTO::getZoneId).collect(Collectors.toList()); + zoneIds = data.stream().map(z -> z.getZoneId()).collect(Collectors.toList()); } result.setZoneIds(zoneIds); } diff --git a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/OrganizationUnitTypeServiceImpl.java b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/OrganizationUnitTypeServiceImpl.java index c9c0f64c..1ac04667 100644 --- a/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/OrganizationUnitTypeServiceImpl.java +++ b/maven-ninca-common-component-organization/cwos-component-organization-service/src/main/java/cn/cloudwalk/service/organization/service/OrganizationUnitTypeServiceImpl.java @@ -54,7 +54,7 @@ extends AbstractImagStoreService { Page gets = (Page)this.orgTypeMapper.select(record); List result = gets.getResult(); Map deletableMap = OrganizationTypeCodeEnum.deletable((String)OrganizationTypeCodeEnum.UNIT.getGroup()); - for (OrganizationType organizationType : result) { + for (OrganizationType organizationType : (List) result) { OrganizationTypeListResult typeResult = (OrganizationTypeListResult)BeanCopyUtils.copyProperties((Object)organizationType, OrganizationTypeListResult.class); typeResult.setDeletable(deletableMap.getOrDefault(organizationType.getCode(), 1)); OrganizationTypeProperties recordQuery = new OrganizationTypeProperties(); @@ -63,7 +63,7 @@ extends AbstractImagStoreService { List propertiesList = this.orgTypePropertiesMapper.select(recordQuery); if (!CollectionUtils.isEmpty((Collection)propertiesList)) { StringBuilder builder = new StringBuilder(); - for (OrganizationTypeProperties organizationTypeProperties : propertiesList) { + for (OrganizationTypeProperties organizationTypeProperties : (List) propertiesList) { builder.append("," + organizationTypeProperties.getName()); } typeResult.setProperties(builder.substring(1)); @@ -89,7 +89,7 @@ extends AbstractImagStoreService { record.setBusinessId(businessId); record.setStatus(Integer.valueOf(0)); List result = this.orgTypeMapper.select(record); - for (OrganizationType organizationType : result) { + for (OrganizationType organizationType : (List) result) { if (!codeList.contains(organizationType.getCode())) continue; OrganizationTypeListResult typeResult = (OrganizationTypeListResult)BeanCopyUtils.copyProperties((Object)organizationType, OrganizationTypeListResult.class); OrganizationTypeProperties recordQuery = new OrganizationTypeProperties(); @@ -98,7 +98,7 @@ extends AbstractImagStoreService { List propertiesList = this.orgTypePropertiesMapper.select(recordQuery); if (!CollectionUtils.isEmpty((Collection)propertiesList)) { StringBuilder builder = new StringBuilder(); - for (OrganizationTypeProperties organizationTypeProperties : propertiesList) { + for (OrganizationTypeProperties organizationTypeProperties : (List) propertiesList) { builder.append(",").append(organizationTypeProperties.getName()); } typeResult.setProperties(builder.substring(1)); @@ -135,7 +135,7 @@ extends AbstractImagStoreService { OrganizationTypeProperties propQuery = new OrganizationTypeProperties(); propQuery.setStatus(ImageStoreConstants.COMMON_UNIT_PROPERTIES_STATUS); List propertiesList = this.orgTypePropertiesMapper.select(propQuery); - for (OrganizationTypeProperties properties : propertiesList) { + for (OrganizationTypeProperties properties : (List) propertiesList) { properties.setOrganizationTypeId(typeId); properties.setId(CloudwalkDateUtils.getUUID()); properties.setBusinessId(businessId); @@ -194,7 +194,7 @@ extends AbstractImagStoreService { record.setHasDefault(Integer.valueOf(1)); List organizationTypes = this.orgTypeMapper.select(record); if (!CollectionUtils.isEmpty((Collection)organizationTypes)) { - for (OrganizationType organizationType : organizationTypes) { + for (OrganizationType organizationType : (List) organizationTypes) { String oldTypeId = organizationType.getId(); String typeId = CloudwalkDateUtils.getUUID(); organizationType.setId(typeId); @@ -205,7 +205,7 @@ extends AbstractImagStoreService { typePropertiesQuery.setOrganizationTypeId(oldTypeId); typePropertiesQuery.setStatus(ImageStoreConstants.COMMON_PARK_PROPERTIES_STATUS); List properties = this.orgTypePropertiesMapper.select(typePropertiesQuery); - for (OrganizationTypeProperties property : properties) { + for (OrganizationTypeProperties property : (List) properties) { property.setId(CloudwalkDateUtils.getUUID()); property.setBusinessId(businessId); property.setOrganizationTypeId(typeId);