钢轨破模和曲线破模分析相关接口提交--shizhilong

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/algorithm/AnalysisAlgorithmLine.java

@@ -36,10 +36,18 @@ public class AnalysisAlgorithmLine {
     @Resource
     private IAnalysisLineBatchUnitDeviceRailWearInfoService analysisLineBatchUnitDeviceRailWearInfoService;
     @Resource
+    private IAnalysisLineBatchUnitDeviceCurveWearInfoService analysisLineBatchUnitDeviceCurveWearInfoService;
+    @Resource
+    private IAnalysisLineBatchUnitDeviceCorrugationInfoService analysisLineBatchUnitDeviceCorrugationInfoService;
+    @Resource
     private IRecordsMasterTurnoutInfoService turnoutInfoService;
     @Resource
     private IRailWearRecordService railWearRecordService;
     @Resource
+    private ICorrugationRecordService corrugationRecordService;
+    @Resource
+    private ICurveWearRecordService curveWearRecordService;
+    @Resource
     private IAnalysisLineBatchUnitDeviceService unitDeviceService;
     @Resource
     private IRecordsMasterCheckService masterCheckService;
@@ -82,21 +90,29 @@ public class AnalysisAlgorithmLine {
 
             } else if ("2" == checkDataMap.getEkType()) {
                 //2-钢轨常规探伤检查
-                //原来道岔检查单元信息详情删除
+                //原来钢轨常规探伤检查单元信息详情删除
                 LambdaQueryWrapper<AnalysisLineBatchUnitDeviceRailWearInfo> wrapper3 = Wrappers.lambdaQuery();
                 wrapper3.eq(AnalysisLineBatchUnitDeviceRailWearInfo::getAnalysisBatchId, analysisLineBatch.getId());
                 analysisLineBatchUnitDeviceRailWearInfoService.remove(wrapper3);
                 railWearInfoCheckDataLineAnalysis(analysisLineBatch, checkDataMap, unitDeviceList);
 
+            } else if ("3" == checkDataMap.getEkType()) {
+                //3-曲线钢轨磨耗检查
+                //原来曲线钢轨磨耗检查单元信息详情删除
+                LambdaQueryWrapper<AnalysisLineBatchUnitDeviceCurveWearInfo> wrapper3 = Wrappers.lambdaQuery();
+                wrapper3.eq(AnalysisLineBatchUnitDeviceCurveWearInfo::getAnalysisBatchId, analysisLineBatch.getId());
+                analysisLineBatchUnitDeviceCurveWearInfoService.remove(wrapper3);
+                curveWearInfoCheckDataAnalysis(analysisLineBatch, checkDataMap, unitDeviceList);
+
+            } else if ("4" == checkDataMap.getEkType()) {
+                //4-钢轨波磨检查
+                //原来钢轨波磨检查单元信息详情删除
+                LambdaQueryWrapper<AnalysisLineBatchUnitDeviceCorrugationInfo> wrapper3 = Wrappers.lambdaQuery();
+                wrapper3.eq(AnalysisLineBatchUnitDeviceCorrugationInfo::getAnalysisBatchId, analysisLineBatch.getId());
+                analysisLineBatchUnitDeviceCorrugationInfoService.remove(wrapper3);
+                corrugationInfoCheckDataAnalysis(analysisLineBatch, checkDataMap, unitDeviceList);
             }
-//            else if ("3" == checkDataMap.getEkType()) {
-//                //3-曲线钢轨磨耗检查
-//                railVehicleCheckDataAnalysis(analysisBatch, checkDataMap, unitDeviceList);
-//
-//            } else if ("4" == checkDataMap.getEkType()) {
-//                //4-钢轨波磨检查
-//                addInstrumentAnalysis(analysisBatch, checkDataMap, unitDeviceList);
-//            } else if ("5" == checkDataMap.getEkType()) {
+//            else if ("5" == checkDataMap.getEkType()) {
 //                //5-道床检查
 //
 //            } else {
@@ -110,6 +126,84 @@ public class AnalysisAlgorithmLine {
         log.info("[分析完成]|线程id:【" + Thread.currentThread().getId() + "】=============分析批次ID:【" + analysisLineBatchId + "】");
     }
 
+    /**
+     * 病害分析->钢轨波磨病害分析批次数据、检查批次、1-钢轨,2-曲线,3-竖曲线,4-道岔
+     */
+    public void corrugationInfoCheckDataAnalysis(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
+            checkDataMap, List<Map<String, Object>> unitDeviceList) {
+        //初始化单元表
+        List<AnalysisLineBatchUnitDevice> unitList = new ArrayList<>();
+        //初始化钢轨波磨病害分析单元表详情
+        List<AnalysisLineBatchUnitDeviceCorrugationInfo> unitInfoList = new ArrayList<>();
+        //获取检查记录详情
+        List<CorrugationRecord> ekList = corrugationRecordService.lambdaQuery().eq(CorrugationRecord::getRecordsMasterCheckId, checkDataMap.getEkId()).eq(CorrugationRecord::getDelFlag, "0")
+                .list();
+        //按设备单元编号分组检查记录详情
+        Map<String, List<CorrugationRecord>> deviceProjectList = ekList.stream().collect(Collectors.groupingBy(CorrugationRecord::getDeviceProjectCode));
+        if (CollectionUtils.isNotEmpty(ekList)) {
+            for (Map<String, Object> map : unitDeviceList) {
+                //获取分析批次筛选的单元设备编码
+                String unitCode = map.get("unitCode").toString();
+                //判断分析批次的设备与检查时维护的设备是同一个设备
+                List<CorrugationRecord> corrugationRecordList = deviceProjectList.get(unitCode);
+                if (CollectionUtils.isNotEmpty(corrugationRecordList)) {
+                    String deviceCode = map.get("deviceCode").toString();
+                    //保存单元信息
+                    String deviceId = saveUnit(analysisLineBatch, checkDataMap, map, unitList, deviceCode);
+                    corrugationRecordList.forEach(model -> {
+                        //保存道岔单元信息详情
+                        saveCorrugationRecordUnitInfo(analysisLineBatch, checkDataMap, unitInfoList, model, deviceId);
+                    });
+                }
+            }
+        }
+        if (CollectionUtils.isNotEmpty(unitList)) {
+            unitDeviceService.saveBatch(unitList);
+        }
+        if (CollectionUtils.isNotEmpty(unitInfoList)) {
+            analysisLineBatchUnitDeviceCorrugationInfoService.saveBatch(unitInfoList);
+        }
+    }
+
+    /**
+     * 病害分析->曲线磨耗病害分析批次数据、检查批次、1-钢轨,2-曲线,3-竖曲线,4-道岔
+     */
+    public void curveWearInfoCheckDataAnalysis(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
+            checkDataMap, List<Map<String, Object>> unitDeviceList) {
+        //初始化单元表
+        List<AnalysisLineBatchUnitDevice> unitList = new ArrayList<>();
+        //初始化曲线钢轨磨耗病害分析单元表详情
+        List<AnalysisLineBatchUnitDeviceCurveWearInfo> unitInfoList = new ArrayList<>();
+        //获取检查记录详情
+        List<CurveWearRecord> ekList = curveWearRecordService.lambdaQuery().eq(CurveWearRecord::getRecordsMasterCheckId, checkDataMap.getEkId()).eq(CurveWearRecord::getDelFlag, "0")
+                .list();
+        //按设备单元编号分组检查记录详情
+        Map<String, List<CurveWearRecord>> deviceProjectList = ekList.stream().collect(Collectors.groupingBy(CurveWearRecord::getCurveCode));
+        if (CollectionUtils.isNotEmpty(ekList)) {
+            for (Map<String, Object> map : unitDeviceList) {
+                //获取分析批次筛选的单元设备编码
+                String unitCode = map.get("unitCode").toString();
+                //判断分析批次的设备与检查时维护的设备是同一个设备
+                List<CurveWearRecord> curveWearRecordList = deviceProjectList.get(unitCode);
+                if (CollectionUtils.isNotEmpty(curveWearRecordList)) {
+                    String deviceCode = map.get("deviceCode").toString();
+                    //保存单元信息
+                    String deviceId = saveUnit(analysisLineBatch, checkDataMap, map, unitList, deviceCode);
+                    curveWearRecordList.forEach(model -> {
+                        //保存道岔单元信息详情
+                        saveCurveWearRecordUnitInfo(analysisLineBatch, checkDataMap, unitInfoList, model, deviceId);
+                    });
+                }
+            }
+        }
+        if (CollectionUtils.isNotEmpty(unitList)) {
+            unitDeviceService.saveBatch(unitList);
+        }
+        if (CollectionUtils.isNotEmpty(unitInfoList)) {
+            analysisLineBatchUnitDeviceCurveWearInfoService.saveBatch(unitInfoList);
+        }
+    }
+
     /**
      * 病害分析->钢轨探伤病害分析批次数据、检查批次、1-钢轨,2-曲线,3-竖曲线,4-道岔
      */
@@ -136,18 +230,19 @@ public class AnalysisAlgorithmLine {
                     String deviceId = saveUnit(analysisLineBatch, checkDataMap, map, unitList, deviceCode);
                     railWearRecordList.forEach(model -> {
                         //保存道岔单元信息详情
-                        saveRailWearRecordUnitInfo(analysisLineBatch,checkDataMap,unitInfoList,model,deviceId);
+                        saveRailWearRecordUnitInfo(analysisLineBatch, checkDataMap, unitInfoList, model, deviceId);
                     });
                 }
             }
         }
-        if(CollectionUtils.isNotEmpty(unitList)){
+        if (CollectionUtils.isNotEmpty(unitList)) {
             unitDeviceService.saveBatch(unitList);
         }
-        if(CollectionUtils.isNotEmpty(unitInfoList)){
+        if (CollectionUtils.isNotEmpty(unitInfoList)) {
             analysisLineBatchUnitDeviceRailWearInfoService.saveBatch(unitInfoList);
         }
     }
+
     /**
      * 病害分析->道岔病害分析批次数据、检查批次、1-钢轨,2-曲线,3-竖曲线,4-道岔
      */
@@ -173,15 +268,15 @@ public class AnalysisAlgorithmLine {
                     String deviceId = saveUnit(analysisLineBatch, checkDataMap, map, unitList, deviceCode);
                     recordsMasterTurnoutInfoList.forEach(model -> {
                         //保存道岔单元信息详情
-                        saveUnitInfo(analysisLineBatch,checkDataMap,unitInfoList,model,deviceId);
+                        saveUnitInfo(analysisLineBatch, checkDataMap, unitInfoList, model, deviceId);
                     });
                 }
             }
         }
-        if(CollectionUtils.isNotEmpty(unitList)){
+        if (CollectionUtils.isNotEmpty(unitList)) {
             unitDeviceService.saveBatch(unitList);
         }
-        if(CollectionUtils.isNotEmpty(unitInfoList)){
+        if (CollectionUtils.isNotEmpty(unitInfoList)) {
             analysisLineBatchUnitDeviceTurnoutInfoService.saveBatch(unitInfoList);
         }
     }
@@ -219,6 +314,8 @@ public class AnalysisAlgorithmLine {
     }
 
     /**
+     * 道岔病害分析数据存储
+     *
      * @param analysisLineBatch 分析主表
      * @param checkDataMap      分析表对应的检查表关系表
      * @param unitInfoList      最终封装到的集合
@@ -241,8 +338,10 @@ public class AnalysisAlgorithmLine {
         unitInfo.setType(info.getType());
         unitInfoList.add(unitInfo);
     }
+
     /**
      * 钢轨探伤病害分析单元详情维护
+     *
      * @param analysisLineBatch 分析主表
      * @param checkDataMap      分析表对应的检查表关系表
      * @param unitInfoList      最终封装到的集合
@@ -263,4 +362,55 @@ public class AnalysisAlgorithmLine {
         unitInfo.setEkId(checkDataMap.getEkId());
         unitInfoList.add(unitInfo);
     }
+
+    /**
+     * 曲线磨耗病害分析单元详情维护
+     *
+     * @param analysisLineBatch 分析主表
+     * @param checkDataMap      分析表对应的检查表关系表
+     * @param unitInfoList      最终封装到的集合
+     * @param info              检查记录详情
+     * @param deviceId          单元表id
+     */
+    public void saveCurveWearRecordUnitInfo(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
+            checkDataMap, List<AnalysisLineBatchUnitDeviceCurveWearInfo> unitInfoList, CurveWearRecord info, String deviceId) {
+
+        //维护单元详情表
+        AnalysisLineBatchUnitDeviceCurveWearInfo unitInfo = new AnalysisLineBatchUnitDeviceCurveWearInfo();
+        BeanCopyUtil.copyProperties(info, AnalysisLineBatchUnitDeviceRailWearInfo.class);
+        unitInfo.setId(UUIDGenerator.generate());
+        unitInfo.setDeviceId(deviceId);
+        unitInfo.setAnalysisBatchId(analysisLineBatch.getId());
+        unitInfo.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
+        unitInfo.setEkCode(checkDataMap.getEkCode());
+        unitInfo.setEkId(checkDataMap.getEkId());
+        unitInfo.setDeviceProjectId(info.getCurveId());
+        unitInfo.setDeviceProjectCode(info.getCurveCode());
+        unitInfo.setDeviceProjectType(info.getProjectType());
+        unitInfoList.add(unitInfo);
+    }
+
+    /**
+     * 钢轨波磨病害分析单元详情维护
+     *
+     * @param analysisLineBatch 分析主表
+     * @param checkDataMap      分析表对应的检查表关系表
+     * @param unitInfoList      最终封装到的集合
+     * @param info              检查记录详情
+     * @param deviceId          单元表id
+     */
+    public void saveCorrugationRecordUnitInfo(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
+            checkDataMap, List<AnalysisLineBatchUnitDeviceCorrugationInfo> unitInfoList, CorrugationRecord info, String deviceId) {
+
+        //维护单元详情表
+        AnalysisLineBatchUnitDeviceCorrugationInfo unitInfo = new AnalysisLineBatchUnitDeviceCorrugationInfo();
+        BeanCopyUtil.copyProperties(info, AnalysisLineBatchUnitDeviceRailWearInfo.class);
+        unitInfo.setId(UUIDGenerator.generate());
+        unitInfo.setDeviceId(deviceId);
+        unitInfo.setAnalysisBatchId(analysisLineBatch.getId());
+        unitInfo.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
+        unitInfo.setEkCode(checkDataMap.getEkCode());
+        unitInfo.setEkId(checkDataMap.getEkId());
+        unitInfoList.add(unitInfo);
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/controller/AnalysisLineBatchController.java

@@ -14,6 +14,8 @@ import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchInfoDTO;
 import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchSaveOrUpdateDTO;
 import org.jeecg.modules.diseaseAnalysis.dto.EkRecordsMasterCheckDTO;
 import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceCorrugationInfo;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceCurveWearInfo;
 import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchService;
 import org.jeecg.modules.diseaseAnalysis.vo.*;
 import org.springframework.web.bind.annotation.*;
@@ -170,7 +172,36 @@ public class AnalysisLineBatchController extends JeecgController<AnalysisLineBat
         List<AnalysisLineBatchUnitDeviceRailWearInfoVO> list = this.service.getAnalysisLineBatchUnitDeviceRailWearInfoList(analysisBatchId, ekId, deviceId);
         return Result.OK(list);
     }
-
+    /**
+     * 线路质量分析-其他病害分析-钢轨波磨单元详情检查记录查询
+     *
+     * @param analysisBatchId 分析批次id
+     * @param ekId            检查批次id
+     * @param deviceId        线路质量分析-其他病害分析-单元表id
+     * @return
+     */
+    @AutoLog(value = "线路质量分析-其他病害分析-钢轨波磨单元详情检查记录查询")
+    @ApiOperation(value = "线路质量分析-其他病害分析-钢轨波磨单元详情检查记录查询", notes = "线路质量分析-其他病害分析-钢轨波磨单元详情检查记录查询")
+    @GetMapping(value = "/getAnalysisLineBatchUnitDeviceCorrugationInfoList")
+    public Result<List<AnalysisLineBatchUnitDeviceCorrugationInfoVO>> getAnalysisLineBatchUnitDeviceCorrugationInfoList(@RequestParam String analysisBatchId, @RequestParam String ekId, @RequestParam String deviceId) {
+        List<AnalysisLineBatchUnitDeviceCorrugationInfoVO> list = this.service.getAnalysisLineBatchUnitDeviceCorrugationInfoList(analysisBatchId, ekId, deviceId);
+        return Result.OK(list);
+    }
+    /**
+     * 线路质量分析-其他病害分析-曲线波磨单元详情检查记录查询
+     *
+     * @param analysisBatchId 分析批次id
+     * @param ekId            检查批次id
+     * @param deviceId        线路质量分析-其他病害分析-单元表id
+     * @return
+     */
+    @AutoLog(value = "线路质量分析-其他病害分析-曲线波磨单元详情检查记录查询")
+    @ApiOperation(value = "线路质量分析-其他病害分析-曲线波磨单元详情检查记录查询", notes = "线路质量分析-其他病害分析-曲线波磨单元详情检查记录查询")
+    @GetMapping(value = "/getAnalysisLineBatchUnitDeviceCurveWearInfoList")
+    public Result<List<AnalysisLineBatchUnitDeviceCurveWearInfoVO>> getAnalysisLineBatchUnitDeviceCurveWearInfoList(@RequestParam String analysisBatchId, @RequestParam String ekId, @RequestParam String deviceId) {
+        List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> list = this.service.getAnalysisLineBatchUnitDeviceCurveWearInfoList(analysisBatchId, ekId, deviceId);
+        return Result.OK(list);
+    }
     //***********************************分析新增编辑接口*************************************************************************************************************
     @AutoLog(value = "其他病害分析-分析批次-新增分析批次")
     @ApiOperation(value = "其他病害分析-分析批次-新增分析批次", notes = "其他病害分析-分析批次-新增分析批次")

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/AnalysisLineBatchMapper.java

@@ -86,4 +86,21 @@ public interface AnalysisLineBatchMapper extends BaseMapper<AnalysisLineBatch> {
      */
     List<AnalysisLineBatchUnitDeviceRailWearInfoVO> getAnalysisLineBatchUnitDeviceRailWearInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
 
+    /**
+     * 线路质量分析-其他病害分析-钢轨波磨单元详情检查记录查询
+     * @param analysisBatchId
+     * @param ekId
+     * @param deviceId
+     * @return
+     */
+    List<AnalysisLineBatchUnitDeviceCorrugationInfoVO> getAnalysisLineBatchUnitDeviceCorrugationInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
+    /**
+     * 线路质量分析-其他病害分析-曲线波磨单元详情检查记录查询
+     * @param analysisBatchId
+     * @param ekId
+     * @param deviceId
+     * @return
+     */
+    List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> getAnalysisLineBatchUnitDeviceCurveWearInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/xml/AnalysisLineBatchMapper.xml

@@ -154,4 +154,43 @@
         </if>
         ORDER BY t1.update_time DESC
     </select>
+    <select id="getAnalysisLineBatchUnitDeviceCorrugationInfoList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchUnitDeviceCorrugationInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_dsa_analysis_line_batch_unit_device_corrugation_info t1
+        WHERE
+        1=1
+        AND t1.del_flag = '0'
+        <if test="analysisBatchId != null and analysisBatchId != ''">
+            AND t1.analysis_batch_id = #{analysisBatchId}
+        </if>
+        <if test="ekId != null and ekId != ''">
+            AND t1.ek_id = #{ekId}
+        </if>
+        <if test="deviceId != null and deviceId != ''">
+            AND t1.device_id = #{deviceId}
+        </if>
+        ORDER BY t1.update_time DESC
+    </select>
+    <select id="getAnalysisLineBatchUnitDeviceCurveWearInfoList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchUnitDeviceCurveWearInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_dsa_analysis_line_batch_unit_device_curve_wear_info t1
+        WHERE
+        1=1
+        AND t1.del_flag = '0'
+        <if test="analysisBatchId != null and analysisBatchId != ''">
+            AND t1.analysis_batch_id = #{analysisBatchId}
+        </if>
+        <if test="ekId != null and ekId != ''">
+            AND t1.ek_id = #{ekId}
+        </if>
+        <if test="deviceId != null and deviceId != ''">
+            AND t1.device_id = #{deviceId}
+        </if>
+        ORDER BY t1.update_time DESC
+    </select>
+
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/IAnalysisLineBatchService.java

@@ -87,6 +87,24 @@ public interface IAnalysisLineBatchService extends IService<AnalysisLineBatch> {
      * @return
      */
     List<AnalysisLineBatchUnitDeviceRailWearInfoVO> getAnalysisLineBatchUnitDeviceRailWearInfoList(String analysisBatchId, String ekId, String deviceId);
+
+    /**
+     * 线路质量分析-其他病害分析-钢轨波磨单元详情检查记录查询
+     * @param analysisBatchId
+     * @param ekId
+     * @param deviceId
+     * @return
+     */
+    List<AnalysisLineBatchUnitDeviceCorrugationInfoVO> getAnalysisLineBatchUnitDeviceCorrugationInfoList(String analysisBatchId, String ekId, String deviceId);
+    /**
+     * 线路质量分析-其他病害分析-曲线波磨单元详情检查记录查询
+     * @param analysisBatchId
+     * @param ekId
+     * @param deviceId
+     * @return
+     */
+    List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> getAnalysisLineBatchUnitDeviceCurveWearInfoList(String analysisBatchId, String ekId, String deviceId);
+
     /**
      *其他病害分析-分析批次-新增分析批次
      * @param dto

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/impl/AnalysisLineBatchServiceImpl.java

@@ -41,6 +41,10 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
     private AnalysisLineBatchUnitDeviceTurnoutInfoMapper analysisLineBatchUnitDeviceTurnoutInfoMapper;
     @Resource
     private AnalysisLineBatchUnitDeviceRailWearInfoMapper analysisLineBatchUnitDeviceRailWearInfoMapper;
+    @Resource
+    private AnalysisLineBatchUnitDeviceCurveWearInfoMapper analysisLineBatchUnitDeviceCurveWearInfoMapper;
+    @Resource
+    private AnalysisLineBatchUnitDeviceCorrugationInfoMapper analysisLineBatchUnitDeviceCorrugationInfoMapper;
     /**
      * 线路质量分析-其他病害分析-检查记录-分页列表查询
      *
@@ -137,6 +141,31 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
         return list;
     }
 
+    /**
+     * 线路质量分析-其他病害分析-钢轨波磨单元详情检查记录查询
+     * @param analysisBatchId
+     * @param ekId
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public List<AnalysisLineBatchUnitDeviceCorrugationInfoVO> getAnalysisLineBatchUnitDeviceCorrugationInfoList(String analysisBatchId, String ekId, String deviceId) {
+        List<AnalysisLineBatchUnitDeviceCorrugationInfoVO> list = this.baseMapper.getAnalysisLineBatchUnitDeviceCorrugationInfoList(analysisBatchId, ekId, deviceId);
+        return list;
+    }
+    /**
+     * 线路质量分析-其他病害分析-曲线波磨单元详情检查记录查询
+     * @param analysisBatchId
+     * @param ekId
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> getAnalysisLineBatchUnitDeviceCurveWearInfoList(String analysisBatchId, String ekId, String deviceId) {
+        List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> list = this.baseMapper.getAnalysisLineBatchUnitDeviceCurveWearInfoList(analysisBatchId, ekId, deviceId);
+        return list;
+    }
+
     /**
      *其他病害分析-分析批次-新增分析批次
      * @param dto
@@ -244,17 +273,27 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
         LambdaQueryWrapper<AnalysisLineBatchUnitDevice> wrapper1 = Wrappers.lambdaQuery();
         wrapper1.in(AnalysisLineBatchUnitDevice::getAnalysisBatchId, idList);
         analysisLineBatchUnitDeviceMapper.delete(wrapper1);
-        //type值检查数据类型 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查
+        //type值检查数据类型 1-道岔检查 2-钢轨常规探伤检查 3-曲线磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查
         if(type == 1){
             //3.删除道岔单元详情表
             LambdaQueryWrapper<AnalysisLineBatchUnitDeviceTurnoutInfo> wrapper2 = Wrappers.lambdaQuery();
             wrapper2.in(AnalysisLineBatchUnitDeviceTurnoutInfo::getAnalysisBatchId, idList);
             analysisLineBatchUnitDeviceTurnoutInfoMapper.delete(wrapper2);
         }else if(type ==2){
-            //3.删除道岔单元详情表
+            //3.删除钢轨常规探伤单元详情表
             LambdaQueryWrapper<AnalysisLineBatchUnitDeviceRailWearInfo> wrapper2 = Wrappers.lambdaQuery();
             wrapper2.in(AnalysisLineBatchUnitDeviceRailWearInfo::getAnalysisBatchId, idList);
             analysisLineBatchUnitDeviceRailWearInfoMapper.delete(wrapper2);
+        }else if(type ==3){
+            //3.删除曲线磨耗单元详情表
+            LambdaQueryWrapper<AnalysisLineBatchUnitDeviceCurveWearInfo> wrapper2 = Wrappers.lambdaQuery();
+            wrapper2.in(AnalysisLineBatchUnitDeviceCurveWearInfo::getAnalysisBatchId, idList);
+            analysisLineBatchUnitDeviceCurveWearInfoMapper.delete(wrapper2);
+        }else if(type ==4){
+            //3.删除钢轨波磨单元详情表
+            LambdaQueryWrapper<AnalysisLineBatchUnitDeviceCorrugationInfo> wrapper2 = Wrappers.lambdaQuery();
+            wrapper2.in(AnalysisLineBatchUnitDeviceCorrugationInfo::getAnalysisBatchId, idList);
+            analysisLineBatchUnitDeviceCorrugationInfoMapper.delete(wrapper2);
         }
         //4.删除分析主表
         this.baseMapper.deleteBatchIds(idList);