tom il y a 1 semaine
Parent
commit
b7fd750c45

+ 1 - 1
ruoyi-sim/src/main/java/com/ruoyi/sim/domain/SimMsg.java

@@ -318,7 +318,7 @@ public class SimMsg extends BaseEntity {
          * 报文校验码错误。
          * todo:没有启用。
          */
-        Integer VERIFY_ERROR = 540;
+        Integer CRC_ERROR = 540;
         /**
          * 重要报文在运行,低优先级的跳过
          */

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

@@ -1065,6 +1065,7 @@ public class CommSendService {
             // 先进行Socket相关处理。
 
             // 优先级高的在运行,跳过
+            // todo:
             if (importantTask == false && socketService.getImportantTaskRunning(sspv)) {
                 sm.setResult(SimMsg.Result.SKIP);
                 socketService.setImportantTaskRunning(sspv, false);

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

@@ -564,6 +564,14 @@ public class RealExamCollectionService extends Ele6RYBaseService {
      * @return 支持删除考试、训练
      */
     public AjaxResult deleteRef(final Long id) {
+        RealExamCollection ec = selectRealExamCollectionByExamCollectionId(id);
+        if (StringUtils.equals(ec.getExamCollectionState(), RealExamCollection.State.OPENED)) {
+            if (StringUtils.equals(ec.getExamCollectionType(), RealExamCollection.Type.EXERCISE)) {
+                return AjaxResult.error("关闭训练后,才能删除!");
+            } else if (StringUtils.equals(ec.getExamCollectionType(), RealExamCollection.Type.EXAM)) {
+                return AjaxResult.error("关闭考试后,才能删除!");
+            }
+        }
         // 删除mx_real_exam_collection表数据
         int count = deleteRealExamCollectionByExamCollectionId(id);
         l.info("考试集合删除数量 = {}", count);