Commit 717ffc15 authored by litengwei's avatar litengwei

区分自动与手动

parent a7afeb69
...@@ -102,7 +102,8 @@ public class FireContingencyHandler implements EventHandler{ ...@@ -102,7 +102,8 @@ public class FireContingencyHandler implements EventHandler{
event.getPlanExecute().getContingencyPlanId(), event.getPlanExecute().getContingencyPlanId(),
event.getPlanExecute().getButtonCode(), event.getPlanExecute().getButtonCode(),
event.getPlanExecute().getConfirm(), event.getPlanExecute().getConfirm(),
event.getPlanExecute().getStepState()); event.getPlanExecute().getStepState(),
event.getPlanExecute().getIsAuto());
} }
@Override @Override
...@@ -111,7 +112,7 @@ public class FireContingencyHandler implements EventHandler{ ...@@ -111,7 +112,7 @@ public class FireContingencyHandler implements EventHandler{
} }
public void fire(String batchNo, String stepCode, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton) throws Exception { public void fire(String batchNo, String stepCode, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton, String isAuto) throws Exception {
//火灾误报 //火灾误报
ContingencyOriginalData contingencyOriginalData = iContingencyOriginalDataDao.findByBatchNo(batchNo); ContingencyOriginalData contingencyOriginalData = iContingencyOriginalDataDao.findByBatchNo(batchNo);
...@@ -149,6 +150,13 @@ public class FireContingencyHandler implements EventHandler{ ...@@ -149,6 +150,13 @@ public class FireContingencyHandler implements EventHandler{
contingencyRo.setButtonCode(buttonCode); contingencyRo.setButtonCode(buttonCode);
contingencyRo.setButtonState(buttonState); contingencyRo.setButtonState(buttonState);
if("true".equals(isAuto)) {
// 用路线字段标识是否是自动执行
contingencyRo.setFireTruckRoute("true");
} else {
contingencyRo.setFireTruckRoute("false");
}
ContingencyInstanceInfoVO infoVO = contingencyInstanceInfoService.selectDisposalDetails(batchNo); ContingencyInstanceInfoVO infoVO = contingencyInstanceInfoService.selectDisposalDetails(batchNo);
if (!ObjectUtils.isEmpty(infoVO.getPosition())) { if (!ObjectUtils.isEmpty(infoVO.getPosition())) {
contingencyOriginalData.setPosition(infoVO.getPosition()); contingencyOriginalData.setPosition(infoVO.getPosition());
......
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