Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireBrigadeResourceDto.java

@@ -48,7 +48,7 @@ public class FireBrigadeResourceDto extends BaseDto {
     private int personCount;
 
     @ApiModelProperty(value = "车辆类型")
-    private String chassisBrand;
+    private String categoryName;
 
     @ApiModelProperty(value = "执勤车辆个数")
     private Integer onDutyCount;

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

@@ -123,6 +123,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
             fireCarListMapList.stream().filter(car -> ObjectUtils.isNotEmpty(car.get("teamId"))).forEach(car -> {
                 FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car, FireBrigadeResourceDto.class);
+                // TODO 后期根据车物联状态来返回，现在为"在位=执勤","其他=出动"
                 if (FireCarStatusEnum.onDuty.getCode().equals(fireCarDto.getCarState())) {
                     fireCarDto.setCarStateDesc(FireCarStatusEnum.onDuty.getName());
                 } else {
@@ -133,9 +134,6 @@ 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;
         // 2.查询消防队伍列表
         List<FireTeam> fullTimeFireBrigadeList = fireTeamService.list(new QueryWrapper<FireTeam>().eq("type_code",
                 FireBrigadeTypeEnum.专职消防队.getCode()).eq("is_delete", 0));
@@ -158,21 +156,6 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                     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.消防队伍-监控大队