删除 打开 考试、训练 的提示。

ruoyi-sim/src/main/java/com/ruoyi/sim/constant/ErrorConst.java

@@ -236,4 +236,12 @@ public interface ErrorConst {
     Integer T60018 = 60018;
 
     String M60018 = "交卷失败！考试数据不完整。";
+
+    Integer T60019 = 60019;
+
+    String M60019 = "关闭训练后，才能删除！";
+
+    Integer T60020 = 60020;
+
+    String M60020 = "关闭考试后，才能删除！";
 }

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

@@ -155,6 +155,7 @@ public class CommReceiveService {
      * @return AjaxResult obj Vo对象 checkOk = true 表示检查成功,否则失败。
      */
     public AjaxResult getOneFaultStartCheck(FaultCheckVo vo) {
+
         l.info("getOneFaultCheck vo = {}", vo);
         SimMsg sm = vo.getSimMsgReceive();
         Sim s = vo.getSim();
@@ -184,8 +185,10 @@ public class CommReceiveService {
         if (StringUtils.equals(s.getSimType(), Sim.TYPE_0003)) {
 
         }
+        String faultId = Objects.requireNonNull(f, "f is null!").getFaultId();
+        String replaceName = Objects.requireNonNull(f, "f is null!").getReplaceName();
         // 是否在 故障部位 跳过检查 白名单中。
-        if (FaultConst.CHECK_PASS_SET.contains(f.getFaultId())) {
+        if (FaultConst.CHECK_PASS_SET.contains(faultId)) {
             vo.setErrorMsg("");
             vo.setCheckOk(true);
             // 跳过检查，直接返回成功。
@@ -194,18 +197,18 @@ public class CommReceiveService {
         // 是否是
         // 2型的 检测干燥管 或
         // 3型的 检测干燥管
-        if (FaultConst.GAN_ZAO_GUAN_SET.contains(f.getFaultId())) {
+        if (FaultConst.GAN_ZAO_GUAN_SET.contains(faultId)) {
             // 判断必须存在
             String existMsg = CommParseUtils.receiveSubContentData46(sm);
             if (!GUAN_EXIST_YES.equals(existMsg)) {
-                String eMsg = "[" + f.getReplaceName() + "]可换件异常;<br>" +
-                        "请正确安装[" + f.getReplaceName() + "]后再次开始考试。<br>";
+                String eMsg = "[" + replaceName + "]可换件异常;<br>" +
+                        "请正确安装[" + replaceName + "]后再次开始考试。<br>";
                 l.info(eMsg);
                 vo.setErrorMsg(eMsg);
                 vo.setCheckOk(false);
-                if (Objects.equals(FaultIdConst.T0002.F09, f.getFaultId())) {
+                if (Objects.equals(FaultIdConst.T0002.F09, faultId)) {
                     return ArBuilder.error(T22009, eMsg, vo);
-                } else if (Objects.equals(FaultIdConst.T0003.F07, f.getFaultId())) {
+                } else if (Objects.equals(FaultIdConst.T0003.F07, faultId)) {
                     return ArBuilder.error(T23007, eMsg, vo);
                 } else {
                     return ArBuilder.error(T20007, eMsg, vo);
@@ -215,12 +218,12 @@ public class CommReceiveService {
         // 非空判断
         {
             if (StringUtils.equals(CONTENT_BLANK, contentData)) {
-                String eMsg = "[" + f.getReplaceName() + "]可换件异常;<br>";
+                String eMsg = "[" + replaceName + "]可换件异常;<br>";
                 l.info(eMsg);
                 l.info("fault {}", f);
                 vo.setErrorMsg(eMsg);
                 vo.setCheckOk(false);
-                if (StringUtils.equals(FaultIdConst.T0001.F01, f.getFaultId())) {
+                if (StringUtils.equals(FaultIdConst.T0001.F01, faultId)) {
                     return ArBuilder.error(T21001, eMsg + "检查电池安装情况。可能电池接触不良，请按紧后重试！", vo);
                 }
                 return ArBuilder.error(T20005, eMsg, vo);
@@ -228,10 +231,10 @@ public class CommReceiveService {
         }
         // 可换件id 最小值 最大值 判断
         {
-            if (FaultConst.CHECK_PASS_SET.contains(f.getFaultId()) ||
-                    FaultConst.GAN_ZAO_GUAN_SET.contains(f.getFaultId())
+            if (FaultConst.CHECK_PASS_SET.contains(faultId) ||
+                    FaultConst.GAN_ZAO_GUAN_SET.contains(faultId)
             ) {
-                l.info("Not check id f = {}", f.getFaultId());
+                l.info("Not check id f = {}", faultId);
             } else {
                 String id = CommParseUtils.receiveSubContentData68(sm);
                 int idDec = Integer.parseInt(id, 16);
@@ -242,7 +245,6 @@ public class CommReceiveService {
                     return ArBuilder.error(T20012, M20012, vo);
                 }
             }
-
         }
         // final ok.
         vo.setErrorMsg("");

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

@@ -9,8 +9,8 @@ import cn.ele6.catalyzer.ruoyi.vue.custom.Ele6RYBaseService;
 import cn.ele6.catalyzer.ruoyi.vue.enhance.TableDataInfo;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.sim.constant.ArBuilder;
 import com.ruoyi.sim.domain.RealExam;
-import com.ruoyi.sim.domain.Sim;
 import com.ruoyi.sim.domain.vo.RealExamCollectionVo;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -24,6 +24,8 @@ import com.ruoyi.sim.domain.RealExamCollection;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import static com.ruoyi.sim.constant.ErrorConst.*;
+
 /**
  * 考试集合Service业务层处理
  *
@@ -567,9 +569,9 @@ public class RealExamCollectionService extends Ele6RYBaseService {
         RealExamCollection ec = selectRealExamCollectionByExamCollectionId(id);
         if (StringUtils.equals(ec.getExamCollectionState(), RealExamCollection.State.OPENED)) {
             if (StringUtils.equals(ec.getExamCollectionType(), RealExamCollection.Type.EXERCISE)) {
-                return AjaxResult.error("关闭训练后，才能删除！");
+                return ArBuilder.error(T60019, M60019);
             } else if (StringUtils.equals(ec.getExamCollectionType(), RealExamCollection.Type.EXAM)) {
-                return AjaxResult.error("关闭考试后，才能删除！");
+                return AjaxResult.error(T60020, M60020);
             }
         }
         // 删除mx_real_exam_collection表数据