Jelajahi Sumber

添加删除训练、练习、考试 相关的方法。

tom 3 minggu lalu
induk
melakukan
9dbf13caed

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

@@ -119,12 +119,11 @@ public class RealExamCollectionService extends Ele6RYBaseService {
         startPage();
         q.setExamCollectionType(RealExamCollection.Type.EXAM);
         List<RealExamCollectionVo> list = Collections.emptyList();
-        realExamCollectionMapper.selectRealExamCollectionList(q)
-                .forEach((RealExamCollection s) -> {
-                    RealExamCollectionVo t = new RealExamCollectionVo();
-                    BeanUtils.copyProperties(s, t);
-                    list.add(t);
-                });
+        realExamCollectionMapper.selectRealExamCollectionList(q).forEach((RealExamCollection s) -> {
+            RealExamCollectionVo t = new RealExamCollectionVo();
+            BeanUtils.copyProperties(s, t);
+            list.add(t);
+        });
         return getDataTable(list);
     }
 
@@ -150,8 +149,7 @@ public class RealExamCollectionService extends Ele6RYBaseService {
      * [教师]获取考试集合详细信息
      */
     public AjaxResult getExamInfoByTeacher(Long id) {
-        RealExamCollection f = realExamCollectionMapper.
-                selectRealExamCollectionByExamCollectionId(id);
+        RealExamCollection f = realExamCollectionMapper.selectRealExamCollectionByExamCollectionId(id);
         return AjaxResult.success(f);
     }
 
@@ -159,8 +157,7 @@ public class RealExamCollectionService extends Ele6RYBaseService {
      * [教师]获取练习集合详细信息
      */
     public AjaxResult getExerciseInfoByTeacher(Long id) {
-        RealExamCollection f = realExamCollectionMapper.
-                selectRealExamCollectionByExamCollectionId(id);
+        RealExamCollection f = realExamCollectionMapper.selectRealExamCollectionByExamCollectionId(id);
         return AjaxResult.success(f);
     }
 
@@ -470,11 +467,10 @@ public class RealExamCollectionService extends Ele6RYBaseService {
     private void closeAllByType(final String type) {
         RealExamCollection q = new RealExamCollection();
         q.setExamCollectionType(type);
-        selectRealExamCollectionList(q)
-                .forEach((RealExamCollection ec) -> {
-                    ec.setExamCollectionState(RealExamCollection.State.CLOSED);
-                    updateRealExamCollection(ec);
-                });
+        selectRealExamCollectionList(q).forEach((RealExamCollection ec) -> {
+            ec.setExamCollectionState(RealExamCollection.State.CLOSED);
+            updateRealExamCollection(ec);
+        });
     }
 
     /**
@@ -507,4 +503,20 @@ public class RealExamCollectionService extends Ele6RYBaseService {
         }
         return list.get(0);
     }
+
+    public void deleteRefTypeSelfExercise() {
+        RealExamCollection q = new RealExamCollection();
+        q.setExamCollectionType(RealExamCollection.Type.SELF_EXERCISE);
+        List<RealExamCollection> list = selectRealExamCollectionList(q);
+        list.forEach((RealExamCollection rec) -> {
+            deleteRef(rec.getExamCollectionId());
+        });
+    }
+
+    public void deleteRef(Long id) {
+        // delete ref exam data.
+        realExamService.deleteRefByExamCollectionId(id);
+        // 
+        deleteRealExamCollectionByExamCollectionId(id);
+    }
 }

+ 9 - 0
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamFaultService.java

@@ -381,4 +381,13 @@ public class RealExamFaultService {
         // todo:
         return null;
     }
+
+    public void deleteRefByExamId(Long examId) {
+        RealExamFault q = new RealExamFault();
+        q.setExamId(examId);
+        List<RealExamFault> list = selectRealExamFaultList(q);
+        list.forEach(ref -> {
+            deleteRealExamFaultByRefId(ref.getRefId());
+        });
+    }
 }

+ 12 - 2
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/RealExamService.java

@@ -8,7 +8,6 @@ import com.ruoyi.sim.config.SimConfig;
 import com.ruoyi.sim.config.SimDebugConfig;
 import com.ruoyi.sim.domain.*;
 import com.ruoyi.sim.domain.vo.*;
-import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -363,7 +362,7 @@ public class RealExamService {
             l.info("座次数据检验正确");
         }
         // Check:ping通 路由器。
-        {
+        if (false) {
             AjaxResult ar = commCheckService.checkRouterState(simConfig.getRouterIp());
             if (ar.isError()) {
                 return ar;
@@ -820,4 +819,15 @@ public class RealExamService {
             }
         }
     }
+
+    public void deleteRefByExamCollectionId(Long examCollectionId) {
+        RealExam q = new RealExam();
+        q.setExamCollectionId(examCollectionId);
+        List<RealExam> list = selectRealExamList(q);
+        list.forEach(e -> {
+            // delete ref exam fault data.
+            realExamFaultService.deleteRefByExamId(e.getExamId());
+            deleteRealExamByExamId(e.getExamId());
+        });
+    }
 }