病害分析查询接口提交--shizhilong

jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java

@@ -25,11 +25,12 @@ public class CodeGenerate {
         String outputDir = projectPath + "\\jeecg-module-system\\src\\main\\java\\";
 
         // 模块名
-        String moduleName = "corrugationRecord";
+        String moduleName = "ekLine";
 
         // 表名
         String[] tables = {
-                "t_ek_corrugation_record"
+                "t_dsa_analysis_line_batch","t_dsa_analysis_line_batch_check_data_map",
+                        "t_dsa_analysis_line_batch_unit_device","t_dsa_analysis_line_batch_unit_device_turnout_info"
         };
 
 

jeecg-module-system/src/main/java/org/jeecg/config/init/InitData.java

 package org.jeecg.config.init;
 
 import org.jeecg.modules.deviceAsset.service.*;
+import org.jeecg.modules.diseaseAnalysis.algorithm.AnalysisAlgorithmLine;
+import org.jeecg.modules.diseaseAnalysis.algorithm.SingleConsumerLine;
 import org.jeecg.modules.dynamicStaticAnalysis.algorithm.AnalysisAlgorithm;
 import org.jeecg.modules.dynamicStaticAnalysis.algorithm.SingleConsumer;
 import org.jeecg.modules.subwayNetwork.service.ILineAliasService;
@@ -45,6 +47,9 @@ public class InitData implements InitializingBean {
     @Resource
     private AnalysisAlgorithm analysisAlgorithm;
 
+    @Resource
+    private AnalysisAlgorithmLine analysisAlgorithmLine;
+
     @Resource
     private RedisTemplate<String, Object> redisTemplate;
 
@@ -62,5 +67,7 @@ public class InitData implements InitializingBean {
         RedisLockUtil.setService(redisTemplate);
 
         SingleConsumer.setService(analysisAlgorithm);
+
+        SingleConsumerLine.setService(analysisAlgorithmLine);
     }
 }

jeecg-module-system/src/main/java/org/jeecg/config/init/SystemInitRunner.java

 package org.jeecg.config.init;
 
+import org.jeecg.modules.diseaseAnalysis.algorithm.SingleConsumerLine;
 import org.jeecg.modules.dynamicStaticAnalysis.algorithm.SingleConsumer;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -14,5 +15,7 @@ public class SystemInitRunner implements ApplicationRunner {
     public void run(ApplicationArguments args) throws Exception {
         // 单独开启消费者线程
         new Thread(SingleConsumer::consume).start();
+        //单独开启病害分析消费者线程
+        new Thread(SingleConsumerLine::consume).start();
     }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dto/CorrugationRecordDTO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -25,59 +26,16 @@ public class CorrugationRecordDTO {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("主键")
-    private String id;
+    @ApiModelProperty("检查编号")
+    private String ekCode;
 
-    @ApiModelProperty("创建人")
-    private String createBy;
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
 
-    @ApiModelProperty("创建日期")
-    private Date createTime;
-
-    @ApiModelProperty("更新人")
-    private String updateBy;
-
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty("设备检查记录主表id")
-    private String recordsMasterCheckId;
-
-    @ApiModelProperty("检查设备id")
-    private String deviceProjectId;
-
-    @ApiModelProperty("检查设备Code")
-    private String deviceProjectCode;
-
-    @ApiModelProperty("检查设备类型（1-钢轨,2-曲线,3-竖曲线,4-道岔）")
-    private Integer deviceProjectType;
-
-    @ApiModelProperty("曲线半径")
-    private BigDecimal curveRadius;
-
-    @ApiModelProperty("曲线超高")
-    private BigDecimal superHigh;
-
-    @ApiModelProperty("曲线长度")
-    private BigDecimal curveLen;
-
-    @ApiModelProperty("检查项目-波段-谷深(10-30)")
-    private BigDecimal checkBandOne;
-
-    @ApiModelProperty("检查项目-波段-谷深(30-100)")
-    private BigDecimal checkBandTwo;
-
-    @ApiModelProperty("检查项目-波段-谷深(100-300)")
-    private BigDecimal checkBandThree;
-
-    @ApiModelProperty("检查项目-波段-谷深(300-1000)")
-    private BigDecimal checkBandFour;
-
-    @ApiModelProperty("超限记录")
-    private String overrunInfo;
-
-    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
-    private String delFlag;
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
 
 
 }

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

+package org.jeecg.modules.diseaseAnalysis.algorithm;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * @author hkl
+ * 换冲区
+ */
+public class Buffer {
+    /**
+     * 缓冲队列最大缓存能力
+     */
+    private static final int MAX_CAPACITY = 20;
+    /**
+     * 缓冲队列
+     * 这个队列是一个基于链表的阻塞队列，它的容量可以是有界的或无界的。
+     * 当使用有界容量时，如果队列已满，新插入操作会被阻塞，直到有空间可用。
+     * 因为队列可以无限增长（无界），所以在插入元素时不会发生阻塞。
+     */
+    public static final BlockingQueue<String> queue = new LinkedBlockingQueue<>(MAX_CAPACITY);
+}

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

+package org.jeecg.modules.diseaseAnalysis.algorithm;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 多生产者模型-单消费者模型
+ * 多生产者
+ */
+@Slf4j
+public class MultiProducerLine {
+
+
+    public static void produce(String analysisLineBatchId) {
+        try {
+            Buffer.queue.put(analysisLineBatchId);
+            log.info("MultiProducer[生产者]|线程id:【" + Thread.currentThread().getId() + "】=============分析批次ID:【" + analysisLineBatchId + "】");
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            log.info("MultiProducer[生产者]|线程id:【" + Thread.currentThread().getId() + "】=============分析批次ID:【" + analysisLineBatchId + "】异常信息:" + e.getMessage());
+        }
+    }
+}

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

+package org.jeecg.modules.diseaseAnalysis.algorithm;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 多生产者模型-单消费者模型
+ * 单消费者
+ */
+@Slf4j
+public class SingleConsumerLine {
+    private static AnalysisAlgorithmLine analysisAlgorithmLine;
+
+    public static void setService(AnalysisAlgorithmLine analysisAlgorithmLine) {
+        SingleConsumerLine.analysisAlgorithmLine = analysisAlgorithmLine;
+    }
+
+
+    public static void consume() {
+
+        while (true) {
+            try {
+                String analysisLineBatchId = Buffer.queue.take();
+                log.info("SingleConsumerLine[消费者]|线程id:【" + Thread.currentThread().getId() + "】=============分析批次ID:【" + analysisLineBatchId + "】");
+
+                analysisAlgorithmLine.analysis(analysisLineBatchId);
+
+            } catch (Exception e) {
+                StackTraceElement[] stackTrace = e.getStackTrace();
+                String exceptionMessage = "错误类名:" +
+                        stackTrace[0].getClassName() +
+                        ".错误方法名:" +
+                        stackTrace[0].getMethodName() +
+                        ".错误行号:" +
+                        stackTrace[0].getLineNumber() +
+                        ".异常:" +
+                        e.toString();
+                log.error("SingleConsumerLine[消费者]|线程id:【" + Thread.currentThread().getId() + "】异常信息:" + exceptionMessage);
+                e.printStackTrace();
+            }
+
+        }
+
+    }
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.controller;
+
+
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchCheckDataMapService;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.base.controller.JeecgController;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情） 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@RestController
+@RequestMapping("/analysisLineBatchCheckDataMap")
+public class AnalysisLineBatchCheckDataMapController extends JeecgController<AnalysisLineBatchCheckDataMap, IAnalysisLineBatchCheckDataMapService> {
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.controller;
+
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchDTO;
+import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchInfoDTO;
+import org.jeecg.modules.diseaseAnalysis.dto.EkRecordsMasterCheckDTO;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchService;
+import org.jeecg.modules.diseaseAnalysis.vo.*;
+import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchQueryVO;
+import org.jeecg.modules.dynamicStaticAnalysis.vo.CheckBatchVO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.base.controller.JeecgController;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 线路质量分析	-分析批次表 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@RestController
+@RequestMapping("/analysisLineBatch")
+public class AnalysisLineBatchController extends JeecgController<AnalysisLineBatch, IAnalysisLineBatchService> {
+    /**
+     * 线路质量分析-其他病害分析-检查记录(除去线路巡查)-分页列表查询
+     * @param pageNo
+     * @param pageSize
+     * @param dto
+     * @return
+     */
+    @AutoLog(value = "线路质量分析-其他病害分析-检查记录(除去线路巡查)-分页列表查询")
+    @ApiOperation(value = "线路质量分析-其他病害分析-检查记录(除去线路巡查)-分页列表查询", notes = "线路质量分析-其他病害分析-检查记录(除去线路巡查)-分页列表查询")
+    @GetMapping(value = "/ekList")
+    public Result<IPage<EkRecordsMasterCheckVO>> queryPageEkList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                               EkRecordsMasterCheckDTO dto) {
+        Page<EkRecordsMasterCheckVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.queryPageEkList(pageData, dto);
+        return Result.OK(pageData);
+    }
+    /**
+     * 线路质量分析-其他病害分析-线路巡查检查记录-分页列表查询
+     * @param pageNo
+     * @param pageSize
+     * @param dto
+     * @return
+     */
+    @AutoLog(value = "线路质量分析-其他病害分析-线路巡查检查记录-分页列表查询")
+    @ApiOperation(value = "线路质量分析-其他病害分析-线路巡查检查记录-分页列表查询", notes = "线路质量分析-其他病害分析-线路巡查检查记录-分页列表查询")
+    @GetMapping(value = "/ekPatrolList")
+    public Result<IPage<EkRecordPatrolMasterVO>> queryPageEkPatrolList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                       EkRecordsMasterCheckDTO dto) {
+        Page<EkRecordPatrolMasterVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.queryPageEkPatrolList(pageData, dto);
+        return Result.OK(pageData);
+    }
+    /**
+     * 线路质量分析-其他病害分析-分页列表查询
+     * @param pageNo
+     * @param pageSize
+     * @param dto
+     * @return
+     */
+    @AutoLog(value = "线路质量分析-其他病害分析-分页列表查询")
+    @ApiOperation(value = "线路质量分析-其他病害分析-分页列表查询", notes = "线路质量分析-其他病害分析-分页列表查询")
+    @GetMapping(value = "/getPageList")
+    public Result<IPage<AnalysisLineBatchVO>> getPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          AnalysisLineBatchDTO dto) {
+        Page<AnalysisLineBatchVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.getPageList(pageData, dto);
+        // 查询明细
+        List<AnalysisLineBatchVO> records = pageData.getRecords();
+        if (ObjectUtil.isNotEmpty(records)) {
+            // 新增明细
+            List<String> analysisLineBatchIds = records.stream().map(AnalysisLineBatchVO::getId).collect(Collectors.toList());
+            List<AnalysisLineBatchCheckDataMapVO> checkBatchList = this.service.listRecordDetail(analysisLineBatchIds);
+            if (ObjectUtil.isNotEmpty(checkBatchList)) {
+                Map<String, List<AnalysisLineBatchCheckDataMapVO>> analysisBatchMap = checkBatchList.stream().collect(Collectors.groupingBy(AnalysisLineBatchCheckDataMapVO::getAnalysisBatchId));
+                records.forEach(record -> {
+                    List<AnalysisLineBatchCheckDataMapVO> checkBatchVOS = analysisBatchMap.get(record.getId());
+                    record.setVoInfoList(checkBatchVOS);
+                });
+            }
+        }
+        return Result.OK(pageData);
+    }
+    /**
+     * 线路质量分析-其他病害分析-详情查询-分页列表查询
+     * @param pageNo
+     * @param pageSize
+     * @param dto
+     * @return
+     */
+    @AutoLog(value = "线路质量分析-其他病害分析-详情查询-分页列表查询")
+    @ApiOperation(value = "线路质量分析-其他病害分析-详情查询-分页列表查询", notes = "线路质量分析-其他病害分析-详情查询-分页列表查询")
+    @GetMapping(value = "/getInfoPageList")
+    public Result<IPage<AnalysisLineBatchUnitDeviceVO>> getInfoPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                        AnalysisLineBatchInfoDTO dto) {
+        Page<AnalysisLineBatchUnitDeviceVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.getInfoPageList(pageData, dto);
+        return Result.OK(pageData);
+    }
+
+    /**
+     * 线路质量分析-其他病害分析-详情检查记录查询
+     * @param analysisBatchId 分析批次id
+     * @param ekId 检查批次id
+     * @param deviceId 线路质量分析-其他病害分析-单元表id
+     * @return
+     */
+    @AutoLog(value = "线路质量分析-其他病害分析-详情检查记录查询")
+    @ApiOperation(value = "线路质量分析-其他病害分析-详情检查记录查询", notes = "线路质量分析-其他病害分析-详情检查记录查询")
+    @GetMapping(value = "/getAnalysisLineBatchUnitEkInfoList")
+    public Result<List<AnalysisLineBatchUnitDeviceTurnoutInfoVO>> getAnalysisLineBatchUnitEkInfoList(@RequestParam String analysisBatchId,@RequestParam String ekId,@RequestParam String deviceId) {
+        List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> list = this.service.getAnalysisLineBatchUnitEkInfoList(analysisBatchId,ekId,deviceId);
+        return Result.OK(list);
+    }
+}

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

+package org.jeecg.modules.diseaseAnalysis.controller;
+
+
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDevice;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceService;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.base.controller.JeecgController;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备（1个分析批次有多个检查批次，1个检查批次有多个单位设备） 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@RestController
+@RequestMapping("/analysisLineBatchUnitDevice")
+public class AnalysisLineBatchUnitDeviceController extends JeecgController<AnalysisLineBatchUnitDevice, IAnalysisLineBatchUnitDeviceService> {
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.controller;
+
+
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceTurnoutInfo;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchCheckDataMapService;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceTurnoutInfoService;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.base.controller.JeecgController;
+
+/**
+ * <p>
+ * 检查数据设备-设备检查记录数据-道岔使用情况检查数据 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@RestController
+@RequestMapping("/analysisLineBatchUnitDeviceTurnoutInfo")
+public class AnalysisLineBatchUnitDeviceTurnoutInfoController extends JeecgController<AnalysisLineBatchUnitDeviceTurnoutInfo, IAnalysisLineBatchUnitDeviceTurnoutInfoService> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchCheckDataMapDTO.java

+package org.jeecg.modules.diseaseAnalysis.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-检查数据关联关系表（1个分析批次有多个检查批次）
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchCheckDataMap对象", description = "线路质量分析-分析批次表-检查数据关联关系表（1个分析批次有多个检查批次）")
+
+public class AnalysisLineBatchCheckDataMapDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("检查批id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号")
+    private String ekCode;
+
+    @ApiModelProperty("检查数据类型 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查")
+    private String ekType;
+
+    @ApiModelProperty("检查日期")
+    private Date checkTime;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("分析状态 0-创建 1-分析中  99-分析完成")
+    private Integer analysisStatus;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchDTO.java

+package org.jeecg.modules.diseaseAnalysis.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析	-分析批次表
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatch对象", description = "线路质量分析	-分析批次表")
+
+public class AnalysisLineBatchDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("所属线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("分析起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("分析终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("分析状态 0-创建 1-分析中  99-分析完成")
+    private Integer analysisStatus;
+
+    @ApiModelProperty("1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
+    private String ekType;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchInfoDTO.java

+package org.jeecg.modules.diseaseAnalysis.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 线路质量分析分析详情
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchInfoDTO对象", description = "线路质量分析分析详情")
+
+public class AnalysisLineBatchInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("分析批次id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("单元编号")
+    private String unitCode;
+
+    @ApiModelProperty("派工状态（1：未派工，2：已派工）")
+    private Integer workStatus;
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchUnitDeviceDTO.java

+package org.jeecg.modules.diseaseAnalysis.dto;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备（1个分析批次有多个检查批次，1个检查批次有多个单位设备）
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchUnitDevice对象", description = "线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备）")
+
+public class AnalysisLineBatchUnitDeviceDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("检查批次编码")
+    private String ekCode;
+
+    @ApiModelProperty("检查批次id")
+    private String ekId;
+
+    @ApiModelProperty("单元设备id")
+    private String unitId;
+
+    @ApiModelProperty("单元设备code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备编号")
+    private String unitDeviceCode;
+
+    @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元结束里程")
+    private BigDecimal unitEndMileage;
+
+
+    @ApiModelProperty("派工状态（1：未派工，2：已派工）")
+    private Integer workStatus;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchUnitDeviceTurnoutInfoDTO.java

+package org.jeecg.modules.diseaseAnalysis.dto;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchUnitDeviceTurnoutInfo对象", description = "检查数据设备-设备检查记录数据-道岔使用情况检查数据")
+
+public class AnalysisLineBatchUnitDeviceTurnoutInfoDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("设备编号(道岔表)")
+    private String switchCode;
+
+    @ApiModelProperty("设备号数(道岔表)")
+    private String switchCodeNum;
+
+
+    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓；9:道岔）")
+    private String type;
+
+    @ApiModelProperty("值1")
+    private String numOne;
+
+    @ApiModelProperty("值2")
+    private String numTwo;
+
+    @ApiModelProperty("值3")
+    private String numThree;
+
+    @ApiModelProperty("值4")
+    private String numFour;
+
+    @ApiModelProperty("值5")
+    private String numFive;
+
+    @ApiModelProperty("值6")
+    private String numSix;
+
+    @ApiModelProperty("值7")
+    private String numSeven;
+
+    @ApiModelProperty("值8")
+    private String numEight;
+
+    @ApiModelProperty("值9")
+    private String numNine;
+
+    @ApiModelProperty("值10")
+    private String numTen;
+
+    @ApiModelProperty("值11")
+    private String numTenOne;
+
+    @ApiModelProperty("值12")
+    private String numTenTwo;
+
+    @ApiModelProperty("值13")
+    private String numTenThree;
+
+    @ApiModelProperty("值14")
+    private String numTenFour;
+
+    @ApiModelProperty("值15")
+    private String numTenFive;
+
+    @ApiModelProperty("值16")
+    private String numTenSix;
+
+    @ApiModelProperty("值17")
+    private String numTenSeven;
+
+    @ApiModelProperty("值18")
+    private String numTenEight;
+
+    @ApiModelProperty("值19")
+    private String numTenNine;
+
+    @ApiModelProperty("值20")
+    private String numTwenty;
+
+    @ApiModelProperty("值21")
+    private String numTwentyOne;
+
+    @ApiModelProperty("值22")
+    private String numTwentyTwo;
+
+    @ApiModelProperty("是否合格（1：合格；2：不合格）")
+    private String qualified;
+
+    @ApiModelProperty("不合格说明")
+    private String noQualifiedRemark;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+    @ApiModelProperty("导入道岔顺序")
+    private Integer sort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/EkRecordsMasterCheckDTO.java

+package org.jeecg.modules.diseaseAnalysis.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 检查批次查询接收类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "EkRecordsMasterCheckDTO对象", description = "检查批次查询接收类")
+
+public class EkRecordsMasterCheckDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("检查编号")
+    private String ekCode;
+
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    @ApiModelProperty("1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
+    private String type;
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/entity/AnalysisLineBatch.java

+package org.jeecg.modules.diseaseAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析	-分析批次表
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_line_batch")
+@ApiModel(value = "AnalysisLineBatch对象", description = "线路质量分析	-分析批次表")
+public class AnalysisLineBatch implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("所属线路id")
+    @TableField("light_rail_id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    @TableField("light_rail_name")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    @TableField("line_alias_name")
+    private String lineAliasName;
+
+    @ApiModelProperty("分析起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("分析终点里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
+    @TableField("ek_type")
+    private String ekType;
+
+    @ApiModelProperty("分析状态 0-创建 1-分析中  99-分析完成")
+    @TableField("analysis_status")
+    private Integer analysisStatus;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/entity/AnalysisLineBatchCheckDataMap.java

+package org.jeecg.modules.diseaseAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-检查数据关联关系表（1个分析批次有多个检查批次）
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_line_batch_check_data_map")
+@ApiModel(value = "AnalysisLineBatchCheckDataMap对象", description = "线路质量分析-分析批次表-检查数据关联关系表（1个分析批次有多个检查批次）")
+public class AnalysisLineBatchCheckDataMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("检查批id")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("检查数据类型 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查")
+    @TableField("ek_type")
+    private String ekType;
+
+    @ApiModelProperty("检查日期")
+    @TableField("check_time")
+    private Date checkTime;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("分析状态 0-创建 1-分析中  99-分析完成")
+    @TableField("analysis_status")
+    private Integer analysisStatus;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/entity/AnalysisLineBatchUnitDevice.java

+package org.jeecg.modules.diseaseAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备（1个分析批次有多个检查批次，1个检查批次有多个单位设备）
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_line_batch_unit_device")
+@ApiModel(value = "AnalysisLineBatchUnitDevice对象", description = "线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备）")
+public class AnalysisLineBatchUnitDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("检查批次编码")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("检查批次id")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("单元设备id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("单元设备code")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备编号")
+    @TableField("unit_device_code")
+    private String unitDeviceCode;
+
+    @ApiModelProperty("设备单元起始里程")
+    @TableField("unit_start_mileage")
+    private BigDecimal unitStartMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元结束里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+
+    @ApiModelProperty("派工状态（1：未派工，2：已派工）")
+    @TableField("work_status")
+    private Integer workStatus;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/entity/AnalysisLineBatchUnitDeviceTurnoutInfo.java

+package org.jeecg.modules.diseaseAnalysis.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_line_batch_unit_device_turnout_info")
+@ApiModel(value = "AnalysisLineBatchUnitDeviceTurnoutInfo对象", description = "检查数据设备-设备检查记录数据-道岔使用情况检查数据")
+public class AnalysisLineBatchUnitDeviceTurnoutInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    @TableField("ek_id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    @TableField("device_id")
+    private String deviceId;
+
+    @ApiModelProperty("设备编号(道岔表)")
+    @TableField("switch_code")
+    private String switchCode;
+
+    @ApiModelProperty("设备号数(道岔表)")
+    @TableField("switch_code_num")
+    private String switchCodeNum;
+    
+
+    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓；9:道岔）")
+    @TableField("type")
+    private String type;
+
+    @ApiModelProperty("值1")
+    @TableField("num_one")
+    private String numOne;
+
+    @ApiModelProperty("值2")
+    @TableField("num_two")
+    private String numTwo;
+
+    @ApiModelProperty("值3")
+    @TableField("num_three")
+    private String numThree;
+
+    @ApiModelProperty("值4")
+    @TableField("num_four")
+    private String numFour;
+
+    @ApiModelProperty("值5")
+    @TableField("num_five")
+    private String numFive;
+
+    @ApiModelProperty("值6")
+    @TableField("num_six")
+    private String numSix;
+
+    @ApiModelProperty("值7")
+    @TableField("num_seven")
+    private String numSeven;
+
+    @ApiModelProperty("值8")
+    @TableField("num_eight")
+    private String numEight;
+
+    @ApiModelProperty("值9")
+    @TableField("num_nine")
+    private String numNine;
+
+    @ApiModelProperty("值10")
+    @TableField("num_ten")
+    private String numTen;
+
+    @ApiModelProperty("值11")
+    @TableField("num_ten_one")
+    private String numTenOne;
+
+    @ApiModelProperty("值12")
+    @TableField("num_ten_two")
+    private String numTenTwo;
+
+    @ApiModelProperty("值13")
+    @TableField("num_ten_three")
+    private String numTenThree;
+
+    @ApiModelProperty("值14")
+    @TableField("num_ten_four")
+    private String numTenFour;
+
+    @ApiModelProperty("值15")
+    @TableField("num_ten_five")
+    private String numTenFive;
+
+    @ApiModelProperty("值16")
+    @TableField("num_ten_six")
+    private String numTenSix;
+
+    @ApiModelProperty("值17")
+    @TableField("num_ten_seven")
+    private String numTenSeven;
+
+    @ApiModelProperty("值18")
+    @TableField("num_ten_eight")
+    private String numTenEight;
+
+    @ApiModelProperty("值19")
+    @TableField("num_ten_nine")
+    private String numTenNine;
+
+    @ApiModelProperty("值20")
+    @TableField("num_twenty")
+    private String numTwenty;
+
+    @ApiModelProperty("值21")
+    @TableField("num_twenty_one")
+    private String numTwentyOne;
+
+    @ApiModelProperty("值22")
+    @TableField("num_twenty_two")
+    private String numTwentyTwo;
+
+    @ApiModelProperty("是否合格（1：合格；2：不合格）")
+    @TableField("qualified")
+    private String qualified;
+
+    @ApiModelProperty("不合格说明")
+    @TableField("no_qualified_remark")
+    private String noQualifiedRemark;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+    @ApiModelProperty("导入道岔顺序")
+    @TableField("sort")
+    private Integer sort;
+
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-检查数据关联关系表（1个分析批次有多个检查批次） Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+public interface AnalysisLineBatchCheckDataMapMapper extends BaseMapper<AnalysisLineBatchCheckDataMap> {
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.checkData.dto.CorrugationRecordDTO;
+import org.jeecg.modules.checkData.vo.CorrugationRecordVO;
+import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchDTO;
+import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchInfoDTO;
+import org.jeecg.modules.diseaseAnalysis.dto.EkRecordsMasterCheckDTO;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
+import org.jeecg.modules.diseaseAnalysis.vo.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 线路质量分析	-分析批次表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+public interface AnalysisLineBatchMapper extends BaseMapper<AnalysisLineBatch> {
+    /**
+     * 线路质量分析-其他病害分析-检查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<EkRecordsMasterCheckVO> queryPageEkList(@Param("pageData")Page<EkRecordsMasterCheckVO> pageData, @Param("dto")EkRecordsMasterCheckDTO dto);
+
+    /**
+     * 线路质量分析-其他病害分析-线路巡查检查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<EkRecordPatrolMasterVO> queryPageEkPatrolList(@Param("pageData")Page<EkRecordPatrolMasterVO> pageData, @Param("dto")EkRecordsMasterCheckDTO dto);
+
+    /**
+     * 线路质量分析-其他病害分析-线路巡查检查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<AnalysisLineBatchVO> getPageList(@Param("pageData")Page<AnalysisLineBatchVO> pageData, @Param("dto")AnalysisLineBatchDTO dto);
+
+    /**
+     * 获取分析批次对应得检查批次信息
+     * @param analysisLineBatchIds 分析批次id集合
+     * @return
+     */
+    List<AnalysisLineBatchCheckDataMapVO> listRecordDetail(List<String> analysisLineBatchIds);
+
+    /**
+     * 线路质量分析-其他病害分析-线路巡查检查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<AnalysisLineBatchUnitDeviceVO> getInfoPageList(@Param("pageData") Page<AnalysisLineBatchUnitDeviceVO> pageData, @Param("dto")AnalysisLineBatchInfoDTO dto);
+
+
+    /**
+     * 线路质量分析-其他病害分析-详情检查记录查询
+     * @param analysisBatchId 分析批次id
+     * @param ekId 检查批次id
+     * @param deviceId 线路质量分析-其他病害分析-单元表id
+     * @return
+     */
+    List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> getAnalysisLineBatchUnitEkInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDevice;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备（1个分析批次有多个检查批次，1个检查批次有多个单位设备） Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+public interface AnalysisLineBatchUnitDeviceMapper extends BaseMapper<AnalysisLineBatchUnitDevice> {
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceTurnoutInfo;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+public interface AnalysisLineBatchUnitDeviceTurnoutInfoMapper extends BaseMapper<AnalysisLineBatchUnitDeviceTurnoutInfo> {
+
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchCheckDataMapMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchMapper">
+    <select id="queryPageEkList" resultType="org.jeecg.modules.diseaseAnalysis.vo.EkRecordsMasterCheckVO">
+        SELECT
+            t.*
+        FROM
+        t_ek_records_master_check t
+        WHERE
+        1=1
+        AND t.del_flag = '0'
+        AND t.type = #{dto.type}
+        <if test="dto.ekCode != null and dto.ekCode != ''">
+            AND t.ek_code like concat('%',#{dto.ekCode},'%')
+        </if>
+        <if test="dto.startTime != null">
+            AND t.check_time >= #{dto.startTime}
+        </if>
+        <if test="dto.endTime != null">
+            AND t.check_time <![CDATA[  <=  ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
+        </if>
+        ORDER BY t.update_time DESC
+    </select>
+
+    <select id="queryPageEkPatrolList" resultType="org.jeecg.modules.diseaseAnalysis.vo.EkRecordPatrolMasterVO">
+        SELECT
+        t.*
+        FROM
+        t_xd_record_patrol_master t
+        WHERE
+        1=1
+        AND t.del_flag = '0'
+        <if test="dto.ekCode != null and dto.ekCode != ''">
+            AND t.ek_code like concat('%',#{dto.ekCode},'%')
+        </if>
+        <if test="dto.startTime != null">
+            AND t.inspect_time >= #{dto.startTime}
+        </if>
+        <if test="dto.endTime != null">
+            AND t.inspect_time <![CDATA[  <=  ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
+        </if>
+        ORDER BY t.update_time DESC
+    </select>
+
+    <select id="getPageList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchVO">
+        SELECT
+        t1.*
+        FROM
+        t_dsa_analysis_line_batch t1
+        WHERE
+        1=1
+        <if test="dto.analysisBatchCode != null and dto.analysisBatchCode != ''">
+            AND t1.analysis_batch_code like concat('%',#{dto.analysisBatchCode},'%')
+        </if>
+        <if test="dto.ekType != null and dto.ekType != ''">
+            AND t1.ek_type = #{dto.ekType}
+        </if>
+        <if test="dto.lightRailId != null and dto.lightRailId != ''">
+            AND t1.light_rail_id = #{dto.lightRailId}
+        </if>
+        <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+            AND t1.line_alias_id = #{dto.lineAliasId}
+        </if>
+        <if test="dto.analysisStatus != null">
+            AND t1.analysis_status = #{dto.analysisStatus}
+        </if>
+        <if test="dto.startingMileage != null">
+            AND t1.starting_mileage >= #{dto.startingMileage}
+        </if>
+        <if test="dto.endMileage != null">
+            AND t1.end_mileage <![CDATA[  <=  ]]> #{dto.endMileage}
+        </if>
+        ORDER BY t1.update_time DESC
+    </select>
+    <select id="listRecordDetail" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchCheckDataMapVO">
+        SELECT
+            t1.*
+        FROM t_dsa_analysis_line_batch_check_data_map t1
+        WHERE t1.analysis_batch_id IN
+        <foreach collection="analysisLineBatchIds" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getInfoPageList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchUnitDeviceVO">
+        SELECT
+        t1.*
+        FROM
+        t_dsa_analysis_line_batch_unit_device t1
+        WHERE
+        1=1
+        <if test="dto.unitCode != null and dto.unitCode != ''">
+            AND t1.unit_code like concat('%',#{dto.unitCode},'%')
+        </if>
+        <if test="dto.analysisBatchId != null and dto.analysisBatchId != ''">
+            AND t1.analysis_batch_id = #{dto.analysisBatchId}
+        </if>
+        <if test="dto.workStatus != null">
+            AND t1.work_status = #{dto.workStatus}
+        </if>
+        ORDER BY t1.update_time DESC
+    </select>
+
+    <select id="getAnalysisLineBatchUnitEkInfoList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchUnitDeviceTurnoutInfoVO">
+        SELECT
+        t1.*
+        FROM
+        t_dsa_analysis_line_batch_unit_device_turnout_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/mapper/xml/AnalysisLineBatchUnitDeviceMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceTurnoutInfoMapper">
+
+</mapper>

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

+package org.jeecg.modules.diseaseAnalysis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-检查数据关联关系表（1个分析批次有多个检查批次） 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+public interface IAnalysisLineBatchCheckDataMapService extends IService<AnalysisLineBatchCheckDataMap> {
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.checkData.dto.CorrugationRecordDTO;
+import org.jeecg.modules.checkData.vo.CorrugationRecordVO;
+import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchDTO;
+import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchInfoDTO;
+import org.jeecg.modules.diseaseAnalysis.dto.EkRecordsMasterCheckDTO;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
+import org.jeecg.modules.diseaseAnalysis.vo.*;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 线路质量分析	-分析批次表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+public interface IAnalysisLineBatchService extends IService<AnalysisLineBatch> {
+    /**
+     * 线路质量分析-其他病害分析-检查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<EkRecordsMasterCheckVO> queryPageEkList(Page<EkRecordsMasterCheckVO> pageData, EkRecordsMasterCheckDTO dto);
+    /**
+     * 线路质量分析-其他病害分析-线路巡查检查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<EkRecordPatrolMasterVO> queryPageEkPatrolList(Page<EkRecordPatrolMasterVO> pageData, EkRecordsMasterCheckDTO dto);
+
+    /**
+     * 线路质量分析-其他病害分析-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<AnalysisLineBatchVO> getPageList(Page<AnalysisLineBatchVO> pageData, AnalysisLineBatchDTO dto);
+
+    /**
+     * 获取分析批次对应得检查批次信息
+     * @param analysisLineBatchIds 分析批次id集合
+     * @return
+     */
+    List<AnalysisLineBatchCheckDataMapVO> listRecordDetail(List<String> analysisLineBatchIds);
+
+    /**
+     * 线路质量分析-其他病害分析-详情查询-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    Page<AnalysisLineBatchUnitDeviceVO> getInfoPageList(Page<AnalysisLineBatchUnitDeviceVO> pageData, AnalysisLineBatchInfoDTO dto);
+
+    /**
+     * 线路质量分析-其他病害分析-详情检查记录查询
+     * @param analysisBatchId 分析批次id
+     * @param ekId 检查批次id
+     * @param deviceId 线路质量分析-其他病害分析-单元表id
+     * @return
+     */
+    List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> getAnalysisLineBatchUnitEkInfoList(String analysisBatchId, String ekId, String deviceId);
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDevice;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备） 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+public interface IAnalysisLineBatchUnitDeviceService extends IService<AnalysisLineBatchUnitDevice> {
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceTurnoutInfo;
+
+/**
+ * <p>
+ * 检查数据设备-设备检查记录数据-道岔使用情况检查数据 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+public interface IAnalysisLineBatchUnitDeviceTurnoutInfoService extends IService<AnalysisLineBatchUnitDeviceTurnoutInfo> {
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.service.impl;
+
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
+import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchCheckDataMapMapper;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchCheckDataMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-检查数据关联关系表（1个分析批次有多个检查批次） 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Service
+public class AnalysisLineBatchCheckDataMapServiceImpl extends ServiceImpl<AnalysisLineBatchCheckDataMapMapper, AnalysisLineBatchCheckDataMap> implements IAnalysisLineBatchCheckDataMapService {
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchDTO;
+import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchInfoDTO;
+import org.jeecg.modules.diseaseAnalysis.dto.EkRecordsMasterCheckDTO;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
+import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchMapper;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.diseaseAnalysis.vo.*;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 线路质量分析	-分析批次表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Service
+public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchMapper, AnalysisLineBatch> implements IAnalysisLineBatchService {
+    /**
+     * 线路质量分析-其他病害分析-检查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<EkRecordsMasterCheckVO> queryPageEkList(Page<EkRecordsMasterCheckVO> pageData, EkRecordsMasterCheckDTO dto) {
+        return this.baseMapper.queryPageEkList(pageData, dto);
+    }
+
+    /**
+     * 线路质量分析-其他病害分析-线路巡查检查记录-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<EkRecordPatrolMasterVO> queryPageEkPatrolList(Page<EkRecordPatrolMasterVO> pageData, EkRecordsMasterCheckDTO dto) {
+        return this.baseMapper.queryPageEkPatrolList(pageData, dto);
+    }
+    /**
+     * 线路质量分析-其他病害分析-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<AnalysisLineBatchVO> getPageList(Page<AnalysisLineBatchVO> pageData, AnalysisLineBatchDTO dto) {
+        return this.baseMapper.getPageList(pageData, dto);
+    }
+
+    /**
+     * 获取分析批次对应得检查批次信息
+     * @param analysisLineBatchIds 分析批次id集合
+     * @return
+     */
+    @Override
+    public List<AnalysisLineBatchCheckDataMapVO> listRecordDetail(List<String> analysisLineBatchIds) {
+        return this.baseMapper.listRecordDetail(analysisLineBatchIds);
+    }
+
+    /**
+     * 线路质量分析-其他病害分析-详情查询-分页列表查询
+     * @param pageData
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<AnalysisLineBatchUnitDeviceVO> getInfoPageList(Page<AnalysisLineBatchUnitDeviceVO> pageData, AnalysisLineBatchInfoDTO dto) {
+        return this.baseMapper.getInfoPageList(pageData,dto);
+    }
+    /**
+     * 线路质量分析-其他病害分析-详情检查记录查询
+     * @param analysisBatchId 分析批次id
+     * @param ekId 检查批次id
+     * @param deviceId 线路质量分析-其他病害分析-单元表id
+     * @return
+     */
+    @Override
+    public List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> getAnalysisLineBatchUnitEkInfoList(String analysisBatchId, String ekId, String deviceId) {
+        return this.baseMapper.getAnalysisLineBatchUnitEkInfoList(analysisBatchId,ekId,deviceId);
+    }
+}

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

+package org.jeecg.modules.diseaseAnalysis.service.impl;
+
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDevice;
+import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceMapper;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备） 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Service
+public class AnalysisLineBatchUnitDeviceServiceImpl extends ServiceImpl<AnalysisLineBatchUnitDeviceMapper, AnalysisLineBatchUnitDevice> implements IAnalysisLineBatchUnitDeviceService {
+
+}

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

+package org.jeecg.modules.diseaseAnalysis.service.impl;
+
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDeviceTurnoutInfo;
+import org.jeecg.modules.diseaseAnalysis.mapper.AnalysisLineBatchUnitDeviceTurnoutInfoMapper;
+import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceTurnoutInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检查数据设备-设备检查记录数据-道岔使用情况检查数据 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Service
+public class AnalysisLineBatchUnitDeviceTurnoutInfoServiceImpl extends ServiceImpl<AnalysisLineBatchUnitDeviceTurnoutInfoMapper, AnalysisLineBatchUnitDeviceTurnoutInfo> implements IAnalysisLineBatchUnitDeviceTurnoutInfoService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchCheckDataMapVO.java

+package org.jeecg.modules.diseaseAnalysis.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-检查数据关联关系表（1个分析批次有多个检查批次）
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchCheckDataMap对象", description = "线路质量分析-分析批次表-检查数据关联关系表（1个分析批次有多个检查批次）")
+
+public class AnalysisLineBatchCheckDataMapVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("检查批id")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号")
+    private String ekCode;
+
+    @ApiModelProperty("检查数据类型 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查")
+    private String ekType;
+
+    @ApiModelProperty("检查日期")
+    private Date checkTime;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("分析状态 0-创建 1-分析中  99-分析完成")
+    private Integer analysisStatus;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchUnitDeviceTurnoutInfoVO.java

+package org.jeecg.modules.diseaseAnalysis.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备，1个单元设备有多个详情）
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchUnitDeviceTurnoutInfo对象", description = "检查数据设备-设备检查记录数据-道岔使用情况检查数据")
+
+public class AnalysisLineBatchUnitDeviceTurnoutInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("设备检查记录主表id（t_ek_records_master_check）")
+    private String ekId;
+
+    @ApiModelProperty("检查批次号（t_ek_records_master_check）")
+    private String ekCode;
+
+    @ApiModelProperty("单元表id（t_dsa_analysis_line_batch_unit_device）")
+    private String deviceId;
+
+    @ApiModelProperty("设备编号(道岔表)")
+    private String switchCode;
+
+    @ApiModelProperty("设备号数(道岔表)")
+    private String switchCodeNum;
+
+    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓；9:道岔）")
+    private String type;
+
+    @ApiModelProperty("值1")
+    private String numOne;
+
+    @ApiModelProperty("值2")
+    private String numTwo;
+
+    @ApiModelProperty("值3")
+    private String numThree;
+
+    @ApiModelProperty("值4")
+    private String numFour;
+
+    @ApiModelProperty("值5")
+    private String numFive;
+
+    @ApiModelProperty("值6")
+    private String numSix;
+
+    @ApiModelProperty("值7")
+    private String numSeven;
+
+    @ApiModelProperty("值8")
+    private String numEight;
+
+    @ApiModelProperty("值9")
+    private String numNine;
+
+    @ApiModelProperty("值10")
+    private String numTen;
+
+    @ApiModelProperty("值11")
+    private String numTenOne;
+
+    @ApiModelProperty("值12")
+    private String numTenTwo;
+
+    @ApiModelProperty("值13")
+    private String numTenThree;
+
+    @ApiModelProperty("值14")
+    private String numTenFour;
+
+    @ApiModelProperty("值15")
+    private String numTenFive;
+
+    @ApiModelProperty("值16")
+    private String numTenSix;
+
+    @ApiModelProperty("值17")
+    private String numTenSeven;
+
+    @ApiModelProperty("值18")
+    private String numTenEight;
+
+    @ApiModelProperty("值19")
+    private String numTenNine;
+
+    @ApiModelProperty("值20")
+    private String numTwenty;
+
+    @ApiModelProperty("值21")
+    private String numTwentyOne;
+
+    @ApiModelProperty("值22")
+    private String numTwentyTwo;
+
+    @ApiModelProperty("是否合格（1：合格；2：不合格）")
+    private String qualified;
+
+    @ApiModelProperty("不合格说明")
+    private String noQualifiedRemark;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
+    private String delFlag;
+
+    @ApiModelProperty("导入道岔顺序")
+    private Integer sort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchUnitDeviceVO.java

+package org.jeecg.modules.diseaseAnalysis.vo;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 线路质量分析-分析批次表-单元设备（1个分析批次有多个检查批次，1个检查批次有多个单位设备）
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatchUnitDevice对象", description = "线路质量分析-分析批次表-单元设备详情（1个分析批次有多个检查批次，1个检查批次有多个单位设备）")
+
+public class AnalysisLineBatchUnitDeviceVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("检查批次编码")
+    private String ekCode;
+
+    @ApiModelProperty("检查批次id")
+    private String ekId;
+
+    @ApiModelProperty("单元设备id")
+    private String unitId;
+
+    @ApiModelProperty("单元设备code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+    @ApiModelProperty("设备编号")
+    private String unitDeviceCode;
+
+    @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元结束里程")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("派工状态（1：未派工，2：已派工）")
+    private Integer workStatus;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchVO.java

+package org.jeecg.modules.diseaseAnalysis.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
+
+/**
+ * <p>
+ * 线路质量分析	-分析批次表
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "AnalysisLineBatch对象", description = "线路质量分析	-分析批次表")
+
+public class AnalysisLineBatchVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("所属线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("分析起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("分析终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("分析状态 0-创建 1-分析中  99-分析完成")
+    private Integer analysisStatus;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
+    private String ekType;
+
+    @ApiModelProperty("分析批次对应得检查批次列表")
+    private List<AnalysisLineBatchCheckDataMapVO> voInfoList;
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/EkRecordPatrolMasterVO.java

+package org.jeecg.modules.diseaseAnalysis.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 线路巡查检查批次查询返回类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-08
+ */
+@Data
+public class EkRecordPatrolMasterVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @ApiModelProperty("检查批次编号")
+    private String ekCode;
+
+    @ApiModelProperty("工单编号")
+    private String workCode;
+
+    @ApiModelProperty("检查日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date inspectTime;
+
+    @ApiModelProperty("天气")
+    private String weather;
+
+    @ApiModelProperty("巡查线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("巡查线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("计划巡道里程（km）")
+    private BigDecimal plannedPatrolMileage;
+
+    @ApiModelProperty("巡道线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("巡道线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("完成里程")
+    private BigDecimal completedMileage;
+
+    @ApiModelProperty("巡道类型(1:步行巡道 2:乘车巡道)")
+    private String patrolType;
+
+    @ApiModelProperty("巡道类型翻译(1:步行巡道 2:乘车巡道)")
+    private String patrolTypeStr;
+
+    @ApiModelProperty("巡道工时")
+    private BigDecimal patrolHourse;
+
+    @ApiModelProperty("检查人姓名")
+    private String checkBy;
+
+    @ApiModelProperty("清点时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
+    private Date checkTime;
+
+    @ApiModelProperty("销点时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
+    private Date pinpointTime;
+
+    @ApiModelProperty("审核人姓名")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date verifyTime;
+
+    @ApiModelProperty("巡道员备忘录")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/EkRecordsMasterCheckVO.java

+package org.jeecg.modules.diseaseAnalysis.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 检查批次查询返回类
+ * </p>
+ *
+ * @author hkl
+ * @since 2024-07-19
+ */
+@Getter
+@Setter
+@ApiModel(value = "EkRecordsMasterCheckVO对象", description = "检查批次查询返回类")
+
+public class EkRecordsMasterCheckVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("设备检查记录主表id")
+    private String recordsMasterCheckId;
+
+    @ApiModelProperty("检查批次号")
+    private String ekCode;
+
+    @ApiModelProperty("工单编号")
+    private String workCode;
+
+    @ApiModelProperty("检查区间id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("检查区间名称")
+    private String subwaySectionName;
+
+    @ApiModelProperty("所属线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    private String lineAliasName;
+
+    @ApiModelProperty("车站id")
+    private String stationId;
+
+    @ApiModelProperty("车站名称")
+    private String stationName;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("检查日期")
+    private Date checkTime;
+
+    @ApiModelProperty("检查人")
+    private String checkBy;
+
+    @ApiModelProperty("审核人姓名")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    private Date verifyTime;
+
+    @ApiModelProperty("起点里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+}