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

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);