feat:1.代码提交

jeecg-module-system/pom.xml

@@ -73,6 +73,10 @@
             <properties>
                 <package.environment>hkl</package.environment>
             </properties>
+            <!-- 是否默认 true表示默认-->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
 
         <!-- 测试环境 -->
@@ -81,10 +85,6 @@
             <properties>
                 <package.environment>test</package.environment>
             </properties>
-            <!-- 是否默认 true表示默认-->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
 
         <!-- 压测环境-->
@@ -114,4 +114,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

jeecg-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -37,7 +37,6 @@ public class JeecgSystemApplication extends SpringBootServletInitializer {
                 "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
                 "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
                 "----------------------------------------------------------");
-
     }
 
-}
\ No newline at end of file
+}

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

@@ -29,7 +29,8 @@ public class CodeGenerate {
 
         // 表名
         String[] tables = {
-                "t_dsa_config_tqi_limit",
+                "t_dsa_analysis_over_report_check_unit_device_map",
+                "t_dsa_analysis_tqi_report_check_unit_device_map",
         };
 
 

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisAdditiveCheckUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_additive_check_unit_device_map")
+@ApiModel(value = "AnalysisAdditiveCheckUnitDeviceMap对象", description = "动静态几何尺寸对应的添乘仪详情表")
+public class AnalysisAdditiveCheckUnitDeviceMap 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("分析批次code")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    @TableField("movement_master_id")
+    private String movementMasterId;
+
+    @ApiModelProperty("设备单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("设备单元编码")
+    @TableField("unit_code")
+    private String unitCode;
+
+    @ApiModelProperty("设备单元编码")
+    @TableField("unit_device_code")
+    private String unitDeviceCode;
+
+    @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    @TableField("unit_type")
+    private Integer unitType;
+
+    @ApiModelProperty("设备单元类型名称")
+    @TableField("unit_type_name")
+    private String unitTypeName;
+
+    @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("测点里程")
+    @TableField("point_mileage")
+    private BigDecimal pointMileage;
+
+    @ApiModelProperty("水平加速度")
+    @TableField("zontal_speed")
+    private BigDecimal zontalSpeed;
+
+    @ApiModelProperty("水平加速度等级")
+    @TableField("zontal_speed_level")
+    private Integer zontalSpeedLevel;
+
+    @ApiModelProperty("垂直加速度")
+    @TableField("vertical_speed")
+    private BigDecimal verticalSpeed;
+
+    @ApiModelProperty("垂直加速度等级")
+    @TableField("vertical_speed_level")
+    private Integer verticalSpeedLevel;
+
+    @ApiModelProperty("速度")
+    @TableField("speed")
+    private BigDecimal speed;
+
+    @ApiModelProperty("手动标记")
+    @TableField("mark")
+    private String mark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+    @ApiModelProperty("排序字段")
+    @TableField("info_sort")
+    private Integer infoSort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisLabourCheckDataUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_labour_check_data_unit_device_map")
+@ApiModel(value = "AnalysisLabourCheckDataUnitDeviceMap对象", description = "动静态分析-人工检查数据分析批次映射")
+public class AnalysisLabourCheckDataUnitDeviceMap 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("分析批次code")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("设备单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("设备单元编码")
+    @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_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元终点里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("检查主表id")
+    @TableField("check_id")
+    private String checkId;
+
+    @ApiModelProperty("检查项目id")
+    @TableField("check_item_id")
+    private String checkItemId;
+
+    @ApiModelProperty("检查项目开始里程")
+    @TableField("check_item_starting_mileage")
+    private BigDecimal checkItemStartingMileage;
+
+    @ApiModelProperty("检查项目结束里程")
+    @TableField("check_item_end_mileage")
+    private BigDecimal checkItemEndMileage;
+
+    @ApiModelProperty("检查项目文本")
+    @TableField("check_item_text")
+    private String checkItemText;
+
+    @ApiModelProperty("检查详情id")
+    @TableField("check_detail_id")
+    private String checkDetailId;
+
+    @ApiModelProperty("检查详情开始里程")
+    @TableField("check_detail_starting_mileage")
+    private BigDecimal checkDetailStartingMileage;
+
+    @ApiModelProperty("检查详情结束里程")
+    @TableField("check_detail_end_mileage")
+    private BigDecimal checkDetailEndMileage;
+
+    @ApiModelProperty("测点")
+    @TableField("measure_point")
+    private Integer measurePoint;
+
+    @ApiModelProperty("轨距")
+    @TableField("track_gauge")
+    private String trackGauge;
+
+    @ApiModelProperty("水平")
+    @TableField("level")
+    private String level;
+
+    @ApiModelProperty("三角坑")
+    @TableField("triangular_pit")
+    private String triangularPit;
+
+    @ApiModelProperty("方向")
+    @TableField("direction")
+    private String direction;
+
+    @ApiModelProperty("高低")
+    @TableField("height")
+    private String height;
+
+    @ApiModelProperty("结构")
+    @TableField("structure")
+    private String structure;
+
+    @ApiModelProperty("整改")
+    @TableField("rectification")
+    private String rectification;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisOverReportCheckUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_over_report_check_unit_device_map")
+@ApiModel(value = "AnalysisOverReportCheckUnitDeviceMap对象", description = "分析批次-动静态几何尺寸-轨检车单元设备映射")
+public class AnalysisOverReportCheckUnitDeviceMap 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_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("设备单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("设备单元编码")
+    @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_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元终点里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("检查主表id")
+    @TableField("check_id")
+    private String checkId;
+
+    @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+    @TableField("check_type")
+    private Integer checkType;
+
+    @ApiModelProperty("轨检车超限表id")
+    @TableField("over_report_id")
+    private String overReportId;
+
+    @ApiModelProperty("超限里程")
+    @TableField("over_report_mileage")
+    private BigDecimal overReportMileage;
+
+    @ApiModelProperty("超限类型")
+    @TableField("over_type")
+    private String overType;
+
+    @ApiModelProperty("超限等级")
+    @TableField("over_level")
+    private Integer overLevel;
+
+    @ApiModelProperty("长度")
+    @TableField("longitude")
+    private String longitude;
+
+    @ApiModelProperty("峰值（mm或g）")
+    @TableField("peak_value")
+    private String peakValue;
+
+    @ApiModelProperty("管理数据差")
+    @TableField("data_difference")
+    private String dataDifference;
+
+    @ApiModelProperty("线性")
+    @TableField("xianxing")
+    private String xianxing;
+
+    @ApiModelProperty("检查标准")
+    @TableField("standard")
+    private String standard;
+
+    @ApiModelProperty("速度（km/h）")
+    @TableField("spend")
+    private String spend;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisRailDeviceCheckDataUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_rail_device_check_data_unit_device_map")
+@ApiModel(value = "AnalysisRailDeviceCheckDataUnitDeviceMap对象", description = "动静态分析-轨检仪静态检查数据分析批次映射")
+public class AnalysisRailDeviceCheckDataUnitDeviceMap 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("分析批次code")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批次单元设备id")
+    @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("设备单元id")
+    @TableField("unit_id")
+    private String unitId;
+
+    @ApiModelProperty("设备单元编码")
+    @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_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元终点里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("检查主表id")
+    @TableField("check_id")
+    private String checkId;
+
+    @ApiModelProperty("检查项目id")
+    @TableField("check_item_id")
+    private String checkItemId;
+
+    @ApiModelProperty("检查项目开始里程")
+    @TableField("check_item_starting_mileage")
+    private BigDecimal checkItemStartingMileage;
+
+    @ApiModelProperty("检查项目结束里程")
+    @TableField("check_item_end_mileage")
+    private BigDecimal checkItemEndMileage;
+
+    @ApiModelProperty("检查项目文本")
+    @TableField("check_item_text")
+    private String checkItemText;
+
+    @ApiModelProperty("检查详情id")
+    @TableField("check_detail_id")
+    private String checkDetailId;
+
+    @ApiModelProperty("检查详情开始里程")
+    @TableField("check_detail_starting_mileage")
+    private BigDecimal checkDetailStartingMileage;
+
+    @ApiModelProperty("检查详情结束里程")
+    @TableField("check_detail_end_mileage")
+    private BigDecimal checkDetailEndMileage;
+
+    @ApiModelProperty("测点")
+    @TableField("measure_point")
+    private Integer measurePoint;
+
+    @ApiModelProperty("轨距")
+    @TableField("track_gauge")
+    private String trackGauge;
+
+    @ApiModelProperty("水平")
+    @TableField("level")
+    private String level;
+
+    @ApiModelProperty("三角坑")
+    @TableField("triangular_pit")
+    private String triangularPit;
+
+    @ApiModelProperty("方向")
+    @TableField("direction")
+    private String direction;
+
+    @ApiModelProperty("高低")
+    @TableField("height")
+    private String height;
+
+    @ApiModelProperty("结构")
+    @TableField("structure")
+    private String structure;
+
+    @ApiModelProperty("整改")
+    @TableField("rectification")
+    private String rectification;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisTqiReportCheckUnitDeviceMap.java

+package org.jeecg.modules.dynamicStaticAnalysis.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>
+ * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Getter
+@Setter
+@TableName("t_dsa_analysis_tqi_report_check_unit_device_map")
+@ApiModel(value = "AnalysisTqiReportCheckUnitDeviceMap对象", description = "动静态分析-轨检车-tqi单元总结报告和单元映射关联关系")
+public class AnalysisTqiReportCheckUnitDeviceMap 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_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+    @ApiModelProperty("分析批次号")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("检查主表id")
+    @TableField("check_id")
+    private String checkId;
+
+    @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+    @TableField("check_type")
+    private Integer checkType;
+
+    @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_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+    @ApiModelProperty("设备单元中心里程")
+    @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+    @ApiModelProperty("设备单元结束里程")
+    @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+    @ApiModelProperty("tqi报告id")
+    @TableField("tqi_report_id")
+    private String tqiReportId;
+
+    @ApiModelProperty("开始里程(m)")
+    @TableField("start_mileage")
+    private BigDecimal startMileage;
+
+    @ApiModelProperty("终点里程(m)")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("区间名称")
+    @TableField("section_name")
+    private String sectionName;
+
+    @ApiModelProperty("高低左")
+    @TableField("high_low_left")
+    private String highLowLeft;
+
+    @ApiModelProperty("高低右")
+    @TableField("high_low_right")
+    private String highLowRight;
+
+    @ApiModelProperty("轨向左")
+    @TableField("track_left")
+    private String trackLeft;
+
+    @ApiModelProperty("轨向右")
+    @TableField("track_right")
+    private String trackRight;
+
+    @ApiModelProperty("水平（mm）")
+    @TableField("level")
+    private String level;
+
+    @ApiModelProperty("轨距（mm）")
+    @TableField("track_gauge")
+    private String trackGauge;
+
+    @ApiModelProperty("三角坑（mm）")
+    @TableField("triangular_pit")
+    private String triangularPit;
+
+    @ApiModelProperty("TQI数值")
+    @TableField("tqi_come_upon")
+    private String tqiComeUpon;
+
+    @ApiModelProperty("TQI超标")
+    @TableField("tqi_above_standard")
+    private String tqiAboveStandard;
+
+    @ApiModelProperty("扣分")
+    @TableField("deduct")
+    private String deduct;
+
+    @ApiModelProperty("检测标准")
+    @TableField("standard")
+    private String standard;
+
+    @ApiModelProperty("速度（km/h）")
+    @TableField("spend")
+    private String spend;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/face/impl/AnalysisBatchUnitDeviceFaceImpl.java

@@ -20,17 +20,21 @@ public class AnalysisBatchUnitDeviceFaceImpl implements AnalysisBatchUnitDeviceF
     public CaseReportCheckDataDetailVO checkData(String id) {
         CaseReportCheckDataDetailVO vo = new CaseReportCheckDataDetailVO();
         // 静态数据
-        List<StaticCheckVO> staticCheckVOS = analysisBatchUnitDeviceService.getUnitDeviceStaticData(id);
-        List<StaticCheckVO> labourCheckVOList = new ArrayList<>();
-        List<StaticCheckVO> railDeviceCheckVOList = new ArrayList<>();
-        for (StaticCheckVO staticCheckVO : staticCheckVOS) {
-            if (staticCheckVO.getCheckType() == 1) {
-                labourCheckVOList.add(staticCheckVO);
-            } else {
-                railDeviceCheckVOList.add(staticCheckVO);
-            }
-        }
+//        List<StaticCheckVO> staticCheckVOS = analysisBatchUnitDeviceService.getUnitDeviceStaticData(id);
+//        for (StaticCheckVO staticCheckVO : staticCheckVOS) {
+//            if (staticCheckVO.getCheckType() == 1) {
+//                labourCheckVOList.add(staticCheckVO);
+//            } else {
+//                railDeviceCheckVOList.add(staticCheckVO);
+//            }
+//        }
+
+        // 人工检查
+        List<StaticCheckVO> labourCheckVOList = analysisBatchUnitDeviceService.getLabourCheck(id);
         vo.setLabourCheckVOList(labourCheckVOList);
+
+        // 轨检仪
+        List<StaticCheckVO> railDeviceCheckVOList = analysisBatchUnitDeviceService.getRailDeviceCheck(id);
         vo.setRailDeviceCheckVOList(railDeviceCheckVOList);
 
 

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisAdditiveCheckUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisAdditiveCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisAdditiveCheckUnitDeviceMapMapper extends BaseMapper<AnalysisAdditiveCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisBatchUnitDeviceMapper.java

@@ -35,4 +35,8 @@ public interface AnalysisBatchUnitDeviceMapper extends BaseMapper<AnalysisBatchU
     List<RailVehicleTqiVO> getUnitDeviceTqi(String id);
 
     List<RailAddInstrumentCheckVO> getUnitDeviceAdditiveInfo(String id);
+
+    List<StaticCheckVO> getLabourCheck(String id);
+
+    List<StaticCheckVO> getRailDeviceCheck(String id);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisLabourCheckDataUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisLabourCheckDataUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态分析-人工检查数据分析批次映射 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisLabourCheckDataUnitDeviceMapMapper extends BaseMapper<AnalysisLabourCheckDataUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisOverReportCheckUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisOverReportCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 分析批次-动静态几何尺寸-轨检车单元设备映射 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisOverReportCheckUnitDeviceMapMapper extends BaseMapper<AnalysisOverReportCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisRailDeviceCheckDataUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisRailDeviceCheckDataUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态分析-轨检仪静态检查数据分析批次映射 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisRailDeviceCheckDataUnitDeviceMapMapper extends BaseMapper<AnalysisRailDeviceCheckDataUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/AnalysisTqiReportCheckUnitDeviceMapMapper.java

+package org.jeecg.modules.dynamicStaticAnalysis.mapper;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisTqiReportCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface AnalysisTqiReportCheckUnitDeviceMapMapper extends BaseMapper<AnalysisTqiReportCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisAdditiveCheckUnitDeviceMapMapper.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.dynamicStaticAnalysis.mapper.AnalysisAdditiveCheckUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisLabourCheckDataUnitDeviceMapMapper.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.dynamicStaticAnalysis.mapper.AnalysisLabourCheckDataUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisOverReportCheckUnitDeviceMapMapper.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.dynamicStaticAnalysis.mapper.AnalysisOverReportCheckUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisRailDeviceCheckDataUnitDeviceMapMapper.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.dynamicStaticAnalysis.mapper.AnalysisRailDeviceCheckDataUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisTqiReportCheckUnitDeviceMapMapper.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.dynamicStaticAnalysis.mapper.AnalysisTqiReportCheckUnitDeviceMapMapper">
+
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisAdditiveCheckUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisAdditiveCheckUnitDeviceMap对象", description = "动静态几何尺寸对应的添乘仪详情表")
+
+public class AnalysisAdditiveCheckUnitDeviceMapDTO {
+
+
+    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("分析批次code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    private String movementMasterId;
+
+            @ApiModelProperty("设备单元id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitDeviceCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("测点里程")
+    private BigDecimal pointMileage;
+
+            @ApiModelProperty("水平加速度")
+    private BigDecimal zontalSpeed;
+
+            @ApiModelProperty("水平加速度等级")
+    private Integer zontalSpeedLevel;
+
+            @ApiModelProperty("垂直加速度")
+    private BigDecimal verticalSpeed;
+
+            @ApiModelProperty("垂直加速度等级")
+    private Integer verticalSpeedLevel;
+
+            @ApiModelProperty("速度")
+    private BigDecimal speed;
+
+            @ApiModelProperty("手动标记")
+    private String mark;
+
+            @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+            @ApiModelProperty("排序字段")
+    private Integer infoSort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisAdditiveCheckUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisAdditiveCheckUnitDeviceMap对象", description = "动静态几何尺寸对应的添乘仪详情表")
+
+public class AnalysisAdditiveCheckUnitDeviceMapVO {
+
+
+    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("分析批次code")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+        @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+        @TableField("movement_master_id")
+    private String movementMasterId;
+
+            @ApiModelProperty("设备单元id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+        @TableField("unit_code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元编码")
+        @TableField("unit_device_code")
+    private String unitDeviceCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+        @TableField("unit_type")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+        @TableField("unit_type_name")
+    private String unitTypeName;
+
+            @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("测点里程")
+        @TableField("point_mileage")
+    private BigDecimal pointMileage;
+
+            @ApiModelProperty("水平加速度")
+        @TableField("zontal_speed")
+    private BigDecimal zontalSpeed;
+
+            @ApiModelProperty("水平加速度等级")
+        @TableField("zontal_speed_level")
+    private Integer zontalSpeedLevel;
+
+            @ApiModelProperty("垂直加速度")
+        @TableField("vertical_speed")
+    private BigDecimal verticalSpeed;
+
+            @ApiModelProperty("垂直加速度等级")
+        @TableField("vertical_speed_level")
+    private Integer verticalSpeedLevel;
+
+            @ApiModelProperty("速度")
+        @TableField("speed")
+    private BigDecimal speed;
+
+            @ApiModelProperty("手动标记")
+        @TableField("mark")
+    private String mark;
+
+            @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+        @TableField("del_flag")
+    private String delFlag;
+
+            @ApiModelProperty("排序字段")
+        @TableField("info_sort")
+    private Integer infoSort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisLabourCheckDataUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisLabourCheckDataUnitDeviceMap对象", description = "动静态分析-人工检查数据分析批次映射")
+
+public class AnalysisLabourCheckDataUnitDeviceMapDTO {
+
+
+    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("分析批次code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("设备单元id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+    private String checkId;
+
+            @ApiModelProperty("检查项目id")
+    private String checkItemId;
+
+            @ApiModelProperty("检查项目开始里程")
+    private BigDecimal checkItemStartingMileage;
+
+            @ApiModelProperty("检查项目结束里程")
+    private BigDecimal checkItemEndMileage;
+
+            @ApiModelProperty("检查项目文本")
+    private String checkItemText;
+
+            @ApiModelProperty("检查详情id")
+    private String checkDetailId;
+
+            @ApiModelProperty("检查详情开始里程")
+    private BigDecimal checkDetailStartingMileage;
+
+            @ApiModelProperty("检查详情结束里程")
+    private BigDecimal checkDetailEndMileage;
+
+            @ApiModelProperty("测点")
+    private Integer measurePoint;
+
+            @ApiModelProperty("轨距")
+    private String trackGauge;
+
+            @ApiModelProperty("水平")
+    private String level;
+
+            @ApiModelProperty("三角坑")
+    private String triangularPit;
+
+            @ApiModelProperty("方向")
+    private String direction;
+
+            @ApiModelProperty("高低")
+    private String height;
+
+            @ApiModelProperty("结构")
+    private String structure;
+
+            @ApiModelProperty("整改")
+    private String rectification;
+
+            @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisLabourCheckDataUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisLabourCheckDataUnitDeviceMap对象", description = "动静态分析-人工检查数据分析批次映射")
+
+public class AnalysisLabourCheckDataUnitDeviceMapVO {
+
+
+    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("分析批次code")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+        @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("设备单元id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+        @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_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+        @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+        @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+        @TableField("check_id")
+    private String checkId;
+
+            @ApiModelProperty("检查项目id")
+        @TableField("check_item_id")
+    private String checkItemId;
+
+            @ApiModelProperty("检查项目开始里程")
+        @TableField("check_item_starting_mileage")
+    private BigDecimal checkItemStartingMileage;
+
+            @ApiModelProperty("检查项目结束里程")
+        @TableField("check_item_end_mileage")
+    private BigDecimal checkItemEndMileage;
+
+            @ApiModelProperty("检查项目文本")
+        @TableField("check_item_text")
+    private String checkItemText;
+
+            @ApiModelProperty("检查详情id")
+        @TableField("check_detail_id")
+    private String checkDetailId;
+
+            @ApiModelProperty("检查详情开始里程")
+        @TableField("check_detail_starting_mileage")
+    private BigDecimal checkDetailStartingMileage;
+
+            @ApiModelProperty("检查详情结束里程")
+        @TableField("check_detail_end_mileage")
+    private BigDecimal checkDetailEndMileage;
+
+            @ApiModelProperty("测点")
+        @TableField("measure_point")
+    private Integer measurePoint;
+
+            @ApiModelProperty("轨距")
+        @TableField("track_gauge")
+    private String trackGauge;
+
+            @ApiModelProperty("水平")
+        @TableField("level")
+    private String level;
+
+            @ApiModelProperty("三角坑")
+        @TableField("triangular_pit")
+    private String triangularPit;
+
+            @ApiModelProperty("方向")
+        @TableField("direction")
+    private String direction;
+
+            @ApiModelProperty("高低")
+        @TableField("height")
+    private String height;
+
+            @ApiModelProperty("结构")
+        @TableField("structure")
+    private String structure;
+
+            @ApiModelProperty("整改")
+        @TableField("rectification")
+    private String rectification;
+
+            @ApiModelProperty("备注")
+        @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisOverReportCheckUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisOverReportCheckUnitDeviceMap对象", description = "分析批次-动静态几何尺寸-轨检车单元设备映射")
+
+public class AnalysisOverReportCheckUnitDeviceMapDTO {
+
+
+    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 analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("设备单元id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+    private String checkId;
+
+            @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+    private Integer checkType;
+
+            @ApiModelProperty("轨检车超限表id")
+    private String overReportId;
+
+            @ApiModelProperty("超限里程")
+    private BigDecimal overReportMileage;
+
+            @ApiModelProperty("超限类型")
+    private String overType;
+
+            @ApiModelProperty("超限等级")
+    private Integer overLevel;
+
+            @ApiModelProperty("长度")
+    private String longitude;
+
+            @ApiModelProperty("峰值（mm或g）")
+    private String peakValue;
+
+            @ApiModelProperty("管理数据差")
+    private String dataDifference;
+
+            @ApiModelProperty("线性")
+    private String xianxing;
+
+            @ApiModelProperty("检查标准")
+    private String standard;
+
+            @ApiModelProperty("速度（km/h）")
+    private String spend;
+
+            @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisOverReportCheckUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisOverReportCheckUnitDeviceMap对象", description = "分析批次-动静态几何尺寸-轨检车单元设备映射")
+
+public class AnalysisOverReportCheckUnitDeviceMapVO {
+
+
+    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_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+        @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("设备单元id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+        @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_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+        @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+        @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+        @TableField("check_id")
+    private String checkId;
+
+            @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+        @TableField("check_type")
+    private Integer checkType;
+
+            @ApiModelProperty("轨检车超限表id")
+        @TableField("over_report_id")
+    private String overReportId;
+
+            @ApiModelProperty("超限里程")
+        @TableField("over_report_mileage")
+    private BigDecimal overReportMileage;
+
+            @ApiModelProperty("超限类型")
+        @TableField("over_type")
+    private String overType;
+
+            @ApiModelProperty("超限等级")
+        @TableField("over_level")
+    private Integer overLevel;
+
+            @ApiModelProperty("长度")
+        @TableField("longitude")
+    private String longitude;
+
+            @ApiModelProperty("峰值（mm或g）")
+        @TableField("peak_value")
+    private String peakValue;
+
+            @ApiModelProperty("管理数据差")
+        @TableField("data_difference")
+    private String dataDifference;
+
+            @ApiModelProperty("线性")
+        @TableField("xianxing")
+    private String xianxing;
+
+            @ApiModelProperty("检查标准")
+        @TableField("standard")
+    private String standard;
+
+            @ApiModelProperty("速度（km/h）")
+        @TableField("spend")
+    private String spend;
+
+            @ApiModelProperty("备注")
+        @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisRailDeviceCheckDataUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisRailDeviceCheckDataUnitDeviceMap对象", description = "动静态分析-轨检仪静态检查数据分析批次映射")
+
+public class AnalysisRailDeviceCheckDataUnitDeviceMapDTO {
+
+
+    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("分析批次code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("设备单元id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元类型名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元起始里程")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+    private String checkId;
+
+            @ApiModelProperty("检查项目id")
+    private String checkItemId;
+
+            @ApiModelProperty("检查项目开始里程")
+    private BigDecimal checkItemStartingMileage;
+
+            @ApiModelProperty("检查项目结束里程")
+    private BigDecimal checkItemEndMileage;
+
+            @ApiModelProperty("检查项目文本")
+    private String checkItemText;
+
+            @ApiModelProperty("检查详情id")
+    private String checkDetailId;
+
+            @ApiModelProperty("检查详情开始里程")
+    private BigDecimal checkDetailStartingMileage;
+
+            @ApiModelProperty("检查详情结束里程")
+    private BigDecimal checkDetailEndMileage;
+
+            @ApiModelProperty("测点")
+    private Integer measurePoint;
+
+            @ApiModelProperty("轨距")
+    private String trackGauge;
+
+            @ApiModelProperty("水平")
+    private String level;
+
+            @ApiModelProperty("三角坑")
+    private String triangularPit;
+
+            @ApiModelProperty("方向")
+    private String direction;
+
+            @ApiModelProperty("高低")
+    private String height;
+
+            @ApiModelProperty("结构")
+    private String structure;
+
+            @ApiModelProperty("整改")
+    private String rectification;
+
+            @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisRailDeviceCheckDataUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisRailDeviceCheckDataUnitDeviceMap对象", description = "动静态分析-轨检仪静态检查数据分析批次映射")
+
+public class AnalysisRailDeviceCheckDataUnitDeviceMapVO {
+
+
+    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("分析批次code")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批次单元设备id")
+        @TableField("analysis_batch_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("设备单元id")
+        @TableField("unit_id")
+    private String unitId;
+
+            @ApiModelProperty("设备单元编码")
+        @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_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+        @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元终点里程")
+        @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("检查主表id")
+        @TableField("check_id")
+    private String checkId;
+
+            @ApiModelProperty("检查项目id")
+        @TableField("check_item_id")
+    private String checkItemId;
+
+            @ApiModelProperty("检查项目开始里程")
+        @TableField("check_item_starting_mileage")
+    private BigDecimal checkItemStartingMileage;
+
+            @ApiModelProperty("检查项目结束里程")
+        @TableField("check_item_end_mileage")
+    private BigDecimal checkItemEndMileage;
+
+            @ApiModelProperty("检查项目文本")
+        @TableField("check_item_text")
+    private String checkItemText;
+
+            @ApiModelProperty("检查详情id")
+        @TableField("check_detail_id")
+    private String checkDetailId;
+
+            @ApiModelProperty("检查详情开始里程")
+        @TableField("check_detail_starting_mileage")
+    private BigDecimal checkDetailStartingMileage;
+
+            @ApiModelProperty("检查详情结束里程")
+        @TableField("check_detail_end_mileage")
+    private BigDecimal checkDetailEndMileage;
+
+            @ApiModelProperty("测点")
+        @TableField("measure_point")
+    private Integer measurePoint;
+
+            @ApiModelProperty("轨距")
+        @TableField("track_gauge")
+    private String trackGauge;
+
+            @ApiModelProperty("水平")
+        @TableField("level")
+    private String level;
+
+            @ApiModelProperty("三角坑")
+        @TableField("triangular_pit")
+    private String triangularPit;
+
+            @ApiModelProperty("方向")
+        @TableField("direction")
+    private String direction;
+
+            @ApiModelProperty("高低")
+        @TableField("height")
+    private String height;
+
+            @ApiModelProperty("结构")
+        @TableField("structure")
+    private String structure;
+
+            @ApiModelProperty("整改")
+        @TableField("rectification")
+    private String rectification;
+
+            @ApiModelProperty("备注")
+        @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisTqiReportCheckUnitDeviceMapDTO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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>
+    * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisTqiReportCheckUnitDeviceMap对象", description = "动静态分析-轨检车-tqi单元总结报告和单元映射关联关系")
+
+public class AnalysisTqiReportCheckUnitDeviceMapDTO {
+
+
+    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 analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("检查主表id")
+    private String checkId;
+
+            @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+    private Integer checkType;
+
+            @ApiModelProperty("单元id")
+    private String unitId;
+
+            @ApiModelProperty("单元code")
+    private String unitCode;
+
+            @ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
+    private Integer unitType;
+
+            @ApiModelProperty("设备单元名称")
+    private String unitTypeName;
+
+            @ApiModelProperty("设备单元开始里程")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元结束里程")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("tqi报告id")
+    private String tqiReportId;
+
+            @ApiModelProperty("开始里程(m)")
+    private BigDecimal startMileage;
+
+            @ApiModelProperty("终点里程(m)")
+    private BigDecimal endMileage;
+
+            @ApiModelProperty("区间名称")
+    private String sectionName;
+
+            @ApiModelProperty("高低左")
+    private String highLowLeft;
+
+            @ApiModelProperty("高低右")
+    private String highLowRight;
+
+            @ApiModelProperty("轨向左")
+    private String trackLeft;
+
+            @ApiModelProperty("轨向右")
+    private String trackRight;
+
+            @ApiModelProperty("水平（mm）")
+    private String level;
+
+            @ApiModelProperty("轨距（mm）")
+    private String trackGauge;
+
+            @ApiModelProperty("三角坑（mm）")
+    private String triangularPit;
+
+            @ApiModelProperty("TQI数值")
+    private String tqiComeUpon;
+
+            @ApiModelProperty("TQI超标")
+    private String tqiAboveStandard;
+
+            @ApiModelProperty("扣分")
+    private String deduct;
+
+            @ApiModelProperty("检测标准")
+    private String standard;
+
+            @ApiModelProperty("速度（km/h）")
+    private String spend;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/AnalysisTqiReportCheckUnitDeviceMapVO.java

+package org.jeecg.modules.dynamicStaticAnalysis.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>
+    * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系
+    * </p>
+*
+* @author hkl
+* @since 2023-11-30
+*/
+    @Getter
+    @Setter
+    @ApiModel(value = "AnalysisTqiReportCheckUnitDeviceMap对象", description = "动静态分析-轨检车-tqi单元总结报告和单元映射关联关系")
+
+public class AnalysisTqiReportCheckUnitDeviceMapVO {
+
+
+    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_unit_device_id")
+    private String analysisBatchUnitDeviceId;
+
+            @ApiModelProperty("分析批次号")
+        @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
+            @ApiModelProperty("分析批id")
+        @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+            @ApiModelProperty("检查主表id")
+        @TableField("check_id")
+    private String checkId;
+
+            @ApiModelProperty("检查数据类型 1-人工静态检查 2-轨检仪静态检查 3-轨检车检查 4-添乘仪检查")
+        @TableField("check_type")
+    private Integer checkType;
+
+            @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_starting_mileage")
+    private BigDecimal unitStartingMileage;
+
+            @ApiModelProperty("设备单元中心里程")
+        @TableField("unit_center_mileage")
+    private BigDecimal unitCenterMileage;
+
+            @ApiModelProperty("设备单元结束里程")
+        @TableField("unit_end_mileage")
+    private BigDecimal unitEndMileage;
+
+            @ApiModelProperty("tqi报告id")
+        @TableField("tqi_report_id")
+    private String tqiReportId;
+
+            @ApiModelProperty("开始里程(m)")
+        @TableField("start_mileage")
+    private BigDecimal startMileage;
+
+            @ApiModelProperty("终点里程(m)")
+        @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+            @ApiModelProperty("区间名称")
+        @TableField("section_name")
+    private String sectionName;
+
+            @ApiModelProperty("高低左")
+        @TableField("high_low_left")
+    private String highLowLeft;
+
+            @ApiModelProperty("高低右")
+        @TableField("high_low_right")
+    private String highLowRight;
+
+            @ApiModelProperty("轨向左")
+        @TableField("track_left")
+    private String trackLeft;
+
+            @ApiModelProperty("轨向右")
+        @TableField("track_right")
+    private String trackRight;
+
+            @ApiModelProperty("水平（mm）")
+        @TableField("level")
+    private String level;
+
+            @ApiModelProperty("轨距（mm）")
+        @TableField("track_gauge")
+    private String trackGauge;
+
+            @ApiModelProperty("三角坑（mm）")
+        @TableField("triangular_pit")
+    private String triangularPit;
+
+            @ApiModelProperty("TQI数值")
+        @TableField("tqi_come_upon")
+    private String tqiComeUpon;
+
+            @ApiModelProperty("TQI超标")
+        @TableField("tqi_above_standard")
+    private String tqiAboveStandard;
+
+            @ApiModelProperty("扣分")
+        @TableField("deduct")
+    private String deduct;
+
+            @ApiModelProperty("检测标准")
+        @TableField("standard")
+    private String standard;
+
+            @ApiModelProperty("速度（km/h）")
+        @TableField("spend")
+    private String spend;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisAdditiveCheckUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisAdditiveCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisAdditiveCheckUnitDeviceMapService extends IService<AnalysisAdditiveCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisBatchUnitDeviceService.java

@@ -31,4 +31,8 @@ public interface IAnalysisBatchUnitDeviceService extends IService<AnalysisBatchU
     List<RailVehicleTqiVO> getUnitDeviceTqi(String id);
 
     List<RailAddInstrumentCheckVO> getUnitDeviceAdditiveInfo(String id);
+
+    List<StaticCheckVO> getLabourCheck(String id);
+
+    List<StaticCheckVO> getRailDeviceCheck(String id);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisLabourCheckDataUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisLabourCheckDataUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态分析-人工检查数据分析批次映射 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisLabourCheckDataUnitDeviceMapService extends IService<AnalysisLabourCheckDataUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisOverReportCheckUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisOverReportCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 分析批次-动静态几何尺寸-轨检车单元设备映射 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisOverReportCheckUnitDeviceMapService extends IService<AnalysisOverReportCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisRailDeviceCheckDataUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisRailDeviceCheckDataUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态分析-轨检仪静态检查数据分析批次映射 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisRailDeviceCheckDataUnitDeviceMapService extends IService<AnalysisRailDeviceCheckDataUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IAnalysisTqiReportCheckUnitDeviceMapService.java

+package org.jeecg.modules.dynamicStaticAnalysis.service;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisTqiReportCheckUnitDeviceMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+public interface IAnalysisTqiReportCheckUnitDeviceMapService extends IService<AnalysisTqiReportCheckUnitDeviceMap> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisAdditiveCheckUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisAdditiveCheckUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisAdditiveCheckUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisAdditiveCheckUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisAdditiveCheckUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisAdditiveCheckUnitDeviceMapMapper, AnalysisAdditiveCheckUnitDeviceMap> implements IAnalysisAdditiveCheckUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisBatchUnitDeviceServiceImpl.java

@@ -78,4 +78,14 @@ public class AnalysisBatchUnitDeviceServiceImpl extends ServiceImpl<AnalysisBatc
     public List<RailAddInstrumentCheckVO> getUnitDeviceAdditiveInfo(String id) {
         return this.baseMapper.getUnitDeviceAdditiveInfo(id);
     }
+
+    @Override
+    public List<StaticCheckVO> getLabourCheck(String id) {
+        return this.baseMapper.getLabourCheck(id);
+    }
+
+    @Override
+    public List<StaticCheckVO> getRailDeviceCheck(String id) {
+        return this.baseMapper.getRailDeviceCheck(id);
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisLabourCheckDataUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisLabourCheckDataUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisLabourCheckDataUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisLabourCheckDataUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态分析-人工检查数据分析批次映射 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisLabourCheckDataUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisLabourCheckDataUnitDeviceMapMapper, AnalysisLabourCheckDataUnitDeviceMap> implements IAnalysisLabourCheckDataUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisOverReportCheckUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisOverReportCheckUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisOverReportCheckUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisOverReportCheckUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 分析批次-动静态几何尺寸-轨检车单元设备映射 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisOverReportCheckUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisOverReportCheckUnitDeviceMapMapper, AnalysisOverReportCheckUnitDeviceMap> implements IAnalysisOverReportCheckUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisRailDeviceCheckDataUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisRailDeviceCheckDataUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisRailDeviceCheckDataUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisRailDeviceCheckDataUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态分析-轨检仪静态检查数据分析批次映射 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisRailDeviceCheckDataUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisRailDeviceCheckDataUnitDeviceMapMapper, AnalysisRailDeviceCheckDataUnitDeviceMap> implements IAnalysisRailDeviceCheckDataUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/AnalysisTqiReportCheckUnitDeviceMapServiceImpl.java

+package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
+
+import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisTqiReportCheckUnitDeviceMap;
+import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisTqiReportCheckUnitDeviceMapMapper;
+import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisTqiReportCheckUnitDeviceMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态分析-轨检车-tqi单元总结报告和单元映射关联关系 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-11-30
+ */
+@Service
+public class AnalysisTqiReportCheckUnitDeviceMapServiceImpl extends ServiceImpl<AnalysisTqiReportCheckUnitDeviceMapMapper, AnalysisTqiReportCheckUnitDeviceMap> implements IAnalysisTqiReportCheckUnitDeviceMapService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/ping/PingController.java

+package org.jeecg.modules.ping;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 
+ * @Description: 健康检查
+ */
+@RestController
+public class PingController {
+    @Value("${spring.application.name:'server name'}")
+    private String serverName;
+
+    /**
+     * 
+     * @Title: success
+     * @date 2021年8月30日
+     * @author 孙菁
+     * @Description: 定期扫描此接口确保服务的连通性
+     * @return
+     */
+    @GetMapping("/ping")
+    public String success() {
+        return serverName + " pong";
+    }
+}

jeecg-module-system/src/main/resources/application.yml

 spring:
   application:
-    name: jeecg-system
+    name: hzgw
   profiles:
     active: @package.environment@