力量调派资源树接口修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -133,29 +133,46 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             });
         }
 
-        Long onDutyCarCount =
-                fireCarDtoList.stream().filter(car -> FireCarStatusEnum.onDuty.getCode().equals(car.getCarState())).count();
-        Long outCarCount = fireCarDtoList.size() - onDutyCarCount;
+//        Long onDutyCarCount =
+//                fireCarDtoList.stream().filter(car -> FireCarStatusEnum.onDuty.getCode().equals(car.getCarState())).count();
+//        Long outCarCount = fireCarDtoList.size() - onDutyCarCount;
         // 2.查询消防队伍列表
         List<FireTeam> fullTimeFireBrigadeList = fireTeamService.list(new QueryWrapper<FireTeam>().eq("type_code",
                 FireBrigadeTypeEnum.专职消防队.getCode()).eq("is_delete", 0));
         if (!CollectionUtils.isEmpty(fullTimeFireBrigadeList)) {
             Map<String, List<FireBrigadeResourceDto>> resultMap =
                     fireCarDtoList.stream().collect(Collectors.groupingBy(FireBrigadeResourceDto::getTeamId));
-            resultMap.keySet().forEach(brigadeId -> {
+            fullTimeFireBrigadeList.forEach(brigade -> {
+                if (!CollectionUtils.isEmpty(resultMap.get(brigade.getSequenceNbr().toString()))) {
                     FireBrigadeResourceDto fireCarResourceDto = new FireBrigadeResourceDto();
-                FireTeam fireTeam =
-                        fullTimeFireBrigadeList.stream().filter(team -> brigadeId.equals(team.getSequenceNbr().toString())).findAny().orElse(new FireTeam());
-                if (ObjectUtils.isNotEmpty(fireTeam.getSequenceNbr())) {
-                    fireCarResourceDto.setId(fireTeam.getSequenceNbr().toString());
+                    List<FireBrigadeResourceDto> fireBrigadeResourceDtoList =
+                            resultMap.get(brigade.getSequenceNbr().toString());
+                    long onDutyCarCount = fireBrigadeResourceDtoList.stream().filter(car -> FireCarStatusEnum.onDuty.getCode().equals(car.getCarState())).count();
+                    long outCarCount = fireBrigadeResourceDtoList.size() - onDutyCarCount;
+                    fireCarResourceDto.setId(brigade.getSequenceNbr().toString());
                     fireCarResourceDto.setType(FireBrigadeTypeEnum.专职消防队.getKey());
-                    fireCarResourceDto.setName(fireTeam.getName());
-                    fireCarResourceDto.getChildren().addAll(resultMap.get(brigadeId));
-                    fireCarResourceDto.setOutCount(outCarCount.intValue());
-                    fireCarResourceDto.setOnDutyCount(onDutyCarCount.intValue());
+                    fireCarResourceDto.setName(brigade.getName());
+                    fireCarResourceDto.getChildren().addAll(fireBrigadeResourceDtoList);
+                    fireCarResourceDto.setOutCount((int) outCarCount);
+                    fireCarResourceDto.setOnDutyCount((int) onDutyCarCount);
                     fireBrigadeResourceList.add(fireCarResourceDto);
                 }
             });
+
+//            resultMap.keySet().forEach(brigadeId -> {
+//                FireBrigadeResourceDto fireCarResourceDto = new FireBrigadeResourceDto();
+//                FireTeam fireTeam =
+//                        fullTimeFireBrigadeList.stream().filter(team -> brigadeId.equals(team.getSequenceNbr().toString())).findAny().orElse(new FireTeam());
+//                if (ObjectUtils.isNotEmpty(fireTeam.getSequenceNbr())) {
+//                    fireCarResourceDto.setId(fireTeam.getSequenceNbr().toString());
+//                    fireCarResourceDto.setType(FireBrigadeTypeEnum.专职消防队.getKey());
+//                    fireCarResourceDto.setName(fireTeam.getName());
+//                    fireCarResourceDto.getChildren().addAll(resultMap.get(brigadeId));
+//                    fireCarResourceDto.setOutCount(outCarCount.intValue());
+//                    fireCarResourceDto.setOnDutyCount(onDutyCarCount.intValue());
+//                    fireBrigadeResourceList.add(fireCarResourceDto);
+//                }
+//            });
         }
 
         // 3.消防队伍-监控大队