Merge branch 'refs/heads/develop'

# Conflicts:
#	auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
#	modeler/src/style.less

auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java

@@ -3,6 +3,7 @@ package com.solution.web.controller.rule;
 import com.solution.common.core.controller.BaseController;
 import com.solution.common.core.domain.AjaxResult;
 import com.solution.rule.domain.FireRuleExecuteDTO;
+import com.solution.rule.domain.simplerulepojo.Task;
 import com.solution.rule.service.FireRuleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -73,4 +74,15 @@ public class FireRuleController extends BaseController {
     public AjaxResult getComponents(@PathVariable Integer platformId){
         return success(ruleService.getComponents(platformId));
     }
+
+    /**
+     * 开始执行规则匹配
+     * @param task 敌方参数
+     * @return
+     */
+    @PostMapping("/rule")
+    @ApiOperation("开始执行规则匹配")
+    public AjaxResult execute(@RequestBody Task task){
+        return success(ruleService.executeTask(task));
+    }
 }