关闭所有 考试+练习+训练。

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

@@ -2,7 +2,6 @@ package com.ruoyi.sim.controller;
 
 import cn.ele6.catalyzer.ruoyi.vue.enhance.TableDataInfo;
 import com.ruoyi.sim.domain.vo.RealExamCollectionVo;
-import com.ruoyi.sim.service.impl.CommSendService;
 import com.ruoyi.sim.service.impl.RealExamCollectionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -129,7 +128,7 @@ public class RealExamCollectionController extends BaseController {
     @ApiOperation("[教师][正式使用]关闭考试+训练+练习")
     public AjaxResult closeAll() {
         l.info("[教师][正式使用]关闭考试+训练+练习");
-        return service.closeAll();
+        return service.closeAllAnyType();
     }
 
     @DeleteMapping("/teacher/self-exercise/all")

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

@@ -1268,7 +1268,7 @@ public class CommSendService {
      * @return
      */
     public AjaxResult debugResetAnything() {
-        // Step:关闭所有Socket连接
+        // Step:主动关闭所有Socket连接
         socketService.closeAll();
         // Step:ping路由器，返回在线情况。
 
@@ -1286,6 +1286,8 @@ public class CommSendService {
 
         // Step:所有连接的模拟器，读取每一个模拟器的各个故障，是否处于考试准备ok状态
 
+        // Step:关闭所有 考试+练习+训练
+        realExamCollectionService.closeAllAnyType();
         // 删除debug表中所有数据。
         debugFaultService.deleteAll();
         return AjaxResult.success("全部重置成功。" + SimDateUtil.getNow());

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

@@ -478,10 +478,10 @@ public class RealExamCollectionService extends Ele6RYBaseService {
      *
      * @return
      */
-    public AjaxResult closeAll() {
+    public AjaxResult closeAllAnyType() {
+        closeAllByType(RealExamCollection.Type.EXAM);
         closeAllByType(RealExamCollection.Type.EXERCISE);
         closeAllByType(RealExamCollection.Type.SELF_EXERCISE);
-        closeAllByType(RealExamCollection.Type.EXAM);
         return AjaxResult.success("所有考试、训练、练习的集合被关闭");
     }