Merge branch 'refs/heads/develop'

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

@@ -0,0 +1,55 @@
+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.service.FireRuleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+
+@Api("火力规则")
+@RestController
+@RequestMapping("/api/system/firerule")
+public class FireRuleController extends BaseController {
+
+
+    @Autowired
+    private FireRuleService ruleService;
+
+
+    /**
+     * 开始执行规则匹配
+     * @param fireRuleExecuteDTO 敌方参数
+     * @return
+     */
+    @PostMapping("/start")
+    @ApiOperation("开始执行规则匹配")
+    public AjaxResult execute(@RequestBody FireRuleExecuteDTO fireRuleExecuteDTO){
+        return success(ruleService.execute(fireRuleExecuteDTO));
+    }
+
+    /**
+     * 获取所有武器平台和组件
+     * @return
+     */
+    @GetMapping("/weapon")
+    @ApiOperation("获取所有武器平台和组件")
+    public AjaxResult getPlatformComponentNames(){
+        return success(ruleService.getPlatformComponentNames());
+    }
+
+    /**
+     * 获取通信组件的所有平台和组件
+     * @param scenarioId
+     * @return
+     */
+    @GetMapping("/comm")
+    @ApiOperation("获取通信组件的所有平台和组件")
+    public AjaxResult getCommPlatformComponentNames(Integer scenarioId){
+        return success(ruleService.getCommPlatformComponentNames(scenarioId));
+    }
+}

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

@@ -1,55 +1,65 @@
 package com.solution.web.controller.rule;
 
+import com.solution.common.annotation.Log;
 import com.solution.common.core.controller.BaseController;
 import com.solution.common.core.domain.AjaxResult;
-import com.solution.rule.domain.FireRuleExecuteDTO;
-import com.solution.rule.service.RuleService;
+import com.solution.common.core.page.TableDataInfo;
+import com.solution.common.enums.BusinessType;
+import com.solution.rule.domain.Rule;
+import com.solution.rule.service.IRuleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 
-
-@Api("火力规则")
+@Api("红蓝对抗规则管理")
 @RestController
-@RequestMapping("/api/system/firerule")
+@RequestMapping("/api/system/rule")
 public class RuleController extends BaseController {
 
-
     @Autowired
-    private RuleService ruleService;
+    private IRuleService ruleService;
 
-
-    /**
-     * 开始执行规则匹配
-     * @param fireRuleExecuteDTO 敌方参数
-     * @return
-     */
-    @PostMapping("/start")
-    @ApiOperation("开始执行规则匹配")
-    public AjaxResult execute(@RequestBody FireRuleExecuteDTO fireRuleExecuteDTO){
-        return success(ruleService.execute(fireRuleExecuteDTO));
+    @PreAuthorize("@ss.hasPermi('system:rule:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询规则列表")
+    public TableDataInfo list(Rule rule) {
+        startPage();
+        List<Rule> list = ruleService.selectRuleList(rule);
+        return getDataTable(list);
     }
 
-    /**
-     * 获取所有武器平台和组件
-     * @return
-     */
-    @GetMapping("/weapon")
-    @ApiOperation("获取所有武器平台和组件")
-    public AjaxResult getPlatformComponentNames(){
-        return success(ruleService.getPlatformComponentNames());
+    @PreAuthorize("@ss.hasPermi('system:rule:query')")
+    @GetMapping("/{id}")
+    @ApiOperation("获取规则详情")
+    public AjaxResult getInfo(@PathVariable Integer id) {
+        return success(ruleService.selectRuleById(id));
     }
 
-    /**
-     * 获取通信组件的所有平台和组件
-     * @param scenarioId
-     * @return
-     */
-    @GetMapping("/comm")
-    @ApiOperation("获取通信组件的所有平台和组件")
-    public AjaxResult getCommPlatformComponentNames(Integer scenarioId){
-        return success(ruleService.getCommPlatformComponentNames(scenarioId));
+    @PreAuthorize("@ss.hasPermi('system:rule:add')")
+    @Log(title = "规则管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("新增规则")
+    public AjaxResult add(@RequestBody Rule rule) {
+        return toAjax(ruleService.insertRule(rule));
     }
-}
+
+    @PreAuthorize("@ss.hasPermi('system:rule:edit')")
+    @Log(title = "规则管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    @ApiOperation("修改规则")
+    public AjaxResult edit(@RequestBody Rule rule) {
+        return toAjax(ruleService.updateRule(rule));
+    }
+
+    @PreAuthorize("@ss.hasPermi('system:rule:remove')")
+    @Log(title = "规则管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    @ApiOperation("删除规则")
+    public AjaxResult remove(@PathVariable Integer[] ids) {
+        return toAjax(ruleService.deleteRuleByIds(ids));
+    }
+}