AjaxResult 形式返回list数据。

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

@@ -3,16 +3,12 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.sim.domain.vo.FaultTree;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -106,10 +102,7 @@ public class FaultController extends BaseController {
     // @PreAuthorize("@ss.hasPermi('sim:fault:listAllTreeViaSimType')")
     @GetMapping("/listAllTreeViaSimType/{simType}")
     @ApiOperation("通过模拟器类型，查询故障列表。")
-    public TableDataInfo listAllTreeViaSimType(@PathVariable(value = "simType") String simType) {
-        Fault fault = new Fault();
-        fault.setSimType(simType);
-        List<FaultTree> list = faultService.selectFaultListAllTree(fault);
-        return getDataTable(list);
+    public AjaxResult listAllTreeViaSimType(@PathVariable(value = "simType") String simType) {
+        return faultService.listAllTreeViaSimType(simType);
     }
 }

ruoyi-sim/src/main/java/com/ruoyi/sim/service/IFaultService.java

@@ -2,8 +2,8 @@ package com.ruoyi.sim.service;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.sim.domain.Fault;
-import com.ruoyi.sim.domain.vo.FaultTree;
 
 /**
  * 故障Service接口
@@ -68,5 +68,5 @@ public interface IFaultService {
      * @param fault 故障
      * @return 故障集合
      */
-    public List<FaultTree> selectFaultListAllTree(Fault fault);
+    public AjaxResult listAllTreeViaSimType(String simType);
 }

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/FaultServiceImpl.java

@@ -3,9 +3,11 @@ package com.ruoyi.sim.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.sim.domain.TaskFault;
 import com.ruoyi.sim.domain.vo.FaultTree;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -105,15 +107,23 @@ public class FaultServiceImpl implements IFaultService {
      * @return 故障
      */
     @Override
-    public List<FaultTree> selectFaultListAllTree(Fault fault) {
-        //
+    public AjaxResult listAllTreeViaSimType(String simType) {
+        if (StringUtils.isEmpty(simType)) {
+            return AjaxResult.error("simType empty!");
+        }
+        if (!checkSimTypeOk(simType)) {
+            return AjaxResult.error("simType value error!");
+        }
+        // query obj.
+        Fault q = new Fault();
+        q.setSimType(simType);
         // fault.getParams().put(TableSupport.PAGE_NUM, 1);
         // fault.getParams().put(TableSupport.PAGE_SIZE, 100);
         //
-        List<Fault> list = faultMapper.selectFaultList(fault);
+        List<Fault> list = faultMapper.selectFaultList(q);
         log.info("AAAAAAAAAAAAAAAAAAAAAAAAAAAA000000000000");
         log.info(Objects.requireNonNull(list).toString());
-        log.info(Objects.requireNonNull(fault.getParams()).toString());
+        log.info(Objects.requireNonNull(q.getParams()).toString());
         log.info(Objects.requireNonNull(list.size()).toString());
 
         List<FaultTree> tempListNode = new ArrayList<>();
@@ -125,7 +135,7 @@ public class FaultServiceImpl implements IFaultService {
         log.info(Objects.requireNonNull(tempListNode).toString());
         List<FaultTree> tree = toTree(tempListNode, ROOT_FAULT_ID);
         log.info(Objects.requireNonNull(tree).toString());
-        return tree;
+        return AjaxResult.success(tree);
     }
 
     public static final String SIM_TYPE_0001 = "0001";
@@ -142,7 +152,7 @@ public class FaultServiceImpl implements IFaultService {
      * @param simType
      * @return
      */
-    public boolean checkSimType(String simType) {
+    public boolean checkSimTypeOk(String simType) {
         return SIM_TYPE_SET.contains(simType);
     }
 

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/TaskServiceImpl.java

@@ -109,10 +109,11 @@ public class TaskServiceImpl implements ITaskService {
         // fa 构建用于查询的对象。
         Fault fa = new Fault();
         fa.setSimType(simType);
-        //
-        List<FaultTree> ftList = faultService.selectFaultListAllTree(fa);
+        // todo:
+        // List<FaultTree> ftList = faultService.listAllTreeViaSimType(fa);
         t.setTaskId(Task.EMPTY_TASK_ID);
-        t.setFaultTreeList(ftList);
+        // todo:
+        // t.setFaultTreeList(ftList);
         return t;
     }