Merge branch 'dev_upgrade_plan6' of…

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -103,6 +103,9 @@ public class ContingencyAction implements CustomerAction {
     @Autowired
     IRocketMQService rocketMQService;
 
+    @Autowired
+    private IContingencyInstance contingencyInstance;
+
     @Value("${rocket-plan-topic}")
     private String rocketTopic;
 
@@ -510,7 +513,6 @@ public class ContingencyAction implements CustomerAction {
         result.add(tempmap1);
 
         this.sendcmd("optionarea", paramObj, result);
-
     }
 
 
@@ -703,7 +705,6 @@ public class ContingencyAction implements CustomerAction {
         result.add(tempmap1);
 
         this.sendcmd("message", paramObj, result);
-
         redisTemplate.opsForValue().set("contingencyRo", contingencyRo);
     }
 
@@ -851,6 +852,7 @@ public class ContingencyAction implements CustomerAction {
 
     @RuleMethod(methodLabel = "自动执行动作", project = "换流站消防专项预案")
     public void autoExecuteAction(
+            @MethodParam(paramLabel = "当前步骤") String currentSetup,
             @MethodParam(paramLabel = "按钮状态") String buttonStatus,
             @MethodParam(paramLabel = "按钮编码") String buttonCode,
             @MethodParam(paramLabel = "规则主题") String topic,
@@ -858,6 +860,8 @@ public class ContingencyAction implements CustomerAction {
         ContingencyRo contingencyRo = (ContingencyRo) paramObj;
         contingencyRo.setButtonState(buttonStatus);
         contingencyRo.setButtonCode(buttonCode);
+        contingencyRo.setStepState(topic);
+        contingencyRo.setStep(currentSetup);
         try {
             //电力设备
             Equipment equipment = equipmentService.queryOne(Long.parseLong(contingencyRo.getEquipmentId()));
@@ -867,6 +871,26 @@ public class ContingencyAction implements CustomerAction {
         }
     }
 
+    @RuleMethod(methodLabel = "自动执行动作V2", project = "换流站消防专项预案")
+    public void autoExecuteActionV2(
+            @MethodParam(paramLabel = "步骤编码") String stepCode,
+            @MethodParam(paramLabel = "按钮编码") String buttonCode,
+            @MethodParam(paramLabel = "按钮状态") String confirm,
+            @MethodParam(paramLabel = "步骤状态") String stepState,
+            @MethodParam(paramLabel = "动作名称") String actionName,
+            @MethodParam(paramLabel = "图标") String icon,
+            @MethodParam(paramLabel = "提示信息") String tips,
+            @MethodParam(paramLabel = "按钮json字符串") String buttonJson,
+            @MethodParam(paramLabel = "预案对象") Object paramObj) {
+        ContingencyRo contingencyRo = (ContingencyRo) paramObj;
+        String contingencyPlanId = getContingencyPlanId(contingencyRo.getBatchNo(), actionName, icon, tips, buttonJson);
+        try {
+            contingencyInstance.fire(contingencyRo.getBatchNo(), stepCode, contingencyPlanId, buttonCode, confirm, stepState, null, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     public void sendcmd(String msgType, DeviceRo deviceRo, SafteyPlanResult result) {
         Constructor<?> constructor;
         try {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/equipmentFireEquipmentController.java → YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EquipmentFireEquipmentController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping(value = "/api/equipFireEquip")
-public class equipmentFireEquipmentController {
+public class EquipmentFireEquipmentController {
 
     @Autowired
     private IEquipmentFireEquipmentService equipmentFireEquipmentService;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/TimeLineController.java

 package com.yeejoin.amos.fas.business.controller;
 
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
 import com.yeejoin.amos.fas.business.action.CustomerAction;
-import com.yeejoin.amos.fas.business.bo.FirePlanAlarmBo;
-import com.yeejoin.amos.fas.business.dao.mapper.View3dMapper;
 import com.yeejoin.amos.fas.business.service.impl.RiskSourceServiceImpl;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyOriginalDataService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
-import com.yeejoin.amos.fas.business.service.intfc.IRocketMQService;
 import com.yeejoin.amos.fas.business.service.intfc.IRuleRunningSnapshotService;
 import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
@@ -41,15 +15,26 @@ import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.core.util.DateUtil;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 @RestController
 @RequestMapping(value = "/api/timeline")
-@Api(tags="时间轴")
-public class TimeLineController extends BaseController{
+@Api(tags = "时间轴")
+public class TimeLineController extends BaseController {
 
     private static final Logger log = LoggerFactory.getLogger(TimeLineController.class);
     @Autowired
@@ -66,78 +51,46 @@ public class TimeLineController extends BaseController{
     @Autowired
     IEquipmentService equipmentService;
 
-    static LinkedList<Map<String,String >> fireQueue  = new LinkedList<>();
-
     @Autowired
     private RedisTemplate redisTemplate;
     @Autowired
     private IRuleRunningSnapshotService ruleRunningSnapshotService;
 
-	@Autowired
-   	IRocketMQService rocketMQService;
-    
-    @Value("${rocket-equip-alarm-topic}")
-    private String rocketTopicFireEquipAlarm;
-    @Autowired
-    private View3dMapper view3dMapper;
-
     @Permission
     //@Authorization(ingore = true)
-    @ApiOperation(httpMethod = "GET",value = "根据批次号查询时间轴", notes = "根据批次号查询时间轴")
+    @ApiOperation(httpMethod = "GET", value = "根据批次号查询时间轴", notes = "根据批次号查询时间轴")
     @RequestMapping(value = "/{instanceNo}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse queryPoint(@PathVariable String  instanceNo,@RequestParam("recordType") String recordType) throws Exception{
+    public CommonResponse queryPoint(@PathVariable String instanceNo, @RequestParam("recordType") String recordType) throws Exception {
 
-        return CommonResponseUtil.success(iContingencyInstance.queryForTimeLine(instanceNo,recordType));
+        return CommonResponseUtil.success(iContingencyInstance.queryForTimeLine(instanceNo, recordType));
     }
 
     @Permission
     //@Authorization(ingore = true)
-    @ApiOperation(httpMethod = "PUT",value = "点击按钮", notes = "点击按钮")
+    @ApiOperation(httpMethod = "PUT", value = "点击按钮", notes = "点击按钮")
     @RequestMapping(value = "/fire", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse fire(@RequestParam("batchNo") String batchNo,
                                @RequestParam("stepCode") String stepCode,
                                @RequestParam("buttonCode") String buttonCode,
                                @RequestParam("confirm") String confirm,
                                @RequestParam("contingencyPlanId") String contingencyPlanId,
-                                     @RequestParam("stepState") String stepState) throws Exception{
-
-        Map<String,String> map = new HashMap<>();
-        map.put("batchNo",batchNo);
-        map.put("stepCode",stepCode);
-        map.put("buttonCode",buttonCode);
-        map.put("confirm",confirm);
-        map.put("contingencyPlanId",contingencyPlanId);
-        map.put("stepState",stepState);
-        map.put("token",getToken());
-        map.put("product",getProduct());
-        fireQueue.addLast(map);
-        //应急指挥给总部推送消息
-        sendPlanAlarm(batchNo,buttonCode);
+                               @RequestParam("stepState") String stepState) throws Exception {
+        iContingencyInstance.fire(batchNo, stepCode, contingencyPlanId, buttonCode, confirm, stepState, getToken(), getProduct());
         return CommonResponseUtil.success("SUCCESS");
     }
 
-    private void sendPlanAlarm(String batchNo ,String buttonCode){
-    	//确警后推送报警数据
-    	if("FIRE_CONFIRM".equals(buttonCode)){
-    		FirePlanAlarmBo firePlanAlarm = view3dMapper.getPlanAlarmInfo(batchNo);
-        	List<FirePlanAlarmBo> list = new ArrayList<FirePlanAlarmBo>();
-        	list.add(firePlanAlarm);
-        	rocketMQService.sendMsg(rocketTopicFireEquipAlarm,"plan_alarm", list);
-    	}
-    }
-
     @Permission
-    @ApiOperation(httpMethod = "PUT",value = "点击按钮", notes = "点击按钮")
+    @ApiOperation(httpMethod = "PUT", value = "点击按钮", notes = "点击按钮")
     @RequestMapping(value = "/fire/exit", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse fireExit(@RequestParam("batchNo") String batchNo,
                                    @RequestParam("stepCode") String stepCode,
                                    @RequestParam("buttonCode") String buttonCode,
                                    @RequestParam("confirm") String confirm,
-                                     @RequestParam("stepState") String stepState) throws Exception{
+                                   @RequestParam("stepState") String stepState) throws Exception {
 
-        Map<String,String> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>();
         redisTemplate.delete(RiskSourceServiceImpl.cacheKeyForCanBeRunning());
-        Optional<Equipment> equipment = iContingencyInstance.fire(batchNo,stepCode,"",buttonCode,confirm,stepState);
+        Optional<Equipment> equipment = iContingencyInstance.fire(batchNo, stepCode, "", buttonCode, confirm, stepState);
         //  结束预案，更新设备重点设备参数
         equipment.ifPresent(equip -> {
             equip.setStartTime(DateUtil.getDateNow());
@@ -151,62 +104,26 @@ public class TimeLineController extends BaseController{
     }
 
     @Permission
-    @ApiOperation(httpMethod = "GET",value = "预案回放", notes = "预案回放")
+    @ApiOperation(httpMethod = "GET", value = "预案回放", notes = "预案回放")
     @RequestMapping(value = "/fire/replay", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse replay(@RequestParam("batchNo") String batchNo,
-                                     @RequestParam("randomNumber") String randomNumber) throws Exception{
+                                 @RequestParam("randomNumber") String randomNumber) throws Exception {
         ruleRunningSnapshotService.replayPlan(batchNo, randomNumber);
         return CommonResponseUtil.success("SUCCESS");
     }
 
     @Permission
-    @ApiOperation(httpMethod = "GET",value = "预案回放退出", notes = "预案回放退出")
+    @ApiOperation(httpMethod = "GET", value = "预案回放退出", notes = "预案回放退出")
     @RequestMapping(value = "/fire/replay/exit", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse replayExit(@RequestParam("batchNo") String batchNo,
-                                     @RequestParam("randomNumber") String randomNumber) throws Exception{
+                                     @RequestParam("randomNumber") String randomNumber) throws Exception {
         ruleRunningSnapshotService.exitReplayPlan(batchNo, randomNumber);
         return CommonResponseUtil.success("SUCCESS");
     }
 
-    @Scheduled(cron = "*/2 * * * * ?")
-    public void runFireQueue()  throws Exception
-    {
-
-        if(fireQueue.size() == 0)
-            return;
-
-        Map<String,String>  map = fireQueue.getFirst();
-        String batchNo = map.get("batchNo");
-        String stepCode = map.get("stepCode");
-        String buttonCode = map.get("buttonCode");
-        String confirm = map.get("confirm");
-        String contingencyPlanId = map.get("contingencyPlanId");
-        String  stepState = map.get("stepState");
-        String  token = map.get("token");
-        String  product = map.get("product");
-        try
-        {
-            log.info("fireQueue-size:"+fireQueue.size());
-            log.info("stepCode:" + map.get("stepCode"));
-            log.info("buttonCode:" + map.get("buttonCode"));
-            log.info("confirm:" + map.get("confirm"));
-            log.info("stepState:" + map.get("stepState"));
-            RequestContext.setToken(token);
-            RequestContext.setProduct(product);
-            iContingencyInstance.setButtonExecuted(batchNo,contingencyPlanId,buttonCode,confirm);
-            iContingencyInstance.fire(batchNo,stepCode,contingencyPlanId,buttonCode,confirm,stepState);
-        }catch (Exception e)
-        {
-            throw  e;
-        }finally {
-            fireQueue.removeFirst();
-        }
-    }
-
-
     @Permission
     // @Authorization(ingore = true)
-    @ApiOperation(httpMethod = "POST",value = "查询预案记录", notes = "查询预案记录")
+    @ApiOperation(httpMethod = "POST", value = "查询预案记录", notes = "查询预案记录")
     @RequestMapping(value = "/contingency/page", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse contingencyRecord(
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
@@ -217,26 +134,21 @@ public class TimeLineController extends BaseController{
         String contingencyName = null;
         String equipmentId = null;
         String createTime = null;
-        if(!CollectionUtils.isEmpty(queryRequests))
-        {
-            for(CommonRequest request:queryRequests)
-            {
-                if("contingencyName".equals(request.getName()))
-                {
+        if (!CollectionUtils.isEmpty(queryRequests)) {
+            for (CommonRequest request : queryRequests) {
+                if ("contingencyName".equals(request.getName())) {
                     contingencyName = String.valueOf(request.getValue());
                 }
-                if("equipmentId".equals(request.getName()))
-                {
+                if ("equipmentId".equals(request.getName())) {
                     equipmentId = String.valueOf(request.getValue());
                 }
-                if("createTime".equals(request.getName()))
-                {
+                if ("createTime".equals(request.getName())) {
                     createTime = String.valueOf(request.getValue());
                 }
             }
         }
 
-        return CommonResponseUtil.success(iContingencyOriginalDataService.queryForPage(contingencyName,equipmentId,createTime,commonPageable));
+        return CommonResponseUtil.success(iContingencyOriginalDataService.queryForPage(contingencyName, equipmentId, createTime, commonPageable));
     }
 
 
@@ -265,12 +177,10 @@ public class TimeLineController extends BaseController{
             "}";
 
     @Permission
-    @ApiOperation(httpMethod = "GET",value = "根据批次号查询时间轴", notes = "根据批次号查询时间轴")
+    @ApiOperation(httpMethod = "GET", value = "根据批次号查询时间轴", notes = "根据批次号查询时间轴")
     @RequestMapping(value = "/replay", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse queryPoint(@RequestParam("batchNo") String batchNo) throws Exception{
+    public CommonResponse queryPoint(@RequestParam("batchNo") String batchNo) throws Exception {
         iRuleRunningSnapshotService.replay(batchNo);
         return CommonResponseUtil.success();
     }
-
-
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java

@@ -6,19 +6,24 @@ import com.yeejoin.amos.fas.business.action.ContingencyAction;
 import com.yeejoin.amos.fas.business.action.model.ContingencyEvent;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.action.util.ContingencyLogPublisher;
+import com.yeejoin.amos.fas.business.bo.FirePlanAlarmBo;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipPointMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.PlanDetailMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.View3dMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyPlanInstanceRepository;
+import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
-import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
+import com.yeejoin.amos.fas.business.service.intfc.IRocketMQService;
 import com.yeejoin.amos.fas.business.service.model.Operate;
 import com.yeejoin.amos.fas.business.service.model.OperateGroup;
+import com.yeejoin.amos.fas.business.vo.Toke;
 import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,10 +31,11 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.client.RestTemplate;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.util.*;
 
@@ -38,6 +44,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
 
     private static final Logger log = LoggerFactory.getLogger(ContingencyInstanceImpl.class);
 
+    static LinkedList<Map<String, String>> fireQueue = new LinkedList<>();
+
     @Autowired
     private IContingencyPlanInstanceRepository repository;
 
@@ -45,9 +53,6 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
     IContingencyOriginalDataDao iContingencyOriginalDataDao;
 
     @Autowired
-    private RestTemplate restTemplate;
-
-    @Autowired
     private ImpAndFireEquipMapper impAndFireEquipMapper;
 
     @Autowired
@@ -57,10 +62,16 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
     private FireEquipPointMapper fireEquipPointMapper;
 
     @Autowired
-    private IContingencyInstance iContingencyInstance;
+    IRocketMQService rocketMQService;
 
     @Autowired
-    private IEquipmentService equipmentService;
+    private RemoteSecurityService remoteSecurityService;
+
+    @Value("${rocket-equip-alarm-topic}")
+    private String rocketTopicFireEquipAlarm;
+
+    @Autowired
+    private View3dMapper view3dMapper;
 
     @Value("${station.name}")
     private String stationName;
@@ -309,6 +320,71 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
         iContingencyOriginalDataDao.updateByButtonStep(step, batchNo);
     }
 
+    @Override
+    public Optional<Equipment> fire(String batchNo, String stepCode, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton, String token, String product) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("batchNo", batchNo);
+        map.put("stepCode", stepCode);
+        map.put("buttonCode", buttonCode);
+        map.put("confirm", buttonState);
+        map.put("contingencyPlanId", contingencyPlanId);
+        map.put("stepState", stepStateOnbutton);
+        if (StringUtils.isNotBlank(token) || StringUtils.isNotBlank(product)) {
+            Toke serverToken = remoteSecurityService.getServerToken();
+            map.put("token", serverToken.getToke());
+            map.put("product", serverToken.getProduct());
+        } else {
+            map.put("token", token);
+            map.put("product", product);
+        }
+        fireQueue.addLast(map);
+        //应急指挥给总部推送消息
+        sendPlanAlarm(batchNo, buttonCode);
+        return Optional.empty();
+    }
+
+    private void sendPlanAlarm(String batchNo, String buttonCode) {
+        //确警后推送报警数据
+        if ("FIRE_CONFIRM".equals(buttonCode)) {
+            FirePlanAlarmBo firePlanAlarm = view3dMapper.getPlanAlarmInfo(batchNo);
+            List<FirePlanAlarmBo> list = new ArrayList<FirePlanAlarmBo>();
+            list.add(firePlanAlarm);
+            rocketMQService.sendMsg(rocketTopicFireEquipAlarm, "plan_alarm", list);
+        }
+    }
+
+    @Scheduled(cron = "*/2 * * * * ?")
+    public void runFireQueue() throws Exception {
+
+        if (fireQueue.size() == 0)
+            return;
+
+        Map<String, String> map = fireQueue.getFirst();
+        String batchNo = map.get("batchNo");
+        String stepCode = map.get("stepCode");
+        String buttonCode = map.get("buttonCode");
+        String confirm = map.get("confirm");
+        String contingencyPlanId = map.get("contingencyPlanId");
+        String stepState = map.get("stepState");
+        String token = map.get("token");
+        String product = map.get("product");
+        try {
+            log.info("fireQueue-size:" + fireQueue.size());
+            log.info("stepCode:" + map.get("stepCode"));
+            log.info("buttonCode:" + map.get("buttonCode"));
+            log.info("confirm:" + map.get("confirm"));
+            log.info("stepState:" + map.get("stepState"));
+            RequestContext.setToken(token);
+            RequestContext.setProduct(product);
+            setButtonExecuted(batchNo, contingencyPlanId, buttonCode, confirm);
+            fire(batchNo, stepCode, contingencyPlanId, buttonCode, confirm, stepState);
+        } catch (Exception e) {
+            throw e;
+        } finally {
+            fireQueue.removeFirst();
+        }
+    }
+
     public List<String> getNumberPlan(Long id) {
         List<String> ruleId = planDetailMapper.getRuleIdByEquipment(id);
         return ruleId;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyInstance.java

@@ -22,4 +22,6 @@ public interface IContingencyInstance {
     Optional<Equipment> fire(String batchNo, String stepCode, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton) throws Exception;
 
     void updateStep(String step, String batchNo);
+
+    Optional<Equipment> fire(String batchNo, String stepCode, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton, String token, String product) throws Exception;
 }