Merge branch 'dev-api' into dev

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/ExamCollectionController.java

@@ -0,0 +1,15 @@
+package com.ruoyi.sim.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api("考试集合Controller")
+@RestController
+@RequestMapping("/sim/exam-collection")
+public class ExamCollectionController {
+
+
+
+
+}

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/FaultController.java

@@ -105,9 +105,11 @@ public class FaultController extends BaseController {
      * 查询故障列表
      */
     // @PreAuthorize("@ss.hasPermi('sim:fault:list')")
-    @GetMapping("/listAllTree")
-    @ApiOperation("查询故障列表")
-    public TableDataInfo listAllTree(Fault fault) {
+    @GetMapping("/listAllTreeViaSimType/{simType}")
+    @ApiOperation("通过模拟器类型,查询故障列表")
+    public TableDataInfo listAllTreeViaSimType(@PathVariable(value = "simType") String simType) {
+        Fault fault =new Fault();
+        fault.setSimType(simType);
         List<FaultNode> list = faultService.selectFaultListAllTree(fault);
         return getDataTable(list);
     }