解决代码冲突

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -10,7 +10,9 @@ import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
@@ -131,5 +133,32 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		return firefightersMapper.getFirefightersName();
 
 	}
+    /**
+     * 获取指定岗位名称下的队伍人员电话号码信息
+     * @param teamId
+     * @param jobTitleArray
+     * @return
+     */
+	public List<Map<String, Object>> getDetailByTeamIdAndJobTitle(Long teamId,List<String> jobTitleArray) {
+		LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
+		wrapper.in(Firefighters::getJobTitle, jobTitleArray);
+		wrapper.eq(Firefighters::getIsDelete, false);
+		wrapper.eq(Firefighters::getFireTeamId, teamId);
+		wrapper.select(Firefighters::getMobilePhone);
+		return	this.baseMapper.selectMaps(wrapper);
+	}
+	 /**
+     * 获取指定用户ID下的队伍人员电话号码信息
+     * @param teamId
+     * @param jobTitleArray
+     * @return
+     */
+	public List<Map<String, Object>> getDetailByIds(List<Long> ids) {
+		LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
+		wrapper.in(Firefighters::getSequenceNbr, ids);
+		wrapper.eq(Firefighters::getIsDelete, false);
+		wrapper.select(Firefighters::getMobilePhone);
+		return	this.baseMapper.selectMaps(wrapper);
+	}
 	
 }

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

@@ -10,13 +10,16 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyCarServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDetailParamDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferParamDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ResourceStatisticsDto;
@@ -54,7 +57,8 @@ import java.util.stream.Collectors;
  * @date 2021-06-17
  */
 @Service
-public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, PowerTransfer, PowerTransferMapper> implements IPowerTransferService {
+public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, PowerTransfer, PowerTransferMapper>
+		implements IPowerTransferService {
 
 	@Autowired
 	AlertCalledServiceImpl alertCalledService;
@@ -92,10 +96,15 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 	@Autowired
 	private DutyCarServiceImpl dutyCarService;
 
+	@Autowired
+	DynamicFormInstanceMapper dynamicFormInstanceMapper;
+
+	@Autowired
+	FireTeamServiceImpl iFireTeamService;
+
 	@Override
 	public PowerTransferSimpleDto getPowerTransferList(Long alertCalledId) {
-        List<PowerTransferCompanyResourcesDto> powerTransferList =
-                this.baseMapper.getPowerTransferList(alertCalledId);
+		List<PowerTransferCompanyResourcesDto> powerTransferList = this.baseMapper.getPowerTransferList(alertCalledId);
 		PowerTransferSimpleDto powerTransferSimpleDto = new PowerTransferSimpleDto();
 		int resourcesCount = powerTransferList.size();
 		powerTransferSimpleDto.setResourcesCount(resourcesCount);
@@ -126,8 +135,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 			Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
 
 			// 获取任务派发模板
-            Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
-                    alertCalled.getAlertType()).eq("format", false));
+			Template template = templateService
+					.getOne(new QueryWrapper<Template>().eq("type", alertCalled.getAlertType()).eq("format", false));
 			String content = template.getContent();
 			Map<String, String> definitions = new HashMap<>();
 			initDefinitions(definitions, alertCalled, powerTransferDto);
@@ -135,8 +144,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 			// 创建力量调派单位
 			createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content);
 
-            //发送调派通知
-            //通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
+			// 发送调派通知
+			// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
 			emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
 		} catch (MqttException e) {
 			throw new RuntimeException();
@@ -149,9 +158,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 	public List<FireBrigadeResourceDto> getPowerTree(String type) {
 		List<FireBrigadeResourceDto> fireBrigadeResourceList = Lists.newArrayList();
 
-        if(type!=null&&!"".equals(type)){
+		if (type != null && !"".equals(type)) {
 			// 3.消防队伍-监控大队
-            List<FireBrigadeResourceDto> monitorFireBrigadeList1 = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.医疗救援队.getCode());
+			List<FireBrigadeResourceDto> monitorFireBrigadeList1 = fireTeamService
+					.listMonitorFireBrigade(FireBrigadeTypeEnum.医疗救援队.getCode());
 			FireBrigadeResourceDto monitorResourceDto1 = new FireBrigadeResourceDto();
 			monitorResourceDto1.setId("-1");
 			monitorResourceDto1.setName(FireBrigadeTypeEnum.医疗救援队.getName());
@@ -185,29 +195,34 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 //            }
 //        }
 
-
-        //查询车辆当前任务状态
+		// 查询车辆当前任务状态
 		QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
-       // queryWrapper.notIn("car_status", FireCarStatusEnum.返队.getCode(),FireCarStatusEnum.加油.getCode(),FireCarStatusEnum.演练.getCode(),FireCarStatusEnum.训练.getCode(),FireCarStatusEnum.试车.getCode());
-        queryWrapper.eq("status",FireCarStatusEnum.执行中.getCode() );
+		// queryWrapper.notIn("car_status",
+		// FireCarStatusEnum.返队.getCode(),FireCarStatusEnum.加油.getCode(),FireCarStatusEnum.演练.getCode(),FireCarStatusEnum.训练.getCode(),FireCarStatusEnum.试车.getCode());
+		queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode());
 		List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesService.list(queryWrapper);
 
-        Map<String, String> appleMap = alertFormValue!=null&&alertFormValue.size()>0?alertFormValue.stream().collect(Collectors.toMap(PowerTransferCompanyResources::getResourcesId, PowerTransferCompanyResources::getCarStatus)):null;
+		Map<String, String> appleMap = alertFormValue != null && alertFormValue.size() > 0
+				? alertFormValue.stream().collect(Collectors.toMap(PowerTransferCompanyResources::getResourcesId,
+						PowerTransferCompanyResources::getCarStatus))
+				: null;
 		if (!ObjectUtils.isEmpty(result)) {
 			List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
 			if (!ValidationUtil.isEmpty(fireCarListMapList)) {
 				fireCarListMapList.stream().filter(car -> ObjectUtils.isNotEmpty(car.get("teamId"))).forEach(car -> {
 
-                    FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car, FireBrigadeResourceDto.class);
+					FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car,
+							FireBrigadeResourceDto.class);
 					// TODO 后期根据车物联状态来返回，现在为"(装备)在位=执勤","(装备)执勤=出动"
 					if (FireCarStatusEnum.执勤.getCode().equals(fireCarDto.getCarState())) {
 						fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
 					} else {
-                       if(appleMap!=null){
-                          String state= appleMap.containsKey(car.get("id"))?appleMap.get(car.get("id")):null;
+						if (appleMap != null) {
+							String state = appleMap.containsKey(car.get("id")) ? appleMap.get(car.get("id")) : null;
 							fireCarDto.setCarState(state);
-                           fireCarDto.setCarStateDesc(state!=null?FireCarStatusEnum.getEnum(state).getName():null);
-                       }else{
+							fireCarDto
+									.setCarStateDesc(state != null ? FireCarStatusEnum.getEnum(state).getName() : null);
+						} else {
 							fireCarDto.setCarState(null);
 							fireCarDto.setCarStateDesc(null);
 						}
@@ -217,19 +232,20 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 			}
 		}
 
-
 		// 2.查询消防队伍列表
-        List<FireTeam> fullTimeFireBrigadeList = fireTeamService.list(new QueryWrapper<FireTeam>().eq("type_code", FireBrigadeTypeEnum.专职消防队.getCode()).eq("is_delete", 0));
+		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));
+			Map<String, List<FireBrigadeResourceDto>> resultMap = fireCarDtoList.stream()
+					.collect(Collectors.groupingBy(FireBrigadeResourceDto::getTeamId));
 			if (!ValidationUtil.isEmpty(fullTimeFireBrigadeList)) {
 				fullTimeFireBrigadeList.forEach(brigade -> {
 					if (!CollectionUtils.isEmpty(resultMap.get(brigade.getSequenceNbr().toString()))) {
 						FireBrigadeResourceDto fireCarResourceDto = new FireBrigadeResourceDto();
-                        List<FireBrigadeResourceDto> fireBrigadeResourceDtoList =
-                                resultMap.get(brigade.getSequenceNbr().toString());
-                        long onDutyCarCount =
-                                fireBrigadeResourceDtoList.stream().filter(car -> FireCarStatusEnum.执勤.getCode().equals(car.getCarState())).count();
+						List<FireBrigadeResourceDto> fireBrigadeResourceDtoList = resultMap
+								.get(brigade.getSequenceNbr().toString());
+						long onDutyCarCount = fireBrigadeResourceDtoList.stream()
+								.filter(car -> FireCarStatusEnum.执勤.getCode().equals(car.getCarState())).count();
 						long outCarCount = fireBrigadeResourceDtoList.size() - onDutyCarCount;
 						fireCarResourceDto.setId(brigade.getSequenceNbr().toString());
 						fireCarResourceDto.setType(FireBrigadeTypeEnum.专职消防队.getKey());
@@ -244,9 +260,11 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		}
 
 		// 3.消防队伍-监控大队
-        List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.监控大队.getCode());
-       // List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade();
-        /*bug 2403 队伍未显示图片 2021-09-23 陈召开始 */
+		List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService
+				.listMonitorFireBrigade(FireBrigadeTypeEnum.监控大队.getCode());
+		// List<FireBrigadeResourceDto> monitorFireBrigadeList =
+		// fireTeamService.listMonitorFireBrigade();
+		/* bug 2403 队伍未显示图片 2021-09-23 陈召开始 */
 //        for (FireBrigadeResourceDto fireBrigadeResourceDto : monitorFireBrigadeList) {
 //            if (fireBrigadeResourceDto.getPic() != null) {
 //                String[] split = fireBrigadeResourceDto.getPic().split(",");
@@ -259,7 +277,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 //                }
 //            }
 //        }
-        /*bug 2403 队伍未显示图片 2021-09-23 陈召结束 */
+		/* bug 2403 队伍未显示图片 2021-09-23 陈召结束 */
 		FireBrigadeResourceDto monitorResourceDto = new FireBrigadeResourceDto();
 		monitorResourceDto.setId("0");
 		monitorResourceDto.setName(FireBrigadeTypeEnum.监控大队.getName());
@@ -270,45 +288,43 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 			fireBrigadeResourceList.add(monitorResourceDto);
 		}
 
-
-
-
 		return fireBrigadeResourceList;
 	}
 
-
-    private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
+	private List<PowerTransferCompanyResources> DtoEntityBatchConvert(
+			List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList,
+			Long powerTransferCompanySequenceNbr) {
 		ArrayList<PowerTransferCompanyResources> powerTransferCompanyResourcesList = new ArrayList<>();
 		PowerTransferCompanyResources powerTransferCompanyResources;
-       List idList=powerTransferCompanyResourcesDtoList.stream().map(PowerTransferCompanyResourcesDto::getResourcesId).collect(Collectors.toList());
+		List idList = powerTransferCompanyResourcesDtoList.stream()
+				.map(PowerTransferCompanyResourcesDto::getResourcesId).collect(Collectors.toList());
 		QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("status",FireCarStatusEnum.执行中.getCode() );
+		queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode());
 		queryWrapper.in("resources_id", idList);
 		List<PowerTransferCompanyResources> alertFormValue = powerTransferCompanyResourcesService.list(queryWrapper);
-        if(alertFormValue!=null&&alertFormValue.size()>0){
+		if (alertFormValue != null && alertFormValue.size() > 0) {
 			throw new RuntimeException("已选车辆有已调派车辆！");
-        }else{
+		} else {
 			for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto : powerTransferCompanyResourcesDtoList) {
 
 				powerTransferCompanyResources = new PowerTransferCompanyResources();
 				BeanUtils.copyProperties(powerTransferCompanyResourcesDto, powerTransferCompanyResources);
 				powerTransferCompanyResources.setPowerTransferCompanyId(powerTransferCompanySequenceNbr);
-                //资源状态
+				// 资源状态
 				powerTransferCompanyResources.setStatus(FireCarStatusEnum.执行中.getCode());
-                //资源状态
+				// 资源状态
 				powerTransferCompanyResources.setCarStatus(FireCarStatusEnum.出动.getCode());
 				powerTransferCompanyResourcesList.add(powerTransferCompanyResources);
 			}
 			return powerTransferCompanyResourcesList;
 		}
 
-
 	}
 
-    private void initDefinitions(Map<String, String> definitions,
-                                 AlertCalled alertCalled, PowerTransferDto powerTransferDto) {
-        List<AlertFormValue> alertFormValue = alertFormValueService.list(new QueryWrapper<AlertFormValue>().eq(
-                "alert_called_id", alertCalled.getSequenceNbr()));
+	private void initDefinitions(Map<String, String> definitions, AlertCalled alertCalled,
+			PowerTransferDto powerTransferDto) {
+		List<AlertFormValue> alertFormValue = alertFormValueService
+				.list(new QueryWrapper<AlertFormValue>().eq("alert_called_id", alertCalled.getSequenceNbr()));
 		definitions.put("rescueGrid", alertCalled.getRescueGrid());
 		definitions.put("alertType", alertCalled.getAlertType());
 		definitions.put("address", alertCalled.getAddress());
@@ -339,8 +355,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 			powerTransferCompany = new PowerTransferCompany();
 			BeanUtils.copyProperties(powerTransferCompanyDto, powerTransferCompany);
 			powerTransferCompany.setPowerTransferId(powerTransferSequenceNbr);
-            List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList =
-                    powerTransferCompanyDto.getPowerTransferCompanyResourcesDtoList();
+			List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList = powerTransferCompanyDto
+					.getPowerTransferCompanyResourcesDtoList();
 			if (powerTransferCompanyResourcesDtoList.size() == 0) {
 				powerTransferCompany.setIsDistributionAgencies(true);
 				definitions.put("type", "");
@@ -350,8 +366,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 			} else {
 				powerTransferCompany.setIsDistributionAgencies(false);
 				StringBuilder taskInformation = new StringBuilder();
-                for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto :
-                        powerTransferCompanyResourcesDtoList) {
+				for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto : powerTransferCompanyResourcesDtoList) {
 					definitions.put("type", powerTransferCompanyResourcesDto.getType());
 					definitions.put("resourcesNum", powerTransferCompanyResourcesDto.getResourcesNum());
 					String information = getTaskInformation(content, definitions);
@@ -365,8 +380,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 				powerTransferCompany.setTaskInformation(taskInformation.toString());
 				powerTransferCompanyService.save(powerTransferCompany);
 				Long powerTransferCompanySequenceNbr = powerTransferCompany.getSequenceNbr();
-                List<PowerTransferCompanyResources> powerTransferCompanyResourcesList =
-                        DtoEntityBatchConvert(powerTransferCompanyResourcesDtoList, powerTransferCompanySequenceNbr);
+				List<PowerTransferCompanyResources> powerTransferCompanyResourcesList = DtoEntityBatchConvert(
+						powerTransferCompanyResourcesDtoList, powerTransferCompanySequenceNbr);
 				powerTransferCompanyResourcesService.saveBatch(powerTransferCompanyResourcesList);
 
 				// 更新车辆状态
@@ -387,15 +402,15 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 	public Map<String, Object> getPowerTransferList(String beginDate, String endDate) {
 		// 获取力量调派信息
 		List<PowerTransferDto> powerTransferInfo = this.baseMapper.getPowerTransferInfo(beginDate, endDate);
-        List<PowerTransferCompanyDto> powerTransferCompanyInfo =
-                this.baseMapper.getPowerTransferCompanyInfo(beginDate, endDate);
-        List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesInfo =
-                this.baseMapper.getPowerTransferCompanyResourcesInfo(beginDate, endDate);
+		List<PowerTransferCompanyDto> powerTransferCompanyInfo = this.baseMapper.getPowerTransferCompanyInfo(beginDate,
+				endDate);
+		List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesInfo = this.baseMapper
+				.getPowerTransferCompanyResourcesInfo(beginDate, endDate);
 		Map<String, Object> transferInfo = this.baseMapper.getPowerTransferInfoCount(beginDate, endDate);
 
 		// 获取力量出动模板
-        Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code",
-                DutyInfoEnum.力量出动.getKey()).eq("format", false));
+		Template template = templateService
+				.getOne(new QueryWrapper<Template>().eq("type_code", DutyInfoEnum.力量出动.getKey()).eq("format", false));
 		String templateContent = template.getContent();
 		List<String> transferContent = new ArrayList<>();
 		powerTransferInfo.forEach(pt -> {
@@ -420,22 +435,22 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 				}
 			});
 			transferDetail.deleteCharAt(transferDetail.length() - 1);
-            if (transferDetail.toString().contains("、")){
-                String transfer = null ;
-                String taskStatus = null ;
+			if (transferDetail.toString().contains("、")) {
+				String transfer = null;
+				String taskStatus = null;
 				String[] split = transferDetail.toString().split("、");
-                if (split.length > 1 ){
+				if (split.length > 1) {
 					transfer = split[0];
 					taskStatus = split[1];
 				}
-                String transferDetails = templateContent.replace("departmentName-type-resourcesNum",
-                        transfer).replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace(
-                        "taskStatus",taskStatus!=null?FireCarStatusEnum.getEnum(taskStatus).getName():null);
+				String transferDetails = templateContent.replace("departmentName-type-resourcesNum", transfer)
+						.replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace("taskStatus",
+								taskStatus != null ? FireCarStatusEnum.getEnum(taskStatus).getName() : null);
 				transferContent.add(transferDetails);
-            }else {
-                String transferDetails = templateContent.replace("departmentName-type-resourcesNum",
-                        transferDetail.toString()).replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace(
-                        "taskStatus", "");
+			} else {
+				String transferDetails = templateContent
+						.replace("departmentName-type-resourcesNum", transferDetail.toString())
+						.replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace("taskStatus", "");
 				transferContent.add(transferDetails);
 			}
 		});
@@ -449,7 +464,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		List<PowerCompanyCountDto> list = powerTransferMapper.getPowerCompanyCountDtocount(id);
 		if (list != null && list.size() > 0) {
 			list.stream().forEach(powerCompanyCountDto -> {
-                List<PowerCarCountDto> li = powerTransferMapper.getPowerCarCountDtocount(id, powerCompanyCountDto.getCompanyId());
+				List<PowerCarCountDto> li = powerTransferMapper.getPowerCarCountDtocount(id,
+						powerCompanyCountDto.getCompanyId());
 				powerCompanyCountDto.setPowerCarCountDto(li);
 			});
 		}
@@ -457,7 +473,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 	}
 
 	@Override
-    public IPage<PowerTransferResourceDto> getPowerTransferPageByParam(Long alertCalledId, String type, Page<PowerTransferResourceDto> page) {
+	public IPage<PowerTransferResourceDto> getPowerTransferPageByParam(Long alertCalledId, String type,
+			Page<PowerTransferResourceDto> page) {
 		if (ValidationUtil.isEmpty(alertCalledId)) {
 			throw new BaseException("警情id为空", "", "警情id为空");
 		}
@@ -503,14 +520,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 			Long alertCalledId) {
 		Map<String, List<Map<String, Object>>> carInfoMap = getCarListMap();
 
-        IPage<PowerTransferResourceDto> carResourcePage = powerTransferMapper.getPowerTransferCarResource(page, alertCalledId);
+		IPage<PowerTransferResourceDto> carResourcePage = powerTransferMapper.getPowerTransferCarResource(page,
+				alertCalledId);
 		Map<String, List<Map<String, Object>>> finalCarInfoMap = carInfoMap;
 		carResourcePage.getRecords().forEach(car -> {
 			String seq = car.getSequenceNbr().toString();
 			car.setName((String) finalCarInfoMap.get(seq).get(0).get("name"));
 			String carStateCode = (String) finalCarInfoMap.get(seq).get(0).get("carState");
-            car.setCarState(!ValidationUtil.isEmpty(FireCarStatusEnum.getEnum(carStateCode)) ?
-                    FireCarStatusEnum.getEnum(carStateCode).getName() : "");
+			car.setCarState(!ValidationUtil.isEmpty(FireCarStatusEnum.getEnum(carStateCode))
+					? FireCarStatusEnum.getEnum(carStateCode).getName()
+					: "");
 			List<String> images = (List<String>) finalCarInfoMap.get(seq).get(0).get("image");
 			car.setImg(!ValidationUtil.isEmpty(images) ? images.get(0) : "");
 		});
@@ -523,8 +542,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		if (!ValidationUtil.isEmpty(result)) {
 			List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
 			if (!ValidationUtil.isEmpty(fireCarListMapList)) {
-                carInfoMap =
-                        fireCarListMapList.stream().collect(Collectors.groupingBy(car -> car.get("id").toString()));
+				carInfoMap = fireCarListMapList.stream()
+						.collect(Collectors.groupingBy(car -> car.get("id").toString()));
 			}
 		}
 		return carInfoMap;
@@ -544,18 +563,18 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		// 所有车辆
 		List<Map<String, Object>> carList = getCarList();
 
-        IPage<PowerTransferResourceDto> carResourcePage =
-                powerTransferMapper.getPowerTransferCarResource(new Page<>(1L, Long.MAX_VALUE),
-                        alertCalledId);
+		IPage<PowerTransferResourceDto> carResourcePage = powerTransferMapper
+				.getPowerTransferCarResource(new Page<>(1L, Long.MAX_VALUE), alertCalledId);
 		// 调派的车辆id列表
 		List<Long> carIdList = Lists.transform(carResourcePage.getRecords(), PowerTransferResourceDto::getSequenceNbr);
 		// 调派的车辆信息列表
-        List<Map<String, Object>> totalCarList =
-                carList.stream().filter(c -> carIdList.contains(Long.valueOf((String) c.get("id")))).collect(Collectors.toList());
+		List<Map<String, Object>> totalCarList = carList.stream()
+				.filter(c -> carIdList.contains(Long.valueOf((String) c.get("id")))).collect(Collectors.toList());
 		// TODO 车辆枚举后期修改为已到达状态车辆
-        List<Map<String, Object>> arrivedCarList =
-                carList.stream().filter(c -> carIdList.contains(Long.valueOf((String) c.get("id"))) && FireCarStatusEnum.出动.getCode().equals(c.get(
-                        "carState"))).collect(Collectors.toList());
+		List<Map<String, Object>> arrivedCarList = carList.stream()
+				.filter(c -> carIdList.contains(Long.valueOf((String) c.get("id")))
+						&& FireCarStatusEnum.出动.getCode().equals(c.get("carState")))
+				.collect(Collectors.toList());
 		// 调派-已到达车辆id列表
 		List<Long> arrivedCarIdList = Lists.newArrayList();
 		arrivedCarList.forEach(c -> {
@@ -584,7 +603,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		return resourceStatistics;
 	}
 
-    public void carCount(List<Map<String, Object>> arrivedCarList, JSONObject resourceStatistics, double carTotal, String jsoKey) {
+	public void carCount(List<Map<String, Object>> arrivedCarList, JSONObject resourceStatistics, double carTotal,
+			String jsoKey) {
 		JSONObject car = new JSONObject();
 		car.put("total", carTotal);
 		car.put("count", arrivedCarList.size());
@@ -597,15 +617,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		List<Map<String, Object>> allDutyPersonList = Lists.newArrayList();
 		if (!ValidationUtil.isEmpty(shiftIdList)) {
 			// 当前值班车辆-人
-            allDutyPersonList = dutyCarService.dayDutyPersonList(DateUtils.getDateNowShortStr(),
-                    shiftIdList.get(0), null);
+			allDutyPersonList = dutyCarService.dayDutyPersonList(DateUtils.getDateNowShortStr(), shiftIdList.get(0),
+					null);
 		}
 		// 当前车辆执勤人员
-        List<Map<String, Object>> allTransferDutyPerson =
-                allDutyPersonList.stream().filter(c -> carIdList.contains(Long.valueOf((String) c.get("carId")))).collect(Collectors.toList());
+		List<Map<String, Object>> allTransferDutyPerson = allDutyPersonList.stream()
+				.filter(c -> carIdList.contains(Long.valueOf((String) c.get("carId")))).collect(Collectors.toList());
 		// 当前已到达车辆执勤人员
-        List<Map<String, Object>> allArrivedTransferDutyPerson =
-                allDutyPersonList.stream().filter(c -> arrivedCarIdList.contains(Long.valueOf((String) c.get("carId")))).collect(Collectors.toList());
+		List<Map<String, Object>> allArrivedTransferDutyPerson = allDutyPersonList.stream()
+				.filter(c -> arrivedCarIdList.contains(Long.valueOf((String) c.get("carId"))))
+				.collect(Collectors.toList());
 		JSONObject person = new JSONObject();
 		person.put("total", allTransferDutyPerson.size());
 		person.put("count", allArrivedTransferDutyPerson.size());
@@ -614,18 +635,17 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
 	public void fireAgentOnCarCount(List<Map<String, Object>> totalCarList, List<Map<String, Object>> arrivedCarList,
 			JSONObject resourceStatistics, String equipType, String jsonKey) {
-        double agentCountAll = totalCarList.stream().mapToDouble(car -> car.get(
-                "resourceList")!=null?((List<Map<String, Object>>) car.get(
-                "resourceList")).stream().filter(res -> equipType.equals(res.get(
-                "equipType"))).mapToDouble(c -> (double) c.get("equipCount")).sum():0).sum();
-
-
-
-        double agentCountArrived = arrivedCarList.stream().mapToDouble(car ->car.get("resourceList")!=null? ((List<Map<String, Object>>) car.get(
-                "resourceList")).stream().filter(res -> equipType.equals(res.get(
-                "equipType"))).mapToDouble(c -> (double) c.get("equipCount")).sum():0).sum();
-
-
+		double agentCountAll = totalCarList.stream().mapToDouble(
+				car -> car.get("resourceList") != null ? ((List<Map<String, Object>>) car.get("resourceList")).stream()
+						.filter(res -> equipType.equals(res.get("equipType")))
+						.mapToDouble(c -> (double) c.get("equipCount")).sum() : 0)
+				.sum();
+
+		double agentCountArrived = arrivedCarList.stream().mapToDouble(
+				car -> car.get("resourceList") != null ? ((List<Map<String, Object>>) car.get("resourceList")).stream()
+						.filter(res -> equipType.equals(res.get("equipType")))
+						.mapToDouble(c -> (double) c.get("equipCount")).sum() : 0)
+				.sum();
 
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.put("total", agentCountAll);
@@ -642,4 +662,94 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 	public List<Map<String, String>> getDispatchTaskStatusList() {
 		return AlertFeedbackStatusEnum.toList();
 	}
+
+	
+	public Object forceDispatchTaskDispatch(){
+		
+//		for (PowerTransferParamDto powerTransferParamDto : params) {
+//			if("car".equals(powerTransferParamDto.getType())) {
+//				forceDispatchTaskDispatchOnCar(powerTransferParamDto);
+//			}else if("monitor".equals(powerTransferParamDto.getType())) {
+//				forceDispatchTaskDispatchOnMonitor(powerTransferParamDto);
+//			}else if("fristAid".equals(powerTransferParamDto.getType())) {
+//				forceDispatchTaskDispatchOnFristAid(powerTransferParamDto);
+//			}
+//		}
+		return null;
+	}
+	
+	public Object forceDispatchTaskDispatchOnMonitor(PowerTransferParamDto params) {
+		return params;
+		
+	}
+	
+	public Object forceDispatchTaskDispatchOnFristAid(PowerTransferParamDto params) {
+		return params;
+		
+	}
+	
+	public Object forceDispatchTaskDispatchOnCar(PowerTransferParamDto params) {
+		//获取车辆的id
+		String[] isdStrings = params.getIdValue().split(",");
+		List<Long> idsList = new ArrayList<Long>();
+		for (String carId : isdStrings) {
+			ResponseModel<Map<String, Object>> carResponseModel = equipFeignClient.selectOneById(Long.parseLong(carId));
+			Map<String, Object> carResultMap = carResponseModel.getResult();
+			if (carResultMap == null || carResultMap.isEmpty() || !carResultMap.containsKey("teamId")) {
+				continue;
+			}
+			String teamId = carResultMap.get("teamId").toString();
+			
+			List<PowerTransferDetailParamDto>  detailParamDtos=params.getDetail();
+			for (PowerTransferDetailParamDto dto : detailParamDtos) {
+				
+				if("DD".equals(dto.getType())) {
+					
+					
+					
+					
+				}
+				
+				
+				
+				
+				
+			}
+			
+			// 首先判斷当前的队伍是支队还是大队
+						FireTeam fireTeam = iFireTeamService.getById(Long.parseLong(teamId));
+						Long parentTeamId = fireTeam.getParent();
+						if (parentTeamId !=null) {//父级节点的team存在，说明当前team是大队，不是支队
+							//大队岗位
+						
+							//获取总队的人员信息
+							String parentTeamIdString = Long.toString(parentTeamId);
+							List<Map<String, Object>> parentUserIdsList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId("carId",
+									"teamId", "userId", DateUtils.getDateNowShortStr(), "dutyCar", carId, parentTeamIdString);
+							parentUserIdsList.stream().forEach(i->{
+								String userId =	i.get("userId").toString();
+								idsList.add(Long.parseLong(userId));
+								});	
+							//获取支队的人员信息
+							List<Map<String, Object>> userIdsList = dynamicFormInstanceMapper.getDutyPersonByTeamIdAndCarId("carId",
+									"teamId", "userId", DateUtils.getDateNowShortStr(), "dutyCar", carId, teamId);
+							
+							userIdsList.stream().forEach(i->{
+							String userId =	i.get("userId").toString();
+							idsList.add(Long.parseLong(userId));
+							});							
+							
+							
+						}else {
+							//支队岗位 
+							
+						}
+			
+			
+
+		}
+		return params;
+	}
+
+
 }