Commit 633446fe authored by chenhao's avatar chenhao

放开方便测试的代码逻辑

parent 7842725c
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
......@@ -142,18 +143,18 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
powerTransfer.setDispatchNum(dispatch_num);
powerTransfer.setSequenceNbr(null);
// save(powerTransfer);
// Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
//
// // 获取任务派发模板
// 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);
save(powerTransfer);
Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
// 获取任务派发模板
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);
// 创建力量调派单位
// createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content);
createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content);
//封装调派任务的集合,以便于实现任务规则校验
try {
......@@ -189,9 +190,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
monitorTeamList.add(powerTransferCompanyDto);
}
}
//ruleAlertCalledService.powerTransferCalledRule(fullTimeList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.专职消防队.getKey());
ruleAlertCalledService.powerTransferCalledRule(fullTimeList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.专职消防队.getKey());
ruleAlertCalledService.powerTransferCalledRule(medicalTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.医疗救援队.getKey());
//ruleAlertCalledService.powerTransferCalledRule(monitorTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.监控大队.getKey());
ruleAlertCalledService.powerTransferCalledRule(monitorTeamList,powerTransferDto.getAlertCalledId(),FireBrigadeTypeEnum.监控大队.getKey());
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment