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/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;
 }