Merge remote-tracking branch 'origin/dev_upgrade' into dev_upgrade

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/event/FireContingencyHandler.java

@@ -102,7 +102,8 @@ public class FireContingencyHandler implements EventHandler{
                 event.getPlanExecute().getContingencyPlanId(),
                 event.getPlanExecute().getButtonCode(),
                 event.getPlanExecute().getConfirm(),
-                event.getPlanExecute().getStepState());
+                event.getPlanExecute().getStepState(),
+                event.getPlanExecute().getIsAuto());
     }
 
     @Override
@@ -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);
 
@@ -149,6 +150,13 @@ public class FireContingencyHandler implements EventHandler{
             contingencyRo.setButtonCode(buttonCode);
             contingencyRo.setButtonState(buttonState);
 
+            if("true".equals(isAuto)) {
+                // 用路线字段标识是否是自动执行
+                contingencyRo.setFireTruckRoute("true");
+            } else {
+                contingencyRo.setFireTruckRoute("false");
+            }
+
             ContingencyInstanceInfoVO infoVO = contingencyInstanceInfoService.selectDisposalDetails(batchNo);
             if (!ObjectUtils.isEmpty(infoVO.getPosition())) {
                 contingencyOriginalData.setPosition(infoVO.getPosition());