Forráskód Böngészése

完善 getInfoForAdd。

tom 5 hónapja
szülő
commit
3c49454dea

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

@@ -103,6 +103,6 @@ public class FaultController extends BaseController {
     @GetMapping("/listAllTreeViaSimType/{simType}")
     @ApiOperation("通过模拟器类型,查询故障列表。")
     public AjaxResult listAllTreeViaSimType(@PathVariable(value = "simType") String simType) {
-        return faultService.listAllTreeViaSimType(simType);
+        return faultService.selectAllTreeViaSimType(simType);
     }
 }

+ 4 - 3
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/TaskController.java

@@ -73,8 +73,8 @@ public class TaskController extends BaseController {
      */
     // @PreAuthorize("@ss.hasPermi('sim:task:add')")
     @Log(title = "任务", businessType = BusinessType.INSERT)
-    @PostMapping
-    @ApiOperation("新增任务")
+    // @PostMapping
+    // @ApiOperation("新增任务")
     public AjaxResult add(@RequestBody Task task) {
         return toAjax(taskService.insertTask(task));
     }
@@ -95,6 +95,7 @@ public class TaskController extends BaseController {
     // @PreAuthorize("@ss.hasPermi('sim:task:remove')")
     @Log(title = "任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{taskIds}")
+    @ApiOperation("删除任务")
     public AjaxResult remove(@PathVariable Long[] taskIds) {
         return toAjax(taskService.deleteTaskByTaskIds(taskIds));
     }
@@ -108,6 +109,6 @@ public class TaskController extends BaseController {
     @GetMapping("/getInfoForAdd/{simType}")
     @ApiOperation("获取空白的任务详细信息,为了新建任务")
     public AjaxResult getInfoForAdd(@PathVariable("simType") String simType) {
-        return success(taskService.selectNewTaskViaSimType(simType));
+        return taskService.getInfoForAdd(simType);
     }
 }

+ 3 - 1
ruoyi-sim/src/main/java/com/ruoyi/sim/service/IFaultService.java

@@ -68,5 +68,7 @@ public interface IFaultService {
      * @param fault 故障
      * @return 故障集合
      */
-    public AjaxResult listAllTreeViaSimType(String simType);
+    public AjaxResult selectAllTreeViaSimType(String simType);
+
+    public boolean checkSimTypeOk(String simType);
 }

+ 2 - 6
ruoyi-sim/src/main/java/com/ruoyi/sim/service/ITaskService.java

@@ -2,6 +2,7 @@ package com.ruoyi.sim.service;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.sim.domain.Task;
 
 /**
@@ -60,12 +61,7 @@ public interface ITaskService {
     public int deleteTaskByTaskId(Long taskId);
 
     // -------------------------------- tom add  --------------------------------
-
-    /**
-     * @param simType
-     * @return
-     */
-    public Task selectNewTaskViaSimType(String simType);
+    public AjaxResult getInfoForAdd(String simType);
 
     /**
      * 新增任务附带选择故障

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

@@ -107,7 +107,8 @@ public class FaultServiceImpl implements IFaultService {
      * @return 故障
      */
     @Override
-    public AjaxResult listAllTreeViaSimType(String simType) {
+    public AjaxResult selectAllTreeViaSimType(String simType) {
+        // check
         if (StringUtils.isEmpty(simType)) {
             return AjaxResult.error("simType empty!");
         }
@@ -152,6 +153,7 @@ public class FaultServiceImpl implements IFaultService {
      * @param simType
      * @return
      */
+    @Override
     public boolean checkSimTypeOk(String simType) {
         return SIM_TYPE_SET.contains(simType);
     }

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.sim.domain.Fault;
 import com.ruoyi.sim.domain.vo.FaultTree;
 import com.ruoyi.sim.service.IFaultService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sim.mapper.TaskMapper;
@@ -102,19 +103,22 @@ public class TaskServiceImpl implements ITaskService {
      *
      * @return 任务
      */
-    public Task selectNewTaskViaSimType(String simType) {
+    public AjaxResult getInfoForAdd(String simType) {
         // check
-
-        //
+        if (StringUtils.isEmpty(simType)) {
+            return AjaxResult.error("simType empty!");
+        }
+        if (!faultService.checkSimTypeOk(simType)) {
+            return AjaxResult.error("simType value error!");
+        }
+        // query obj.
+        Fault q = new Fault();
+        q.setSimType(simType);
+        List<FaultTree> ftList = (List<FaultTree>) faultService.selectAllTreeViaSimType(simType).get(AjaxResult.DATA_TAG);
         Task t = new Task();
-        // fa 构建用于查询的对象。
-        Fault fa = new Fault();
-        fa.setSimType(simType);
-        AjaxResult ar = faultService.listAllTreeViaSimType(simType);
-        List<FaultTree> ftList = (List<FaultTree>) ar.get(AjaxResult.DATA_TAG);
         t.setTaskId(Task.EMPTY_TASK_ID);
         t.setFaultTreeList(ftList);
-        return t;
+        return AjaxResult.success(t);
     }
 
     /**