修改 RealExamScore 实体相关关联。

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

@@ -3,8 +3,8 @@ package com.ruoyi.sim.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.sim.domain.MxRealExamScore;
-import com.ruoyi.sim.service.impl.MxRealExamScoreService;
+import com.ruoyi.sim.domain.RealExamScore;
+import com.ruoyi.sim.service.impl.RealExamScoreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,15 +31,15 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/system/score")
 public class MxRealExamScoreController extends BaseController {
     @Autowired
-    private MxRealExamScoreService mxRealExamScoreService;
+    private RealExamScoreService realExamScoreService;
 
     /**
      * 查询sim_考试得分结果列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(MxRealExamScore mxRealExamScore) {
+    public TableDataInfo list(RealExamScore realExamScore) {
         startPage();
-        List<MxRealExamScore> list = mxRealExamScoreService.selectMxRealExamScoreList(mxRealExamScore);
+        List<RealExamScore> list = realExamScoreService.selectMxRealExamScoreList(realExamScore);
         return getDataTable(list);
     }
 
@@ -48,9 +48,9 @@ public class MxRealExamScoreController extends BaseController {
      */
     @Log(title = "sim_考试得分结果", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, MxRealExamScore mxRealExamScore) {
-        List<MxRealExamScore> list = mxRealExamScoreService.selectMxRealExamScoreList(mxRealExamScore);
-        ExcelUtil<MxRealExamScore> util = new ExcelUtil<MxRealExamScore>(MxRealExamScore.class);
+    public void export(HttpServletResponse response, RealExamScore realExamScore) {
+        List<RealExamScore> list = realExamScoreService.selectMxRealExamScoreList(realExamScore);
+        ExcelUtil<RealExamScore> util = new ExcelUtil<RealExamScore>(RealExamScore.class);
         util.exportExcel(response, list, "sim_考试得分结果数据");
     }
 
@@ -59,7 +59,7 @@ public class MxRealExamScoreController extends BaseController {
      */
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(mxRealExamScoreService.selectMxRealExamScoreById(id));
+        return success(realExamScoreService.selectMxRealExamScoreById(id));
     }
 
     /**
@@ -67,8 +67,8 @@ public class MxRealExamScoreController extends BaseController {
      */
     @Log(title = "sim_考试得分结果", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody MxRealExamScore mxRealExamScore) {
-        return toAjax(mxRealExamScoreService.insertMxRealExamScore(mxRealExamScore));
+    public AjaxResult add(@RequestBody RealExamScore realExamScore) {
+        return toAjax(realExamScoreService.insertRealExamScore(realExamScore));
     }
 
     /**
@@ -76,8 +76,8 @@ public class MxRealExamScoreController extends BaseController {
      */
     @Log(title = "sim_考试得分结果", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody MxRealExamScore mxRealExamScore) {
-        return toAjax(mxRealExamScoreService.updateMxRealExamScore(mxRealExamScore));
+    public AjaxResult edit(@RequestBody RealExamScore realExamScore) {
+        return toAjax(realExamScoreService.updateRealExamScore(realExamScore));
     }
 
     /**
@@ -86,6 +86,6 @@ public class MxRealExamScoreController extends BaseController {
     @Log(title = "sim_考试得分结果", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(mxRealExamScoreService.deleteMxRealExamScoreByIds(ids));
+        return toAjax(realExamScoreService.deleteRealExamScoreByIds(ids));
     }
 }

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

@@ -138,7 +138,7 @@ public class RealExamCollectionController extends BaseController {
         return service.deleteRefTypeSelfExercise();
     }
 
-    @DeleteMapping("/teacher/ref/{examCollectionId}")
+    @PostMapping("/teacher/ref/{examCollectionId}")
     @ApiOperation("[教师]删除一个考试集合包括关联数据")
     public AjaxResult deleteRef(@PathVariable Long examCollectionId) {
         return service.deleteRef(examCollectionId);

ruoyi-sim/src/main/java/com/ruoyi/sim/domain/MxRealExamScore.java → ruoyi-sim/src/main/java/com/ruoyi/sim/domain/RealExamScore.java

@@ -11,7 +11,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-08-21
  */
-public class MxRealExamScore extends BaseEntity {
+public class RealExamScore extends BaseEntity {
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -316,8 +317,8 @@ public class MxRealExamScore extends BaseEntity {
                 .append("otherReplace", getOtherReplace())
                 .append("otherReport", getOtherReport())
                 .append("otherJielun", getOtherJielun())
-                .append("createtime", getCreateTime())
-                .append("updatetime", getUpdateTime())
+//                .append("createtime", getCreateTime())
+//                .append("updatetime", getUpdateTime())
                 .toString();
     }
 }

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

@@ -4,6 +4,7 @@ import com.ruoyi.sim.domain.Fault;
 import com.ruoyi.sim.domain.Seat;
 import com.ruoyi.sim.domain.Sim;
 import com.ruoyi.sim.domain.SimMsg;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 public class FaultCheckVo {
 
@@ -78,4 +79,17 @@ public class FaultCheckVo {
     public void setCheckOk(boolean checkOk) {
         this.checkOk = checkOk;
     }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("seat", seat)
+                .append("sim", sim)
+                .append("fault", fault)
+                .append("simMsgSend", simMsgSend)
+                .append("simMsgReceive", simMsgReceive)
+                .append("errorMsg", errorMsg)
+                .append("checkOk", checkOk)
+                .toString();
+    }
 }

ruoyi-sim/src/main/java/com/ruoyi/sim/mapper/MxRealExamScoreMapper.java → ruoyi-sim/src/main/java/com/ruoyi/sim/mapper/RealExamScoreMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.sim.mapper;
 
-import com.ruoyi.sim.domain.MxRealExamScore;
+import com.ruoyi.sim.domain.RealExamScore;
 
 import java.util.List;
 
@@ -10,38 +10,38 @@ import java.util.List;
  * @author ruoyi
  * @date 2025-08-21
  */
-public interface MxRealExamScoreMapper {
+public interface RealExamScoreMapper {
     /**
      * 查询sim_考试得分结果
      *
      * @param id sim_考试得分结果主键
      * @return sim_考试得分结果
      */
-    public MxRealExamScore selectMxRealExamScoreById(Long id);
+    public RealExamScore selectMxRealExamScoreById(Long id);
 
     /**
      * 查询sim_考试得分结果列表
      *
-     * @param mxRealExamScore sim_考试得分结果
+     * @param realExamScore sim_考试得分结果
      * @return sim_考试得分结果集合
      */
-    public List<MxRealExamScore> selectMxRealExamScoreList(MxRealExamScore mxRealExamScore);
+    public List<RealExamScore> selectMxRealExamScoreList(RealExamScore realExamScore);
 
     /**
      * 新增sim_考试得分结果
      *
-     * @param mxRealExamScore sim_考试得分结果
+     * @param realExamScore sim_考试得分结果
      * @return 结果
      */
-    public int insertMxRealExamScore(MxRealExamScore mxRealExamScore);
+    public int insertMxRealExamScore(RealExamScore realExamScore);
 
     /**
      * 修改sim_考试得分结果
      *
-     * @param mxRealExamScore sim_考试得分结果
+     * @param realExamScore sim_考试得分结果
      * @return 结果
      */
-    public int updateMxRealExamScore(MxRealExamScore mxRealExamScore);
+    public int updateMxRealExamScore(RealExamScore realExamScore);
 
     /**
      * 删除sim_考试得分结果

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

@@ -19,6 +19,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.print.DocFlavor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -821,6 +822,14 @@ public class CommSendService {
                     mapE.put(vo.getFault().getFaultId(), vo.getSimMsgReceive());
                     l.info("put key = {}", vo.getFault().getFaultId());
                 }
+                l.info("debug@FaultCheckVo = {}", vo);
+                if (StringUtils.equals(
+                        Objects.requireNonNull(vo).getFault().getFaultId(),
+                        FaultIdConst.T0001.F09)) {
+                    if (!StringUtils.equals(vo.getSimMsgReceive().getReceiveSubContentData(), "00000002")) {
+                        return AjaxResult.error("电池舱盖没有关闭 或 电池接触不良。<br/>请关闭电池舱盖 并 正确安装电池后重试。");
+                    }
+                }
             }
             if (
                     mapE.containsKey(FaultIdConst.T0001.F01) &&
@@ -832,10 +841,10 @@ public class CommSendService {
                             mapE.containsKey(FaultIdConst.T0001.F08) &&
                             mapE.containsKey(FaultIdConst.T0001.F0A)
             ) {
-                return AjaxResult.error("模拟器FZD04B电池舱盖没有关闭，请关闭后重试。");
+                return AjaxResult.error("电池接触不良，请安装后重试。");
             }
         }
-        return AjaxResult.success("所有故障部位检查没有问题。");
+        return AjaxResult.success("检查成功！");
     }
 
     private String buildKeyType0003(String bindHardwareMsg) {

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

@@ -1,80 +0,0 @@
-package com.ruoyi.sim.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.sim.domain.MxRealExamScore;
-import com.ruoyi.sim.mapper.MxRealExamScoreMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * sim_考试得分结果Service业务层处理
- *
- * @author ruoyi
- * @date 2025-08-21
- */
-@Service
-public class MxRealExamScoreService {
-    @Autowired
-    private MxRealExamScoreMapper mxRealExamScoreMapper;
-
-    /**
-     * 查询sim_考试得分结果
-     *
-     * @param id sim_考试得分结果主键
-     * @return sim_考试得分结果
-     */
-    public MxRealExamScore selectMxRealExamScoreById(Long id) {
-        return mxRealExamScoreMapper.selectMxRealExamScoreById(id);
-    }
-
-    /**
-     * 查询sim_考试得分结果列表
-     *
-     * @param mxRealExamScore sim_考试得分结果
-     * @return sim_考试得分结果
-     */
-    public List<MxRealExamScore> selectMxRealExamScoreList(MxRealExamScore mxRealExamScore) {
-        return mxRealExamScoreMapper.selectMxRealExamScoreList(mxRealExamScore);
-    }
-
-    /**
-     * 新增sim_考试得分结果
-     *
-     * @param mxRealExamScore sim_考试得分结果
-     * @return 结果
-     */
-    public int insertMxRealExamScore(MxRealExamScore mxRealExamScore) {
-        return mxRealExamScoreMapper.insertMxRealExamScore(mxRealExamScore);
-    }
-
-    /**
-     * 修改sim_考试得分结果
-     *
-     * @param mxRealExamScore sim_考试得分结果
-     * @return 结果
-     */
-    public int updateMxRealExamScore(MxRealExamScore mxRealExamScore) {
-        return mxRealExamScoreMapper.updateMxRealExamScore(mxRealExamScore);
-    }
-
-    /**
-     * 批量删除sim_考试得分结果
-     *
-     * @param ids 需要删除的sim_考试得分结果主键
-     * @return 结果
-     */
-    public int deleteMxRealExamScoreByIds(Long[] ids) {
-        return mxRealExamScoreMapper.deleteMxRealExamScoreByIds(ids);
-    }
-
-    /**
-     * 删除sim_考试得分结果信息
-     *
-     * @param id sim_考试得分结果主键
-     * @return 结果
-     */
-    public int deleteMxRealExamScoreById(Long id) {
-        return mxRealExamScoreMapper.deleteMxRealExamScoreById(id);
-    }
-}

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

@@ -133,8 +133,6 @@ public class RealExamCompRequestService extends Ele6RYBaseService {
         RealExamCompRequest q = new RealExamCompRequest();
         q.setExamId(examId);
         List<RealExamCompRequest> list = selectRealExamCompRequestList(q);
-        list.forEach(ecr -> {
-            deleteRealExamCompRequestByRelId(ecr.getRelId());
-        });
+        list.forEach(ecr -> deleteRealExamCompRequestByRelId(ecr.getRelId()));
     }
 }

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

@@ -0,0 +1,94 @@
+package com.ruoyi.sim.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.sim.domain.RealExamScore;
+import com.ruoyi.sim.mapper.RealExamScoreMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * sim_考试得分结果Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-08-21
+ */
+@Service
+public class RealExamScoreService {
+    @Autowired
+    private RealExamScoreMapper realExamScoreMapper;
+
+    /**
+     * 查询sim_考试得分结果
+     *
+     * @param id sim_考试得分结果主键
+     * @return sim_考试得分结果
+     */
+    public RealExamScore selectMxRealExamScoreById(Long id) {
+        return realExamScoreMapper.selectMxRealExamScoreById(id);
+    }
+
+    /**
+     * 查询sim_考试得分结果列表
+     *
+     * @param realExamScore sim_考试得分结果
+     * @return sim_考试得分结果
+     */
+    public List<RealExamScore> selectMxRealExamScoreList(RealExamScore realExamScore) {
+        return realExamScoreMapper.selectMxRealExamScoreList(realExamScore);
+    }
+
+    /**
+     * 新增sim_考试得分结果
+     *
+     * @param realExamScore sim_考试得分结果
+     * @return 结果
+     */
+    public int insertRealExamScore(RealExamScore realExamScore) {
+        return realExamScoreMapper.insertMxRealExamScore(realExamScore);
+    }
+
+    /**
+     * 修改sim_考试得分结果
+     *
+     * @param realExamScore sim_考试得分结果
+     * @return 结果
+     */
+    public int updateRealExamScore(RealExamScore realExamScore) {
+        return realExamScoreMapper.updateMxRealExamScore(realExamScore);
+    }
+
+    /**
+     * 批量删除sim_考试得分结果
+     *
+     * @param ids 需要删除的sim_考试得分结果主键
+     * @return 结果
+     */
+    public int deleteRealExamScoreByIds(Long[] ids) {
+        return realExamScoreMapper.deleteMxRealExamScoreByIds(ids);
+    }
+
+    /**
+     * 删除sim_考试得分结果信息
+     *
+     * @param id sim_考试得分结果主键
+     * @return 结果
+     */
+    public int deleteRealExamScoreById(Long id) {
+        return realExamScoreMapper.deleteMxRealExamScoreById(id);
+    }
+
+    // -------------------------------- tom add  --------------------------------
+
+    /**
+     * 删除mx_real_exam_score表关联数据
+     *
+     * @param examId
+     */
+    public void deleteRefByExamId(Long examId) {
+        RealExamScore q = new RealExamScore();
+        q.setExamId(examId);
+        List<RealExamScore> list = selectMxRealExamScoreList(q);
+        list.forEach(es -> deleteRealExamScoreById(es.getId()));
+    }
+}

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

@@ -117,6 +117,8 @@ public class RealExamService {
     private SocketService socketService;
     @Autowired
     private RealExamCompRequestService realExamCompRequestService;
+    @Autowired
+    private RealExamScoreService realExamScoreService;
 
     /**
      * examId 是否有效。
@@ -863,9 +865,9 @@ public class RealExamService {
             // 删除mx_real_exam_fault表关联数据
             realExamFaultService.deleteRefByExamId(examId);
             // 删除mx_real_exam_comp_request表关联数据
-            realExamCompRequestService.deleteRefByExamId(e.getExamId());
+            realExamCompRequestService.deleteRefByExamId(examId);
             // 删除mx_real_exam_score表关联数据
-
+            realExamScoreService.deleteRefByExamId(examId);
         });
     }
 }

ruoyi-sim/src/main/resources/mapper/sim/MxRealExamScoreMapper.xml → ruoyi-sim/src/main/resources/mapper/sim/RealExamScoreMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sim.mapper.MxRealExamScoreMapper">
+<mapper namespace="com.ruoyi.sim.mapper.RealExamScoreMapper">
 
-    <resultMap type="MxRealExamScore" id="MxRealExamScoreResult">
+    <resultMap type="RealExamScore" id="RealExamScoreResult">
         <result property="id" column="id"/>
         <result property="examCollectionId" column="exam_collection_id"/>
         <result property="examId" column="exam_id"/>
@@ -25,8 +25,8 @@
         <result property="otherReplace" column="other_replace"/>
         <result property="otherReport" column="other_report"/>
         <result property="otherJielun" column="other_jielun"/>
-        <result property="createtime" column="createtime"/>
-        <result property="updatetime" column="updatetime"/>
+        <result property="createTime" column="createtime"/>
+        <result property="updateTime" column="updatetime"/>
     </resultMap>
 
     <sql id="selectMxRealExamScoreVo">
@@ -55,7 +55,7 @@
         from mx_real_exam_score
     </sql>
 
-    <select id="selectMxRealExamScoreList" parameterType="MxRealExamScore" resultMap="MxRealExamScoreResult">
+    <select id="selectMxRealExamScoreList" parameterType="RealExamScore" resultMap="RealExamScoreResult">
         <include refid="selectMxRealExamScoreVo"/>
         <where>
             <if test="examCollectionId != null ">and exam_collection_id = #{examCollectionId}</if>
@@ -77,17 +77,17 @@
             <if test="otherReplace != null  and otherReplace != ''">and other_replace = #{otherReplace}</if>
             <if test="otherReport != null  and otherReport != ''">and other_report = #{otherReport}</if>
             <if test="otherJielun != null  and otherJielun != ''">and other_jielun = #{otherJielun}</if>
-            <if test="createtime != null ">and createtime = #{createtime}</if>
-            <if test="updatetime != null ">and updatetime = #{updatetime}</if>
+            <if test="createTime != null ">and createtime = #{createTime}</if>
+            <if test="updateTime != null ">and updatetime = #{updateTime}</if>
         </where>
     </select>
 
-    <select id="selectMxRealExamScoreById" parameterType="Long" resultMap="MxRealExamScoreResult">
+    <select id="selectMxRealExamScoreById" parameterType="Long" resultMap="RealExamScoreResult">
         <include refid="selectMxRealExamScoreVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertMxRealExamScore" parameterType="MxRealExamScore" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMxRealExamScore" parameterType="RealExamScore" useGeneratedKeys="true" keyProperty="id">
         insert into mx_real_exam_score
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="examCollectionId != null">exam_collection_id,</if>
@@ -109,8 +109,8 @@
             <if test="otherReplace != null">other_replace,</if>
             <if test="otherReport != null">other_report,</if>
             <if test="otherJielun != null">other_jielun,</if>
-            <if test="createtime != null">createtime,</if>
-            <if test="updatetime != null">updatetime,</if>
+            <if test="createTime != null">createtime,</if>
+            <if test="updateTime != null">updatetime,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="examCollectionId != null">#{examCollectionId},</if>
@@ -132,12 +132,12 @@
             <if test="otherReplace != null">#{otherReplace},</if>
             <if test="otherReport != null">#{otherReport},</if>
             <if test="otherJielun != null">#{otherJielun},</if>
-            <if test="createtime != null">#{createtime},</if>
-            <if test="updatetime != null">#{updatetime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
         </trim>
     </insert>
 
-    <update id="updateMxRealExamScore" parameterType="MxRealExamScore">
+    <update id="updateMxRealExamScore" parameterType="RealExamScore">
         update mx_real_exam_score
         <trim prefix="SET" suffixOverrides=",">
             <if test="examCollectionId != null">exam_collection_id = #{examCollectionId},</if>
@@ -159,8 +159,8 @@
             <if test="otherReplace != null">other_replace = #{otherReplace},</if>
             <if test="otherReport != null">other_report = #{otherReport},</if>
             <if test="otherJielun != null">other_jielun = #{otherJielun},</if>
-            <if test="createtime != null">createtime = #{createtime},</if>
-            <if test="updatetime != null">updatetime = #{updatetime},</if>
+            <if test="createTime != null">createtime = #{createTime},</if>
+            <if test="updateTime != null">updatetime = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>