Merge branch 'dev' into dev-web

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/enhance/AjaxResult.java

@@ -7,7 +7,7 @@ import org.springframework.beans.BeanUtils;
 import java.io.Serializable;
 
 /**
- * 改造。
+ * 同名类增强改造。
  */
 public class AjaxResult extends com.ruoyi.common.core.domain.AjaxResult implements Serializable, RuoYiResponse {
 

ele6-catalyzer-ruoyi-vue/src/main/java/cn/ele6/catalyzer/ruoyi/enhance/TableDataInfo.java

@@ -6,7 +6,7 @@ import org.springframework.beans.BeanUtils;
 import java.io.Serializable;
 
 /**
- *
+ * 同名类增强改造。
  */
 public class TableDataInfo extends com.ruoyi.common.core.page.TableDataInfo implements Serializable, RuoYiResponse {
 

ruoyi-sim/src/main/java/TaskController.java

@@ -1,13 +0,0 @@
-import com.ruoyi.common.core.controller.BaseController;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api("任务Controller")
-@RestController
-@RequestMapping("/sim/task")
-public class TaskController extends BaseController {
-
-
-    // @PreAuthorize("@ss.hasPermi('sim:task:list')")
-}

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.selectAllTreeViaSimType(simType);
+        return faultService.listAllTreeStyleBySimType(simType);
     }
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.sim.controller;
 
+import cn.ele6.catalyzer.ruoyi.enhance.TableDataInfo;
 import com.ruoyi.sim.domain.vo.RealExamCollectionVo;
 import com.ruoyi.sim.service.impl.RealExamCollectionService;
 import io.swagger.annotations.Api;
@@ -35,13 +36,13 @@ public class RealExamCollectionController extends BaseController {
 
     @GetMapping("/teacher/exam/list")
     @ApiOperation("[教师][分页]查询考试集合列表")
-    public AjaxResult listExamByTeacher(RealExamCollection p) {
+    public TableDataInfo listExamByTeacher(RealExamCollection p) {
         return service.listExamByTeacher(p);
     }
 
     @GetMapping("/teacher/exercise/list")
-    @ApiOperation("[教师][分页]查询考试集合列表")
-    public AjaxResult listExerciseByTeacher(RealExamCollection p) {
+    @ApiOperation("[教师][分页]查询练习集合列表")
+    public TableDataInfo listExerciseByTeacher(RealExamCollection p) {
         return service.listExerciseByTeacher(p);
     }
 
@@ -88,7 +89,7 @@ public class RealExamCollectionController extends BaseController {
     }
 
     @DeleteMapping("/teacher/exercise/{ids}")
-    @ApiOperation("[教师]删除多个考试集合")
+    @ApiOperation("[教师]删除多个练习集合")
     public AjaxResult deleteExercises(@PathVariable Long[] ids) {
         return service.deleteExercises(ids);
     }

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

@@ -91,12 +91,9 @@ public class TaskController extends BaseController {
 
     // -------------------------------- tom add  --------------------------------
 
-    /**
-     * 获取空白的任务详细信息，为了新建任务。
-     */
-    // @PreAuthorize("@ss.hasPermi('sim:task:query')")
+
     @GetMapping("/getInfoForAdd/{simType}")
-    @ApiOperation("获取空白的任务详细信息，为了新建任务。")
+    @ApiOperation("为了新建Task，返回一个带tree结构的任务详细信息。")
     public AjaxResult getInfoForAdd(@PathVariable("simType") String simType) {
         return taskService.getInfoForAdd(simType);
     }

ruoyi-sim/src/main/java/com/ruoyi/sim/domain/Fault.java

@@ -13,6 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @date 2024-12-15
  */
 public class Fault extends BaseEntity implements Comparable<Fault> {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -26,7 +27,8 @@ public class Fault extends BaseEntity implements Comparable<Fault> {
     @Excel(name = "父故障ID")
     private String parentFaultId;
 
-    /** 模拟器类型
+    /**
+     * 模拟器类型
      */
     @Excel(name = "模拟器类型")
     private String simType;
@@ -206,14 +208,17 @@ public class Fault extends BaseEntity implements Comparable<Fault> {
         }
     }
 
+
     public static String TYPE_1 = "1";
     public static String TYPE_2 = "2";
     public static String TYPE_3 = "3";
     public static String TYPE_4 = "4";
     public static String TYPE_5 = "5";
 
-    public static String STATE_ENABLE = "0";
-    public static String STATE_DISABLE = "1";
+    public interface State {
+        String ENABLE = "0";
+        String DISABLE = "5";
+    }
 
     public static String ROOT_FAULT_ID = "000000000000";
 }

ruoyi-sim/src/main/java/com/ruoyi/sim/domain/Task.java

@@ -1,13 +1,10 @@
 package com.ruoyi.sim.domain;
 
-import com.ruoyi.sim.domain.vo.FaultTreeVo;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
-import java.util.List;
-
 /**
  * 任务对象 sim_task
  *
@@ -15,6 +12,7 @@ import java.util.List;
  * @date 2024-12-13
  */
 public class Task extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -29,11 +27,9 @@ public class Task extends BaseEntity {
     private String simType;
 
     /**
-     * 任务类型
-     * 1:教师创建管理
-     * 2:考试临时数据
+     * 任务类型:[1]-教师创建管理,[2]-考试临时数据
      */
-    @Excel(name = "任务类型")
+    @Excel(name = "任务类型:[1]-教师创建管理,[2]-考试临时数据")
     private String taskType;
 
     /**
@@ -107,12 +103,9 @@ public class Task extends BaseEntity {
     // -------------------------------- tom add  --------------------------------
     public static final Long EMPTY_TASK_ID = 0L;
 
-    /**
-     * 教师创建管理
-     */
-    public static final String TASK_TYPE_TEACHER_ADD = "1";
-    /**
-     * 考试临时数据
-     */
-    public static final String TASK_TYPE_TEMP = "2";
+
+    public interface Type {
+        String TEACHER_ADD = "1";
+        String TEMP = "2";
+    }
 }

ruoyi-sim/src/main/java/com/ruoyi/sim/domain/vo/TaskVo.java

@@ -8,6 +8,9 @@ import java.util.List;
 
 public class TaskVo extends Task {
 
+    /**
+     * 选择情况故障数据
+     */
     private List<FaultTreeVo> selectedData;
 
     public List<FaultTreeVo> getSelectedData() {

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

@@ -133,7 +133,7 @@ public class CommSendService {
                 Fault f = faultService.selectFaultByFaultId(ref.getFaultId());
                 if (f != null &&
                         f.getFaultType().equals(Fault.TYPE_3) &&
-                        f.getFaultState().equals(Fault.STATE_ENABLE)
+                        f.getFaultState().equals(Fault.State.ENABLE)
                 )
                     readOneFaultResistance(s, ref, f);
             });

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

@@ -90,7 +90,7 @@ public class FaultService {
     }
 
     // -------------------------------- tom add  --------------------------------
-    private static final Logger log = LoggerFactory.getLogger(FaultService.class);
+    private static final Logger l = LoggerFactory.getLogger(FaultService.class);
     @Autowired
     private SimService simService;
 
@@ -101,27 +101,44 @@ public class FaultService {
         if (f == null) {
             return false;
         }
-        return (Fault.STATE_ENABLE.equals(f.getFaultState()));
+        return (Fault.State.ENABLE.equals(f.getFaultState()));
     }
 
     public boolean isDisable(String faultId) {
         return !isEnable(faultId);
     }
 
-    public List<Fault> listAllType3EnableBySimType(String simType) {
+    public List<Fault> listAllEnable(final String simType) {
+        Fault q = new Fault();
+        q.setSimType(simType);
+        q.setFaultState(Fault.State.ENABLE);
+        return selectFaultList(q);
+    }
+
+    public List<Fault> listAllType3EnableBySimType(final String simType) {
         Fault q = new Fault();
         q.setSimType(simType);
         q.setFaultType(Fault.TYPE_3);
-        q.setFaultState(Fault.STATE_ENABLE);
+        q.setFaultState(Fault.State.ENABLE);
         return selectFaultList(q);
     }
 
+    public List<Fault> listAllType3And4EnableBySimType(final String simType) {
+        List<Fault> list = new ArrayList<>();
+        listAllEnable(simType)
+                .stream()
+                .filter(Objects::nonNull)
+                .filter(f -> (Fault.TYPE_1.equals(f.getFaultType()) || Fault.TYPE_3.equals(f.getFaultType())))
+                .forEach(list::add);
+        return list;
+    }
+
     /**
      * 查询故障列表tree
      *
      * @return 故障
      */
-    public AjaxResult selectAllTreeViaSimType(String simType) {
+    public AjaxResult listAllTreeStyleBySimType(final String simType) {
         // check
         if (StringUtils.isEmpty(simType)) {
             return AjaxResult.error("simType empty!");
@@ -129,28 +146,18 @@ public class FaultService {
         if (!simService.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(q);
+        List<Fault> list = listAllType3And4EnableBySimType(simType);
+        // 按照faultId升序排序
         Collections.sort(list);
-        log.info("AAAAAAAAAAAAAAAAAAAAAAAAAAAA000000000000");
-        log.info(Objects.requireNonNull(list).toString());
-        log.info(Objects.requireNonNull(q.getParams()).toString());
-        log.info(Objects.requireNonNull(list.size()).toString());
-
         List<FaultTreeVo> tempListNode = new ArrayList<>();
-        for (Fault source : list) {
-            FaultTreeVo target = new FaultTreeVo();
-            BeanUtils.copyProperties(source, target);
-            tempListNode.add(target);
+        for (Fault s : list) {
+            FaultTreeVo t = new FaultTreeVo();
+            BeanUtils.copyProperties(s, t);
+            tempListNode.add(t);
         }
-        log.info(Objects.requireNonNull(tempListNode).toString());
+        l.info(Objects.requireNonNull(tempListNode).toString());
         List<FaultTreeVo> tree = toTree(tempListNode, Fault.ROOT_FAULT_ID);
-        log.info(Objects.requireNonNull(tree).toString());
+        l.info(Objects.requireNonNull(tree).toString());
         return AjaxResult.success(tree);
     }
 

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

@@ -4,9 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.ele6.catalyzer.ruoyi.custom.BaseService;
-import com.ruoyi.common.annotation.Log;
+import cn.ele6.catalyzer.ruoyi.enhance.TableDataInfo;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.sim.domain.vo.RealExamCollectionVo;
 import org.apache.commons.lang3.StringUtils;
@@ -99,7 +98,7 @@ public class RealExamCollectionService extends BaseService {
      * @param p
      * @return
      */
-    public AjaxResult listExamByTeacher(RealExamCollection p) {
+    public TableDataInfo listExamByTeacher(RealExamCollection p) {
         startPage();
         p.setExamCollectionType(RealExamCollection.Type.EXAM);
         List<RealExamCollectionVo> list = new ArrayList<>();
@@ -108,7 +107,7 @@ public class RealExamCollectionService extends BaseService {
             BeanUtils.copyProperties(s, t);
             list.add(t);
         });
-        return AjaxResult.success(list);
+        return getDataTable(list);
     }
 
     /**
@@ -117,7 +116,7 @@ public class RealExamCollectionService extends BaseService {
      * @param p
      * @return
      */
-    public AjaxResult listExerciseByTeacher(RealExamCollection p) {
+    public TableDataInfo listExerciseByTeacher(RealExamCollection p) {
         startPage();
         p.setExamCollectionType(RealExamCollection.Type.EXERCISE);
         List<RealExamCollectionVo> list = new ArrayList<>();
@@ -126,7 +125,7 @@ public class RealExamCollectionService extends BaseService {
             BeanUtils.copyProperties(s, t);
             list.add(t);
         });
-        return AjaxResult.success(list);
+        return getDataTable(list);
     }
 
     /**
@@ -155,6 +154,7 @@ public class RealExamCollectionService extends BaseService {
      */
     public AjaxResult addExam(@RequestBody RealExamCollectionVo vo) {
         // check
+        // 日期检查
         if (StringUtils.isBlank(vo.getExamCollectionName())) {
 
         }
@@ -184,6 +184,24 @@ public class RealExamCollectionService extends BaseService {
     }
 
     /**
+     * [学院]新增自主练习集合
+     * todo:界面入口
+     *
+     * @param vo
+     * @return
+     */
+    public AjaxResult addSelfExercise(@RequestBody RealExamCollectionVo vo) {
+        // check
+
+        // do.
+        RealExamCollection p = new RealExamCollection();
+        BeanUtils.copyProperties(vo, p);
+        p.setExamCollectionType(RealExamCollection.Type.SELF_EXERCISE);
+        insertRealExamCollection(p);
+        return AjaxResult.success();
+    }
+
+    /**
      * [教师]修改考试集合
      *
      * @param vo

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

@@ -59,7 +59,7 @@ public class TaskService {
         String simType = t.getSimType();
         BeanUtils.copyProperties(t, vo);
         // 查询获得数据结构。
-        List<FaultTreeVo> listToQ = (List<FaultTreeVo>) faultService.selectAllTreeViaSimType(simType).get(AjaxResult.DATA_TAG);
+        List<FaultTreeVo> listToQ = (List<FaultTreeVo>) faultService.listAllTreeStyleBySimType(simType).get(AjaxResult.DATA_TAG);
         // 变成扁平list
         List<FaultTreeVo> listToF = FaultService.flatten(listToQ);
         for (FaultTreeVo o : listToF) {
@@ -106,7 +106,7 @@ public class TaskService {
         if (!simService.checkSimTypeOk(tv.getSimType())) {
             return AjaxResult.error("simType error!");
         }
-        if (!Task.TASK_TYPE_TEACHER_ADD.equals(tv.getTaskType())) {
+        if (!Task.Type.TEACHER_ADD.equals(tv.getTaskType())) {
             return AjaxResult.error("taskType value error!");
         }
         if (StringUtils.isEmpty(tv.getName())) {
@@ -159,15 +159,15 @@ public class TaskService {
     /**
      * 批量删除任务
      *
-     * @param taskIds 需要删除的任务主键
+     * @param ids 需要删除的任务主键
      * @return 结果
      */
     @Transactional
-    public AjaxResult deleteTaskByTaskIds(Long[] taskIds) {
-        if (taskIds == null || taskIds.length == 0) {
+    public AjaxResult deleteTaskByTaskIds(Long[] ids) {
+        if (ids == null || ids.length == 0) {
             return AjaxResult.error("taskIds null!");
         }
-        for (Long tId : taskIds) {
+        for (Long tId : ids) {
             taskMapper.deleteTaskByTaskId(tId);
             taskFaultService.deleteTaskFaultByTaskId(tId);
         }
@@ -202,7 +202,7 @@ public class TaskService {
         if (!simService.checkSimTypeOk(tv.getSimType())) {
             return AjaxResult.error("simType error!");
         }
-        if (!Task.TASK_TYPE_TEACHER_ADD.equals(tv.getTaskType())) {
+        if (!Task.Type.TEACHER_ADD.equals(tv.getTaskType())) {
             return AjaxResult.error("taskType value error!");
         }
         if (StringUtils.isEmpty(tv.getName())) {
@@ -252,11 +252,11 @@ public class TaskService {
     }
 
     /**
-     * 为了新建，返回一个带tree结构的数据对象。
+     * 为了新建Task，返回一个带tree结构的任务详细信息。
      *
      * @return 任务
      */
-    public AjaxResult getInfoForAdd(String simType) {
+    public AjaxResult getInfoForAdd(final String simType) {
         // check
         if (StringUtils.isEmpty(simType)) {
             return AjaxResult.error("simType empty!");
@@ -265,9 +265,7 @@ public class TaskService {
             return AjaxResult.error("simType value error!");
         }
         // query obj.
-        Fault q = new Fault();
-        q.setSimType(simType);
-        List<FaultTreeVo> ftList = (List<FaultTreeVo>) faultService.selectAllTreeViaSimType(simType).get(AjaxResult.DATA_TAG);
+        List<FaultTreeVo> ftList = (List<FaultTreeVo>) faultService.listAllTreeStyleBySimType(simType).get(AjaxResult.DATA_TAG);
         TaskVo t = new TaskVo();
         t.setTaskId(Task.EMPTY_TASK_ID);
         t.setSelectedData(ftList);