Merge remote-tracking branch 'origin/dev' into dev

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/MovementAdditiveInfoController.java

+package org.jeecg.modules.checkData.equipmentCheckData.controller;
+
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementAdditiveInfo;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementAdditiveInfoService;
+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 2023-07-17
+ */
+@RestController
+@RequestMapping("/movement/additive")
+public class MovementAdditiveInfoController extends JeecgController<MovementAdditiveInfo, IMovementAdditiveInfoService> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+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-17
+ */
+@Data
+public class MovementAdditiveInfoDTO {
+
+
+    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 movementMasterId;
+
+    @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/checkData/equipmentCheckData/entity/MovementAdditiveInfo.java

+package org.jeecg.modules.checkData.equipmentCheckData.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 com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-17
+ */
+@Getter
+@Setter
+@TableName("t_djt_movement_additive_info")
+@ApiModel(value = "MovementAdditiveInfo对象", description = "动静态几何尺寸对应的添乘仪详情表")
+public class MovementAdditiveInfo 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")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    @TableField("movement_master_id")
+    private String movementMasterId;
+
+    @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/checkData/equipmentCheckData/entity/MovementRecordsMaster.java

@@ -54,7 +54,7 @@ public class MovementRecordsMaster implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
-    @ApiModelProperty("动态几何尺寸类型（1：人工静态检查；2：轨检仪静态检查）")
+    @ApiModelProperty("动态几何尺寸类型（1：人工静态检查；2：轨检仪静态检查; 3:轨检车检查；4：添乘仪检查）")
     @TableField("type")
     private String type;
 

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/MovementAdditiveInfoMapper.java

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

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/MovementRecordsMasterMapper.java

@@ -2,11 +2,11 @@ package org.jeecg.modules.checkData.equipmentCheckData.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.checkData.equipmentCheckData.dto.MovementRecordsMasterDTO;
-import org.jeecg.modules.checkData.equipmentCheckData.dto.RecordPatrolMasterDTO;
 import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementRecordsMaster;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
-import org.jeecg.modules.checkData.equipmentCheckData.vo.RecordPatrolMasterVO;
+
+import java.math.BigDecimal;
 
 /**
  * <p>
@@ -19,9 +19,56 @@ import org.jeecg.modules.checkData.equipmentCheckData.vo.RecordPatrolMasterVO;
 public interface MovementRecordsMasterMapper extends BaseMapper<MovementRecordsMaster> {
     /**
      * 动静态几何尺寸列表-分页列表查询
+     *
      * @param pageData
      * @param dto
      * @return
      */
     Page<MovementRecordsMasterVO> queryPageList(Page<MovementRecordsMasterVO> pageData, MovementRecordsMasterDTO dto);
+
+    /**
+     * 统计钢轨单元数量
+     *
+     * @param sectionId       区间id
+     * @param lightRailId     线路id
+     * @param lineAliasId     线别id
+     * @param startingMileage 开始里程
+     * @param endMileage      结束里程
+     * @return
+     */
+    Integer getRailNums(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
+
+    /**
+     * 统计曲线数量
+     *
+     * @param sectionId       区间id
+     * @param lightRailId     线路id
+     * @param lineAliasId     线别id
+     * @param startingMileage 开始里程
+     * @param endMileage      结束里程
+     * @return
+     */
+    Integer getCurveNums(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
+
+    /**
+     * 统计竖曲线数量
+     * @param sectionId 区间id
+     * @param lightRailId 线路id
+     * @param lineAliasId 线别id
+     * @param startingMileage 开始里程
+     * @param endMileage 结束里程
+     * @return
+     */
+    Integer getVerticalCurveNum(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
+    /**
+     * 统计道岔数量
+     *
+     * @param sectionId       区间id
+     * @param lightRailId     线路id
+     * @param lineAliasId     线别id
+     * @param startingMileage 开始里程
+     * @param endMileage      结束里程
+     * @return
+     */
+    Integer getSwitchNum(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
 }

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

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/MovementRecordsMasterMapper.xml

@@ -25,4 +25,92 @@
             order by t1.create_time desc
         </where>
     </select>
+    <!-- 统计钢轨单元数量 -->
+    <select id="getRailNums" resultType="java.lang.Integer">
+        SELECT DISTINCT
+        count( t4.id )
+        FROM
+        t_sn_subway_section t
+        LEFT JOIN t_sn_light_rail t2 ON t.light_rail_id = t2.id
+        LEFT JOIN t_sn_line_alias t3 ON t.line_alias_id = t3.id
+        LEFT JOIN t_da_curve_management t4 ON t4.section_id = t.id
+        AND t4.line_alias_id = t3.id
+        AND t4.line_alias_id = t.line_alias_id
+        <where>
+            1 = 1
+            AND t2.id = #{lightRailId}
+            AND t3.id = #{lineAliasId}
+            AND t4.curve_mileage_zh &gt;= #{startingMileage}
+            AND t4.curve_mileage_hz &lt;= #{endMileage}
+            <if test="sectionId != null and sectionId != ''">
+                AND t.id = #{sectionId}
+            </if>
+        </where>
+    </select>
+    <!-- 统计曲线数量 -->
+    <select id="getCurveNums" resultType="java.lang.Integer">
+        SELECT DISTINCT
+        count( t4.id )
+        FROM
+        t_sn_subway_section t
+        LEFT JOIN t_sn_light_rail t2 ON t.light_rail_id = t2.id
+        LEFT JOIN t_sn_line_alias t3 ON t.line_alias_id = t3.id
+        LEFT JOIN t_da_rail_management t4 ON t.id = t4.section_id
+        AND t3.id = t4.line_alias_id
+        AND t.line_alias_id = t4.line_alias_id
+        <where>
+            1 = 1
+            AND t2.id = #{lightRailId}
+            AND t3.id = #{lineAliasId}
+            AND t4.starting_mileage &gt;= #{startingMileage}
+            AND t4.end_mileage &lt;= #{endMileage}
+            <if test="sectionId != null and sectionId != ''">
+                AND t.id = #{sectionId}
+            </if>
+        </where>
+    </select>
+    <!-- 统计竖曲线数量 -->
+    <select id="getVerticalCurveNum" resultType="java.lang.Integer">
+        SELECT DISTINCT
+        count( t4.id )
+        FROM
+        t_sn_subway_section t
+        LEFT JOIN t_sn_light_rail t2 ON t.light_rail_id = t2.id
+        LEFT JOIN t_sn_line_alias t3 ON t.line_alias_id = t3.id
+        LEFT JOIN t_da_vertical_curve_management t4 ON t.id = t4.section_id
+        AND t3.id = t4.line_alias_id
+        AND t.line_alias_id = t4.line_alias_id
+        <where>
+            1 = 1
+            AND t2.id = #{lightRailId}
+            AND t3.id = #{lineAliasId}
+            AND t4.starting_mileage &gt;= #{startingMileage}
+            AND t4.end_mileage &lt;= #{endMileage}
+            <if test="sectionId != null and sectionId != ''">
+                AND t.id = #{sectionId}
+            </if>
+        </where>
+    </select>
+    <!-- 统计道岔数量 -->
+    <select id="getSwitchNum" resultType="java.lang.Integer">
+        SELECT DISTINCT
+        count( t4.id )
+        FROM
+        t_sn_subway_section t
+        LEFT JOIN t_sn_light_rail t2 ON t.light_rail_id = t2.id
+        LEFT JOIN t_sn_line_alias t3 ON t.line_alias_id = t3.id
+        LEFT JOIN t_da_switch_management t4 ON t.id = t4.section_station_map_id
+        AND t3.id = t4.line_alias_id
+        AND t.line_alias_id = t4.line_alias_id
+        <where>
+            1 = 1
+            AND t2.id = #{lightRailId}
+            AND t3.id = #{lineAliasId}
+            AND t4.byroad_pre_mileage &gt;= #{startingMileage}
+            AND t4.byroad_end_mileage &lt;= #{endMileage}
+            <if test="sectionId != null and sectionId != ''">
+                AND t.id = #{sectionId}
+            </if>
+        </where>
+    </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/IMovementAdditiveInfoService.java

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

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/IMovementRecordsMasterService.java

@@ -6,6 +6,8 @@ import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementRecordsMast
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 动静态几何尺寸数据主表	 服务类
@@ -17,9 +19,55 @@ import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO
 public interface IMovementRecordsMasterService extends IService<MovementRecordsMaster> {
     /**
      * 动静态几何尺寸列表-分页列表查询
+     *
      * @param pageData
      * @param dto
      * @return
      */
     Page<MovementRecordsMasterVO> queryPageList(Page<MovementRecordsMasterVO> pageData, MovementRecordsMasterDTO dto);
+
+    /**
+     * 统计钢轨单元数量
+     *
+     * @param lightRailId
+     * @param lineAliasId
+     * @param startingMileage
+     * @param endMileage
+     * @return
+     */
+    Integer getRailNums(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
+
+    /**
+     * 统计曲线数量
+     *
+     * @param sectionId       区间id
+     * @param lightRailId     线路id
+     * @param lineAliasId     线别id
+     * @param startingMileage 开始里程
+     * @param endMileage      结束里程
+     * @return
+     */
+    Integer getCurveNums(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
+    /**
+     * 统计竖曲线数量
+     *
+     * @param sectionId       区间id
+     * @param lightRailId     线路id
+     * @param lineAliasId     线别id
+     * @param startingMileage 开始里程
+     * @param endMileage      结束里程
+     * @return
+     */
+    Integer getVerticalCurveNum(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
+    /**
+     * 统计道岔数量
+     *
+     * @param sectionId       区间id
+     * @param lightRailId     线路id
+     * @param lineAliasId     线别id
+     * @param startingMileage 开始里程
+     * @param endMileage      结束里程
+     * @return
+     */
+    Integer getSwitchNum(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/MovementAdditiveInfoServiceImpl.java

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.MovementAdditiveInfo;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.MovementAdditiveInfoMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.IMovementAdditiveInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动静态几何尺寸对应的添乘仪详情表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-17
+ */
+@Service
+public class MovementAdditiveInfoServiceImpl extends ServiceImpl<MovementAdditiveInfoMapper, MovementAdditiveInfo> implements IMovementAdditiveInfoService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/MovementRecordsMasterServiceImpl.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.MovementRecordsMasterVO;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 动静态几何尺寸数据主表	 服务实现类
@@ -29,4 +31,57 @@ public class MovementRecordsMasterServiceImpl extends ServiceImpl<MovementRecord
     public Page<MovementRecordsMasterVO> queryPageList(Page<MovementRecordsMasterVO> pageData, MovementRecordsMasterDTO dto) {
         return this.baseMapper.queryPageList(pageData,dto);
     }
+
+    /**
+     * 统计钢轨单元数量
+     * @param lightRailId 线路id
+     * @param lineAliasId 线别id
+     * @param startingMileage 开始里程
+     * @param endMileage 结束里程
+     * @return
+     */
+    @Override
+    public Integer getRailNums(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage) {
+        return this.baseMapper.getRailNums(sectionId, lightRailId,lineAliasId,startingMileage,endMileage);
+    }
+    /**
+     * 统计曲线数量
+     * @param sectionId 区间id
+     * @param lightRailId 线路id
+     * @param lineAliasId 线别id
+     * @param startingMileage 开始里程
+     * @param endMileage 结束里程
+     * @return
+     */
+    @Override
+    public Integer getCurveNums(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage) {
+        return this.baseMapper.getCurveNums(sectionId, lightRailId,lineAliasId,startingMileage,endMileage);
+    }
+    /**
+     * 统计竖曲线数量
+     * @param sectionId 区间id
+     * @param lightRailId 线路id
+     * @param lineAliasId 线别id
+     * @param startingMileage 开始里程
+     * @param endMileage 结束里程
+     * @return
+     */
+    @Override
+    public Integer getVerticalCurveNum(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage) {
+        return this.baseMapper.getVerticalCurveNum(sectionId, lightRailId,lineAliasId,startingMileage,endMileage);
+    }
+    /**
+     * 统计道岔数量
+     *
+     * @param sectionId       区间id
+     * @param lightRailId     线路id
+     * @param lineAliasId     线别id
+     * @param startingMileage 开始里程
+     * @param endMileage      结束里程
+     * @return
+     */
+    @Override
+    public Integer getSwitchNum(String sectionId, String lightRailId, String lineAliasId, BigDecimal startingMileage, BigDecimal endMileage) {
+        return this.baseMapper.getSwitchNum(sectionId, lightRailId,lineAliasId,startingMileage,endMileage);
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/MovementAdditiveInfoVO.java

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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-17
+ */
+@Data
+public class MovementAdditiveInfoVO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    @TableField("movement_master_id")
+    private String movementMasterId;
+
+    @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/checkData/equipmentCheckData/vo/MovementAdditiveSavaQueryVO.java

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 添乘仪保存时初始化回显接口返回类
+ */
+@Data
+public class MovementAdditiveSavaQueryVO {
+
+    @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("起始里程")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("钢轨单元数量")
+    private Integer railNum;
+
+    @ApiModelProperty("曲线数量")
+    private Integer curveNum;
+
+    @ApiModelProperty("竖曲线数量")
+    private Integer verticalCurveNum;
+
+    @ApiModelProperty("道岔数量")
+    private Integer switchNum;
+
+
+
+
+}