提交額外的判斷

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

@@ -69,121 +69,120 @@ import com.yeejoin.amos.component.rule.config.RuleConfig;
  * @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;
+	@Autowired
+	AlertCalledServiceImpl alertCalledService;
 
-    @Autowired
-    PowerTransferCompanyServiceImpl powerTransferCompanyService;
+	@Autowired
+	PowerTransferCompanyServiceImpl powerTransferCompanyService;
 
-    @Autowired
-    PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
+	@Autowired
+	PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
 
-    @Autowired
-    TemplateServiceImpl templateService;
+	@Autowired
+	TemplateServiceImpl templateService;
 
-    @Autowired
-    AlertFormValueServiceImpl alertFormValueService;
+	@Autowired
+	AlertFormValueServiceImpl alertFormValueService;
 
-    @Autowired
-    EquipFeignClient equipFeignService;
+	@Autowired
+	EquipFeignClient equipFeignService;
 
-    @Autowired
-    FireTeamServiceImpl fireTeamService;
+	@Autowired
+	FireTeamServiceImpl fireTeamService;
 
-    @Autowired
-    PowerTransferMapper powerTransferMapper;
+	@Autowired
+	PowerTransferMapper powerTransferMapper;
 
-    @Autowired
-    EquipFeignClient equipFeignClient;
+	@Autowired
+	EquipFeignClient equipFeignClient;
 
-    @Autowired
-    private EmqKeeper emqKeeper;
+	@Autowired
+	private EmqKeeper emqKeeper;
 
-    @Value("${mqtt.topic.command.power.deployment}")
-    private String topic;
+	@Value("${mqtt.topic.command.power.deployment}")
+	private String topic;
 
-    @Autowired
-    private DutyCarServiceImpl dutyCarService;
+	@Autowired
+	private DutyCarServiceImpl dutyCarService;
 
-    @Autowired
-    FireTeamServiceImpl iFireTeamService;
-    
-    @Autowired
-    DynamicFormInstanceMapper dynamicFormInstanceMapper;
-    
-    @Autowired
+	@Autowired
+	FireTeamServiceImpl iFireTeamService;
+
+	@Autowired
+	DynamicFormInstanceMapper dynamicFormInstanceMapper;
+
+	@Autowired
 	RuleAlertCalledService ruleAlertCalledService;
-    
-    @Override
-    public PowerTransferSimpleDto getPowerTransferList(Long alertCalledId) {
-        List<PowerTransferCompanyResourcesDto> powerTransferList =
-                this.baseMapper.getPowerTransferList(alertCalledId);
-        PowerTransferSimpleDto powerTransferSimpleDto = new PowerTransferSimpleDto();
-        int resourcesCount = powerTransferList.size();
-        powerTransferSimpleDto.setResourcesCount(resourcesCount);
-        powerTransferSimpleDto.setResourcesList(powerTransferList);
-        return powerTransferSimpleDto;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean createPowerTransfer(PowerTransferDto powerTransferDto) {
-        try {
-            // 获取调派ID
-            Long alertCalledId = powerTransferDto.getAlertCalledId();
-            int count = count(new QueryWrapper<PowerTransfer>().eq("alert_called_id", alertCalledId));
-            String dispatch_num = alertCalledId.toString() + (count + 1);
-
-            // 获取警情详情
-			AlertCalledObjsDto alertCalled = (AlertCalledObjsDto)alertCalledService.selectAlertCalledByIdNoRedisNew(alertCalledId);
-
-            // 创建力量调派
-            PowerTransfer powerTransfer = new PowerTransfer();
-            BeanUtils.copyProperties(powerTransferDto, powerTransfer);
-            BeanUtils.copyProperties(alertCalled.getAlertCalled(), powerTransfer);
-            powerTransfer.setDispatchNum(dispatch_num);
-            powerTransfer.setSequenceNbr(null);
-
-            save(powerTransfer);
-            Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
-
-            // 获取任务派发模板
-            Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code",
-                    "LLDP").eq("format", false));
-            String content = template.getContent();
-            Map<String, String> definitions = new HashMap<>();
-          //  initDefinitions(definitions, alertCalled, powerTransferDto);
-
-            // 创建力量调派单位
-           createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content, alertCalled);
-
-            //封装调派任务的集合，以便于实现任务规则校验
-            try {
-			  packagePowerTransferDetail(powerTransferDto);
+
+	@Override
+	public PowerTransferSimpleDto getPowerTransferList(Long alertCalledId) {
+		List<PowerTransferCompanyResourcesDto> powerTransferList = this.baseMapper.getPowerTransferList(alertCalledId);
+		PowerTransferSimpleDto powerTransferSimpleDto = new PowerTransferSimpleDto();
+		int resourcesCount = powerTransferList.size();
+		powerTransferSimpleDto.setResourcesCount(resourcesCount);
+		powerTransferSimpleDto.setResourcesList(powerTransferList);
+		return powerTransferSimpleDto;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean createPowerTransfer(PowerTransferDto powerTransferDto) {
+		try {
+			// 获取调派ID
+			Long alertCalledId = powerTransferDto.getAlertCalledId();
+			int count = count(new QueryWrapper<PowerTransfer>().eq("alert_called_id", alertCalledId));
+			String dispatch_num = alertCalledId.toString() + (count + 1);
+
+			// 获取警情详情
+			AlertCalledObjsDto alertCalled = (AlertCalledObjsDto) alertCalledService
+					.selectAlertCalledByIdNoRedisNew(alertCalledId);
+
+			// 创建力量调派
+			PowerTransfer powerTransfer = new PowerTransfer();
+			BeanUtils.copyProperties(powerTransferDto, powerTransfer);
+			BeanUtils.copyProperties(alertCalled.getAlertCalled(), powerTransfer);
+			powerTransfer.setDispatchNum(dispatch_num);
+			powerTransfer.setSequenceNbr(null);
+
+			save(powerTransfer);
+			Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
+
+			// 获取任务派发模板
+			Template template = templateService
+					.getOne(new QueryWrapper<Template>().eq("type_code", "LLDP").eq("format", false));
+			String content = template.getContent();
+			Map<String, String> definitions = new HashMap<>();
+			// initDefinitions(definitions, alertCalled, powerTransferDto);
+
+			// 创建力量调派单位
+			createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content, alertCalled);
+
+			// 封装调派任务的集合，以便于实现任务规则校验
+			try {
+				packagePowerTransferDetail(powerTransferDto);
 			} catch (Exception e) {
 				log.error("调用规则失败：PowerTransferServiceImpl。createPowerTransfer（）");
 			}
-            
-            
-            //发送调派通知
-            //通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
-            emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
-        } catch (MqttException e) {
-            throw new RuntimeException();
-        }
-
-        return true;
-    }
-    
-  
-    private void packagePowerTransferDetail(PowerTransferDto powerTransferDto) throws Exception {
-    	List<PowerTransferCompanyDto> powerTransferCompanyDtoList = powerTransferDto.getPowerTransferCompanyDotList();
+
+			// 发送调派通知
+			// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
+			emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
+		} catch (MqttException e) {
+			throw new RuntimeException();
+		}
+
+		return true;
+	}
+
+	private void packagePowerTransferDetail(PowerTransferDto powerTransferDto) throws Exception {
+		List<PowerTransferCompanyDto> powerTransferCompanyDtoList = powerTransferDto.getPowerTransferCompanyDotList();
 		Set<PowerTransferCompanyDto> fullTimeList = new HashSet<PowerTransferCompanyDto>();
 		Set<PowerTransferCompanyDto> medicalTeamList = new HashSet<PowerTransferCompanyDto>();
 		Set<PowerTransferCompanyDto> monitorTeamList = new HashSet<PowerTransferCompanyDto>();
-		
+
 		for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDtoList) {
 			if (FireBrigadeTypeEnum.专职消防队.getKey().equals(powerTransferCompanyDto.getPowerTransType())) {
 				fullTimeList.add(powerTransferCompanyDto);
@@ -193,31 +192,43 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 				monitorTeamList.add(powerTransferCompanyDto);
 			}
 		}
-			ruleAlertCalledService.powerTransferCalledRule(fullTimeList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.专职消防队.getKey());
-			ruleAlertCalledService.powerTransferCalledRule(medicalTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.医疗救援队.getKey());
-			ruleAlertCalledService.powerTransferCalledRule(monitorTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.监控大队.getKey());
+		if (fullTimeList != null) {
+			ruleAlertCalledService.powerTransferCalledRule(fullTimeList, powerTransferDto.getAlertCalledId(),
+					FireBrigadeTypeEnum.专职消防队.getKey());
+		}
+		if (medicalTeamList != null) {
+			ruleAlertCalledService.powerTransferCalledRule(medicalTeamList, powerTransferDto.getAlertCalledId(),
+					FireBrigadeTypeEnum.医疗救援队.getKey());
+
+		}
+		if (monitorTeamList != null) {
+			ruleAlertCalledService.powerTransferCalledRule(monitorTeamList, powerTransferDto.getAlertCalledId(),
+					FireBrigadeTypeEnum.监控大队.getKey());
+
+		}
 	}
 
 	@Override
-    public List<FireBrigadeResourceDto> getPowerTree(String type) {
-        List<FireBrigadeResourceDto> fireBrigadeResourceList = Lists.newArrayList();
-
-        if(type!=null&&!"".equals(type)&&"1214".equals(type)){
-            // 3.消防队伍-监控大队
-            List<FireBrigadeResourceDto> monitorFireBrigadeList1 = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.医疗救援队.getCode());
-            FireBrigadeResourceDto monitorResourceDto1 = new FireBrigadeResourceDto();
-            monitorResourceDto1.setId("-1");
-            monitorResourceDto1.setName(FireBrigadeTypeEnum.医疗救援队.getName());
-            monitorResourceDto1.setType(FireBrigadeTypeEnum.医疗救援队.getKey());
-            monitorResourceDto1.setChildren(monitorFireBrigadeList1);
-            if (!CollectionUtils.isEmpty(monitorFireBrigadeList1)) {
-                fireBrigadeResourceList.add(monitorResourceDto1);
-            }
-        }
-
-        // 1.调用装备服务接口查询车辆列表
-        List<FireBrigadeResourceDto> fireCarDtoList = Lists.newArrayList();
-        ResponseModel<Object> result = equipFeignService.getFireCarListAll();
+	public List<FireBrigadeResourceDto> getPowerTree(String type) {
+		List<FireBrigadeResourceDto> fireBrigadeResourceList = Lists.newArrayList();
+
+		if (type != null && !"".equals(type) && "1214".equals(type)) {
+			// 3.消防队伍-监控大队
+			List<FireBrigadeResourceDto> monitorFireBrigadeList1 = fireTeamService
+					.listMonitorFireBrigade(FireBrigadeTypeEnum.医疗救援队.getCode());
+			FireBrigadeResourceDto monitorResourceDto1 = new FireBrigadeResourceDto();
+			monitorResourceDto1.setId("-1");
+			monitorResourceDto1.setName(FireBrigadeTypeEnum.医疗救援队.getName());
+			monitorResourceDto1.setType(FireBrigadeTypeEnum.医疗救援队.getKey());
+			monitorResourceDto1.setChildren(monitorFireBrigadeList1);
+			if (!CollectionUtils.isEmpty(monitorFireBrigadeList1)) {
+				fireBrigadeResourceList.add(monitorResourceDto1);
+			}
+		}
+
+		// 1.调用装备服务接口查询车辆列表
+		List<FireBrigadeResourceDto> fireCarDtoList = Lists.newArrayList();
+		ResponseModel<Object> result = equipFeignService.getFireCarListAll();
 //        if (!ObjectUtils.isEmpty(result)) {
 //            List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
 //            if (!ValidationUtil.isEmpty(fireCarListMapList)) {
@@ -401,7 +412,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		 * 构建警情报送规则对象
 		 */
 		AlertCalledRo alertCalledRo = new AlertCalledRo();
-		String replaceContent = RuleAlertCalledService.init(alertCalledRo,alertCalledObjsDto);
+		String replaceContent = RuleAlertCalledService.init(alertCalledRo, alertCalledObjsDto);
 
 		definitions.put("rescueGrid", alertCalled.getAddress());
 		definitions.put("type", alertCalled.getAlertType());
@@ -409,7 +420,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		definitions.put("contactPhone", alertCalled.getContactPhone());
 		definitions.put("type", alertCalled.getAlertType());
 		definitions.put("replaceContent", replaceContent);
-		definitions.put("callTime", DateUtils.convertDateToString(alertCalled.getCallTime(),DateUtils.DATE_TIME_PATTERN));
+		definitions.put("callTime",
+				DateUtils.convertDateToString(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
 
 		for (PowerTransferCompanyDto powerTransferCompanyDto : powerTransferCompanyDotList) {
 			powerTransferCompany = new PowerTransferCompany();
@@ -430,7 +442,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 				for (PowerTransferCompanyResourcesDto powerTransferCompanyResourcesDto : powerTransferCompanyResourcesDtoList) {
 //					definitions.put("type", powerTransferCompanyResourcesDto.getType());
 //					definitions.put("resourcesNum", powerTransferCompanyResourcesDto.getResourcesNum());
-					String information = powerTransferCompanyResourcesDto.getType().concat("车牌号").concat(powerTransferCompanyResourcesDto.getResourcesNum());
+					String information = powerTransferCompanyResourcesDto.getType().concat("车牌号")
+							.concat(powerTransferCompanyResourcesDto.getResourcesNum());
 					taskInformation.append(information).append("丶");
 
 					CarStatusInfoDto carStatusInfoDto = new CarStatusInfoDto();