Merge branch 'dev-hkl' into 'dev'

Dev hkl

See merge request !21

jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -74,6 +74,7 @@ public class ShiroConfig {
                 }
             }
         }
+
         // 配置不会被拦截的链接 顺序判断
         filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
         filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除

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

@@ -25,11 +25,13 @@ public class CodeGenerate {
         String outputDir = projectPath + "\\jeecg-module-system\\src\\main\\java\\";
 
         // 模块名
-        String moduleName = "checkData.equipmentCheckData";
+        String moduleName = "checkData.dynamicStaticGeometricData";
 
         // 表名
         String[] tables = {
-                "t_ek_curve_wear_record",
+                "t_dsg_rail_inspection_equipment",
+                "t_dsg_rail_inspection_equipment_item",
+                "t_dsg_rail_inspection_equipment_item_detail",
 
         };
 
@@ -58,7 +60,7 @@ public class CodeGenerate {
                 // 设置过滤前缀
                 .strategyConfig(builder -> {
                     builder.addInclude(tables) // 设置需要生成的表名
-                            .addTablePrefix("t_sn", "t_da","t_ek","t_xd"); // 设置过滤表前缀
+                            .addTablePrefix("t_sn", "t_da","t_ek","t_xd","t_dsg"); // 设置过滤表前缀
 
                     // entity实体策略
                     builder.entityBuilder()

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

+package org.jeecg.config.init;
+
+import org.jeecg.modules.deviceAsset.service.ICurveManagementService;
+import org.jeecg.modules.deviceAsset.service.IRailManagementService;
+import org.jeecg.modules.deviceAsset.service.ISwitchManagementService;
+import org.jeecg.modules.deviceAsset.service.IVerticalCurveManagementService;
+import org.jeecg.modules.deviceAsset.service.impl.RailManagementServiceImpl;
+import org.jeecg.modules.subwayNetwork.service.ILineAliasService;
+import org.jeecg.modules.utils.UnitCodeUtil;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 初始化静态方法
+ */
+@Component
+public class InitData implements InitializingBean {
+    @Resource
+    private ISwitchManagementService switchManagementService;
+
+    @Resource
+    private ICurveManagementService curveManagementService;
+
+    @Resource
+    private IVerticalCurveManagementService verticalCurveManagementService;
+
+    @Resource
+    private ILineAliasService lineAliasService;
+
+    @Resource
+    private IRailManagementService railManagementService;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        UnitCodeUtil.setService(lineAliasService,
+                switchManagementService,
+                curveManagementService,
+                verticalCurveManagementService,
+                railManagementService);
+    }
+}

jeecg-module-system/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java

@@ -22,8 +22,8 @@ import java.util.Date;
  * @Author taoYan
  * @Date 2023/2/16 14:27
  **/
-@Aspect
-@Component
+//@Aspect
+//@Component
 public class TenantPackUserLogAspect {
 
     @Resource

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/controller/RailInspectionEquipmentController.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipment;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentService;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@RestController
+@RequestMapping("/checkData/dynamicStaticGeometricData/railInspectionEquipment")
+public class RailInspectionEquipmentController extends JeecgController<RailInspectionEquipment, IRailInspectionEquipmentService> {
+
+
+    @AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
+    @ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<RailInspectionEquipmentVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  RailInspectionEquipmentDTO dto) {
+        Page<RailInspectionEquipmentVO> pageData = new Page<>(pageNo, pageSize);
+        pageData = this.service.queryPageList(pageData, dto);
+        return Result.OK(pageData);
+    }
+
+    @AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-编辑")
+    @ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-编辑", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-编辑")
+    @PostMapping(value = "/edit")
+    public Result<String> edit(@RequestBody RailInspectionEquipment railInspectionEquipment) {
+
+        this.service.edit(railInspectionEquipment);
+
+
+        return Result.OK("编辑成功!");
+    }
+
+    @AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-通过id删除")
+    @ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-通过id删除", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-通过id删除")
+    @GetMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        this.service.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    @AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-批量删除")
+    @ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-批量删除", notes = "资产管理-扣件管理-批量删除")
+    @GetMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.service.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/controller/RailInspectionEquipmentItemController.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentItemService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.base.controller.JeecgController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@RestController
+@RequestMapping("/checkData/dynamicStaticGeometricData/railInspectionEquipmentItem")
+public class RailInspectionEquipmentItemController extends JeecgController<RailInspectionEquipmentItem, IRailInspectionEquipmentItemService> {
+
+    @AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
+    @ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
+    @GetMapping(value = "/list")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "railInspectionEquipmentId", value = "轨检仪静态检查数据id")
+    })
+    public Result<List<RailInspectionEquipmentItemVO>> queryList(String railInspectionEquipmentId) {
+        List<RailInspectionEquipmentItemVO> record = this.service.queryList(railInspectionEquipmentId);
+        return Result.OK(record);
+    }
+
+
+    
+}

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

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@Data
+@ApiModel(value = "RailInspectionEquipment对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据")
+
+public class RailInspectionEquipmentDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("检查批次编号")
+    private String ekCode;
+}

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

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@Data
+@ApiModel(value = "RailInspectionEquipmentItem对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目")
+public class RailInspectionEquipmentItemDTO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    private String movementMasterId;
+
+    @ApiModelProperty("检查起始里程（m）")
+    private BigDecimal courseStartingMileage;
+
+    @ApiModelProperty("检查终点里程(m)")
+    private BigDecimal courseEndMileage;
+
+    @ApiModelProperty("曲线半径（m）")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("超高（mm）")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("加宽（mm）")
+    private BigDecimal widen;
+
+    @ApiModelProperty("顺坡率（‰）")
+    private BigDecimal slopeRatio;
+
+    @ApiModelProperty("长度（m）")
+    private BigDecimal longExtent;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+    @ApiModelProperty("导入排序")
+    private Integer sort;
+
+
+}

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

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@Data
+@ApiModel(value = "RailInspectionEquipmentItemDetail对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表")
+public class RailInspectionEquipmentItemDetailDTO {
+
+    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 railInspectionEquipmentId;
+
+    @ApiModelProperty("轨检仪静态检查数据检查项id")
+    private String railInspectionEquipmentItemId;
+
+    @ApiModelProperty("轨号")
+    private String trackCode;
+
+    @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("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+    @ApiModelProperty("排序字段")
+    private Integer infoSort;
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/entity/RailInspectionEquipment.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.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-07-16
+ */
+@Getter
+@Setter
+@TableName("t_dsg_rail_inspection_equipment")
+@ApiModel(value = "RailInspectionEquipment对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据")
+public class RailInspectionEquipment 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("动态几何尺寸类型（1：人工静态检查；2：轨检仪静态检查）")
+    @TableField("type")
+    private String type;
+
+    @ApiModelProperty("检查批次编号")
+    @TableField("ek_code")
+    private String ekCode;
+
+    @ApiModelProperty("工单编号")
+    @TableField("work_code")
+    private String workCode;
+
+    @ApiModelProperty("检查区间id")
+    @TableField("subway_section_id")
+    private String subwaySectionId;
+
+    @ApiModelProperty("检查区间名称")
+    @TableField("subway_section_name")
+    private String subwaySectionName;
+
+    @ApiModelProperty("所属线路id")
+    @TableField("light_rail_id")
+    private String lightRailId;
+
+    @ApiModelProperty("所属线路名称")
+    @TableField("light_rail_name")
+    private String lightRailName;
+
+    @ApiModelProperty("所属线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("所属线别名称")
+    @TableField("line_alias_name")
+    private String lineAliasName;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("终点里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("钢轨单元数量")
+    @TableField("rail_num")
+    private Integer railNum;
+
+    @ApiModelProperty("曲线数量")
+    @TableField("curve_num")
+    private Integer curveNum;
+
+    @ApiModelProperty("竖曲线数量")
+    @TableField("vertical_curve_num")
+    private Integer verticalCurveNum;
+
+    @ApiModelProperty("道岔数量")
+    @TableField("switch_num")
+    private Integer switchNum;
+
+    @ApiModelProperty("检查人姓名")
+    @TableField("check_by")
+    private String checkBy;
+
+    @ApiModelProperty("检查日期")
+    @TableField("check_time")
+    private Date checkTime;
+
+    @ApiModelProperty("审核人姓名")
+    @TableField("verify_by")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    @TableField("verify_time")
+    private Date verifyTime;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/entity/RailInspectionEquipmentItem.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.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-07-16
+ */
+@Getter
+@Setter
+@TableName("t_dsg_rail_inspection_equipment_item")
+@ApiModel(value = "RailInspectionEquipmentItem对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目")
+public class RailInspectionEquipmentItem 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("rail_inspection_equipment_id")
+    private String railInspectionEquipmentId;
+
+    @ApiModelProperty("检查起始里程（m）")
+    @TableField("course_starting_mileage")
+    private BigDecimal courseStartingMileage;
+
+    @ApiModelProperty("检查终点里程(m)")
+    @TableField("course_end_mileage")
+    private BigDecimal courseEndMileage;
+
+    @ApiModelProperty("曲线半径（m）")
+    @TableField("curve_radius")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("超高（mm）")
+    @TableField("super_high")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("加宽（mm）")
+    @TableField("widen")
+    private BigDecimal widen;
+
+    @ApiModelProperty("顺坡率（‰）")
+    @TableField("slope_ratio")
+    private BigDecimal slopeRatio;
+
+    @ApiModelProperty("长度（m）")
+    @TableField("long_extent")
+    private BigDecimal longExtent;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    @TableField("del_flag")
+    private String delFlag;
+
+    @ApiModelProperty("导入排序")
+    @TableField("sort")
+    private Integer sort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/entity/RailInspectionEquipmentItemDetail.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@Getter
+@Setter
+@TableName("t_dsg_rail_inspection_equipment_item_detail")
+@ApiModel(value = "RailInspectionEquipmentItemDetail对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表")
+public class RailInspectionEquipmentItemDetail 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("rail_inspection_equipment_id")
+    private String railInspectionEquipmentId;
+
+    @ApiModelProperty("轨检仪静态检查数据检查项id")
+    @TableField("rail_inspection_equipment_item_id")
+    private String railInspectionEquipmentItemId;
+
+    @ApiModelProperty("轨号")
+    @TableField("track_code")
+    private String trackCode;
+
+    @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("是否删除（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/dynamicStaticGeometricData/mapper/RailInspectionEquipmentItemDetailMapper.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper;
+
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+public interface RailInspectionEquipmentItemDetailMapper extends BaseMapper<RailInspectionEquipmentItemDetail> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/mapper/RailInspectionEquipmentItemMapper.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper;
+
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+public interface RailInspectionEquipmentItemMapper extends BaseMapper<RailInspectionEquipmentItem> {
+
+    List<RailInspectionEquipmentItemVO> queryList(String railInspectionEquipmentId);
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/mapper/RailInspectionEquipmentMapper.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+public interface RailInspectionEquipmentMapper extends BaseMapper<RailInspectionEquipment> {
+
+    Page<RailInspectionEquipmentVO> queryPageList(Page<RailInspectionEquipmentVO> pageData, RailInspectionEquipmentDTO dto);
+}

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

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/mapper/xml/RailInspectionEquipmentItemMapper.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.dynamicStaticGeometricData.mapper.RailInspectionEquipmentItemMapper">
+
+    <select id="queryList"
+            resultType="org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO">
+        SELECT
+            t1.id,
+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.rail_inspection_equipment_id,
+            t1.course_starting_mileage,
+            t1.course_end_mileage,
+            t1.curve_radius,
+            t1.super_high,
+            t1.widen,
+            t1.slope_ratio,
+            t1.long_extent,
+            t1.remark,
+            t1.del_flag,
+            t1.sort
+        FROM
+            t_dsg_rail_inspection_equipment_item t1
+        WHERE
+            t1.del_flag = '0'
+        AND t1.rail_inspection_equipment_id = #{railInspectionEquipmentId}
+    </select>
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/mapper/xml/RailInspectionEquipmentMapper.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.dynamicStaticGeometricData.mapper.RailInspectionEquipmentMapper">
+
+    <select id="queryPageList"
+            resultType="org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO">
+        SELECT
+            t1.id,
+            t1.create_by,
+            t1.create_time,
+            t1.update_by,
+            t1.update_time,
+            t1.type,
+            t1.ek_code,
+            t1.work_code,
+            t1.subway_section_id,
+            t1.subway_section_name,
+            t1.light_rail_id,
+            t1.light_rail_name,
+            t1.line_alias_id,
+            t1.line_alias_name,
+            t1.starting_mileage,
+            t1.end_mileage,
+            t1.rail_num,
+            t1.curve_num,
+            t1.vertical_curve_num,
+            t1.switch_num,
+            t1.check_by,
+            t1.check_time,
+            t1.verify_by,
+            t1.verify_time,
+            t1.remark,
+            t1.del_flag
+        FROM  t_dsg_rail_inspection_equipment t1
+        WHERE t1.del_flag = '0'
+        <if test="dto.ekCode != null and dto.ekCode != ''">
+            AND t1.ek_code like concat('%',#{dto.ekCode},'%')
+        </if>
+        <if test="dto.subwaySectionId != null and dto.subwaySectionId != ''">
+            AND t1.subway_section_id = #{dto.subwaySectionId}
+        </if>
+        <if test="dto.lightRailId != null and dto.lightRailId != ''">
+            AND t1.light_rail_id = #{dto.lightRailId}
+        </if>
+        <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+            AND t1.line_alias_id = #{dto.lineAliasId}
+        </if>
+        order by t1.create_time desc
+    </select>
+</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/service/IRailInspectionEquipmentItemDetailService.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.service;
+
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+public interface IRailInspectionEquipmentItemDetailService extends IService<RailInspectionEquipmentItemDetail> {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/service/IRailInspectionEquipmentItemService.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.service;
+
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+public interface IRailInspectionEquipmentItemService extends IService<RailInspectionEquipmentItem> {
+
+    List<RailInspectionEquipmentItemVO> queryList(String railInspectionEquipmentId);
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/service/IRailInspectionEquipmentService.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipment;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+public interface IRailInspectionEquipmentService extends IService<RailInspectionEquipment> {
+
+    Page<RailInspectionEquipmentVO> queryPageList(Page<RailInspectionEquipmentVO> pageData, RailInspectionEquipmentDTO dto);
+
+    void edit(RailInspectionEquipment railInspectionEquipment);
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/service/impl/RailInspectionEquipmentItemDetailServiceImpl.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.service.impl;
+
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetail;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper.RailInspectionEquipmentItemDetailMapper;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentItemDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@Service
+public class RailInspectionEquipmentItemDetailServiceImpl extends ServiceImpl<RailInspectionEquipmentItemDetailMapper, RailInspectionEquipmentItemDetail> implements IRailInspectionEquipmentItemDetailService {
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/service/impl/RailInspectionEquipmentItemServiceImpl.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.service.impl;
+
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper.RailInspectionEquipmentItemMapper;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@Service
+public class RailInspectionEquipmentItemServiceImpl extends ServiceImpl<RailInspectionEquipmentItemMapper, RailInspectionEquipmentItem> implements IRailInspectionEquipmentItemService {
+
+    @Override
+    public List<RailInspectionEquipmentItemVO> queryList(String railInspectionEquipmentId) {
+        return this.baseMapper.queryList(railInspectionEquipmentId);
+    }
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/service/impl/RailInspectionEquipmentServiceImpl.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipment;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper.RailInspectionEquipmentMapper;
+import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@Service
+public class RailInspectionEquipmentServiceImpl extends ServiceImpl<RailInspectionEquipmentMapper, RailInspectionEquipment> implements IRailInspectionEquipmentService {
+
+    @Override
+    public Page<RailInspectionEquipmentVO> queryPageList(Page<RailInspectionEquipmentVO> pageData, RailInspectionEquipmentDTO dto) {
+        return this.baseMapper.queryPageList(pageData, dto);
+    }
+
+    @Override
+    public void edit(RailInspectionEquipment railInspectionEquipment) {
+        if (ObjectUtil.isEmpty(railInspectionEquipment.getId())) {
+            this.save(railInspectionEquipment);
+        } else {
+            this.updateById(railInspectionEquipment);
+        }
+    }
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/vo/RailInspectionEquipmentItemDetailVO.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.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-07-16
+ */
+@Getter
+@Setter
+@ApiModel(value = "RailInspectionEquipmentItemDetail对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表")
+
+public class RailInspectionEquipmentItemDetailVO {
+
+
+    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 railInspectionEquipmentId;
+
+    @ApiModelProperty("轨检仪静态检查数据检查项id")
+    private String railInspectionEquipmentItemId;
+
+
+    @ApiModelProperty("轨号")
+    private String trackCode;
+
+    @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("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+    @ApiModelProperty("排序字段")
+    private Integer infoSort;
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/vo/RailInspectionEquipmentItemVO.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.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.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@Data
+@ApiModel(value = "RailInspectionEquipmentItemVO对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目")
+public class RailInspectionEquipmentItemVO {
+
+    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 railInspectionEquipmentId;
+
+    @ApiModelProperty("检查起始里程（m）")
+    private BigDecimal courseStartingMileage;
+
+    @ApiModelProperty("检查终点里程(m)")
+    private BigDecimal courseEndMileage;
+
+    @ApiModelProperty("曲线半径（m）")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("超高（mm）")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("加宽（mm）")
+    private BigDecimal widen;
+
+    @ApiModelProperty("顺坡率（‰）")
+    private BigDecimal slopeRatio;
+
+    @ApiModelProperty("长度（m）")
+    private BigDecimal longExtent;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+    @ApiModelProperty("导入排序")
+    private Integer sort;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/vo/RailInspectionEquipmentVO.java

+package org.jeecg.modules.checkData.dynamicStaticGeometricData.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.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 检查数据-动静态几何尺寸数据-轨检仪静态检查数据
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-16
+ */
+@Data
+@ApiModel(value = "RailInspectionEquipmentVO", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据")
+public class RailInspectionEquipmentVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    private String movementMasterId;
+
+    @ApiModelProperty("检查起始里程（m）")
+    private BigDecimal courseStartingMileage;
+
+    @ApiModelProperty("检查终点里程(m)")
+    private BigDecimal courseEndMileage;
+
+    @ApiModelProperty("曲线半径（m）")
+    private BigDecimal curveRadius;
+
+    @ApiModelProperty("超高（mm）")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("加宽（mm）")
+    private BigDecimal widen;
+
+    @ApiModelProperty("顺坡率（‰）")
+    private BigDecimal slopeRatio;
+
+    @ApiModelProperty("长度（m）")
+    private BigDecimal longExtent;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否删除（0：未删除；1：已删除）")
+    private String delFlag;
+
+    @ApiModelProperty("导入排序")
+    private Integer sort;
+
+}

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.checkData.equipmentCheckData.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -21,4 +22,15 @@ public class CurveWearRecordDTO {
 
     @ApiModelProperty("曲线编码")
     private String curveCode;
+
+    @ApiModelProperty("检查编号")
+    private String ekCode;
+
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -22,8 +23,16 @@ public class RailWearRecordDTO {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("钢轨轨型")
-    private String railType;
+    @ApiModelProperty("检查编号")
+    private String ekCode;
+
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
 
 
 }

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

@@ -99,5 +99,13 @@ public class RecordsMasterCheckDTO {
     @ApiModelProperty("是否删除（0：未删除；1：已删除）")
     private String delFlag;
 
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/UseTurnoutRecordCheckDTO.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 lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -24,4 +26,13 @@ public class UseTurnoutRecordCheckDTO {
 
     @ApiModelProperty("道岔编码")
     private String turnoutCode;
+
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
 }

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

@@ -27,6 +27,15 @@
             t_ek_curve_wear_record t1
                 LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id
         WHERE t1.del_flag = '0'
+        <if test="dto.ekCode != null and dto.ekCode != ''">
+            AND t2.ek_code like concat('%',#{dto.ekCode},'%')
+        </if>
+        <if test="dto.startTime != null">
+            AND t2.check_time >= #{dto.startTime}
+        </if>
+        <if test="dto.endTime != null">
+            AND t2.check_time <![CDATA[  <=  ]]> #{dto.endTime}
+        </if>
         GROUP BY t1.curve_code
     </select>
     <select id="getDetail"

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

@@ -26,6 +26,15 @@
             t_ek_rail_wear_record t1
         LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id and t2.del_flag = '0'
         WHERE t1.del_flag = '0'
+        <if test="dto.ekCode != null and dto.ekCode != ''">
+            AND t2.ek_code like concat('%',#{dto.ekCode},'%')
+        </if>
+        <if test="dto.startTime != null">
+            AND t2.check_time >= #{dto.startTime}
+        </if>
+        <if test="dto.endTime != null">
+            AND t2.check_time <![CDATA[  <=  ]]> #{dto.endTime}
+        </if>
     </select>
     <select id="getDetail"
             resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordDetailVO">

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

@@ -7,7 +7,7 @@
         FROM
         t_ek_records_master_check t1
         <where>
-            1=1
+            AND t1.del_flag = '0'
             <if test="dto.ekCode != null and dto.ekCode != ''">
                 AND t1.ek_code like concat('%',#{dto.ekCode},'%')
             </if>
@@ -20,7 +20,13 @@
             <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
                 AND t1.line_alias_id = #{dto.lineAliasId}
             </if>
-                AND t1.del_flag = '0'
+            <if test="dto.startTime != null">
+                AND t1.check_time >= #{dto.startTime}
+            </if>
+            <if test="dto.endTime != null">
+                AND t1.check_time <![CDATA[  <=  ]]> #{dto.endTime}
+            </if>
+
             order by t1.create_time desc
         </where>
     </select>

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

@@ -32,6 +32,12 @@
         <if test="dto.turnoutCode != null and dto.turnoutCode != ''">
             AND t1.gauge_code like concat('%',#{dto.turnoutCode},'%')
         </if>
+        <if test="dto.startTime != null">
+            AND t2.check_time >= #{dto.startTime}
+        </if>
+        <if test="dto.endTime != null">
+            AND t2.check_time <![CDATA[  <=  ]]> #{dto.endTime}
+        </if>
         GROUP BY t1.gauge_code
     </select>
     <select id="getDetail"

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/controller/CurveManagementController.java

@@ -48,12 +48,7 @@ public class CurveManagementController extends JeecgController<CurveManagement,
     @ApiOperation(value = "资产管理-曲线管理-编辑", notes = "资产管理-曲线管理-编辑")
     @PostMapping(value = "/edit")
     public Result<String> edit(@RequestBody CurveManagement curveManagement) {
-        if (ObjectUtil.isEmpty(curveManagement.getId())) {
-            this.service.save(curveManagement);
-        } else {
-            this.service.updateById(curveManagement);
-        }
-
+        this.service.edit(curveManagement);
         return Result.OK("编辑成功!");
     }
 

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/controller/RailManagementController.java

@@ -49,21 +49,11 @@ public class RailManagementController extends JeecgController<RailManagement, IR
     @ApiOperation(value = "资产管理-钢轨管理-编辑", notes = "资产管理-钢轨管理-编辑")
     @PostMapping(value = "/edit")
     public Result<String> edit(@RequestBody RailManagement railManagement) {
-        if (ObjectUtil.isEmpty(railManagement.getId())) {
-            this.service.save(railManagement);
-        } else {
-            this.service.updateById(railManagement);
-        }
+        this.service.edit(railManagement);
 
         return Result.OK("编辑成功!");
     }
 
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
     @AutoLog(value = "资产管理-钢轨管理-通过id删除")
     @ApiOperation(value = "资产管理-钢轨管理-通过id删除", notes = "资产管理-钢轨管理-通过id删除")
     @GetMapping(value = "/delete")
@@ -72,12 +62,6 @@ public class RailManagementController extends JeecgController<RailManagement, IR
         return Result.OK("删除成功!");
     }
 
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
     @AutoLog(value = "资产管理-钢轨管理-批量删除")
     @ApiOperation(value = "资产管理-钢轨管理-批量删除", notes = "资产管理-钢轨管理-批量删除")
     @GetMapping(value = "/deleteBatch")
@@ -85,4 +69,14 @@ public class RailManagementController extends JeecgController<RailManagement, IR
         this.service.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
+
+
+    @AutoLog(value = "资产管理-钢轨管理-智能生成")
+    @ApiOperation(value = "资产管理-钢轨管理-智能生成", notes = "资产管理-钢轨管理-智能生成")
+    @GetMapping(value = "/intelligentGeneration")
+    public Result<String> intelligentGeneration(@RequestParam(name = "ids", required = true) String ids) {
+        this.service.intelligentGeneration();
+        return Result.OK("生成成功");
+    }
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/controller/SwitchManagementController.java

@@ -30,9 +30,6 @@ import java.util.Arrays;
 @Slf4j
 public class SwitchManagementController extends JeecgController<SwitchManagement, ISwitchManagementService> {
 
-    @Resource
-    private ISwitchManagementService switchManagementService;
-
 
     @AutoLog(value = "资产管理-道岔管理-分页列表查询")
     @ApiOperation(value = "资产管理-道岔管理-分页列表查询", notes = "资产管理-道岔管理-分页列表查询")
@@ -41,7 +38,7 @@ public class SwitchManagementController extends JeecgController<SwitchManagement
                                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                 SwitchManagementQueryDTO dto) {
         Page<SwitchManagementQueryVO> pageData = new Page<>(pageNo, pageSize);
-        pageData = switchManagementService.queryPageList(pageData, dto);
+        pageData = this.service.queryPageList(pageData, dto);
         return Result.OK(pageData);
     }
 
@@ -50,11 +47,8 @@ public class SwitchManagementController extends JeecgController<SwitchManagement
     @ApiOperation(value = "资产管理-道岔管理-编辑", notes = "资产管理-道岔管理-编辑")
     @PostMapping(value = "/edit")
     public Result<String> edit(@RequestBody SwitchManagement switchManagement) {
-        if (ObjectUtil.isEmpty(switchManagement.getId())) {
-            switchManagementService.save(switchManagement);
-        } else {
-            switchManagementService.updateById(switchManagement);
-        }
+        this.service.edit(switchManagement);
+
 
         return Result.OK("编辑成功!");
     }
@@ -69,7 +63,7 @@ public class SwitchManagementController extends JeecgController<SwitchManagement
     @ApiOperation(value = "资产管理-道岔管理-通过id删除", notes = "资产管理-道岔管理-通过id删除")
     @GetMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        switchManagementService.removeById(id);
+        this.service.removeById(id);
         return Result.OK("删除成功!");
     }
 
@@ -83,7 +77,7 @@ public class SwitchManagementController extends JeecgController<SwitchManagement
     @ApiOperation(value = "线路车站-轻轨线路-批量删除", notes = "线路车站-轻轨线路-批量删除")
     @GetMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        switchManagementService.removeByIds(Arrays.asList(ids.split(",")));
+        this.service.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }
 

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/controller/VerticalCurveManagementController.java

@@ -49,11 +49,7 @@ public class VerticalCurveManagementController extends JeecgController<VerticalC
     @ApiOperation(value = "资产管理-竖曲线管理-编辑", notes = "资产管理-竖曲线管理-编辑")
     @PostMapping(value = "/edit")
     public Result<String> edit(@RequestBody VerticalCurveManagement verticalCurveManagement) {
-        if (ObjectUtil.isEmpty(verticalCurveManagement.getId())) {
-            this.service.save(verticalCurveManagement);
-        } else {
-            this.service.updateById(verticalCurveManagement);
-        }
+        this.service.edit(verticalCurveManagement);
 
         return Result.OK("编辑成功!");
     }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/entity/CurveManagement.java

@@ -50,6 +50,9 @@ public class CurveManagement implements Serializable {
     @ApiModelProperty(value = "曲线编号")
     private String curveCode;
 
+    @ApiModelProperty(value = "单元编码")
+    private String unitCode;
+
     @ApiModelProperty(value = "曲线偏角 a   (°′″)")
     private String curveDeflectionAngle;
 

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/entity/RailManagement.java

@@ -56,6 +56,10 @@ public class RailManagement implements Serializable {
     @TableField("rail_code")
     private String railCode;
 
+    @ApiModelProperty(value = "单元编码")
+    @TableField("unit_code")
+    private String unitCode;
+
     @ApiModelProperty("区间id")
     @TableField("section_id")
     private String sectionId;

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/entity/SwitchManagement.java

@@ -50,6 +50,9 @@ public class SwitchManagement implements Serializable {
     @ApiModelProperty(value = "道岔编号")
     private String switchCode;
 
+    @ApiModelProperty(value = "单元编码")
+    private String unitCode;
+
     @ApiModelProperty(value = "道岔型号")
     private String switchModel;
 

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/entity/VerticalCurveManagement.java

@@ -49,6 +49,10 @@ public class VerticalCurveManagement implements Serializable {
     @TableField("vertical_curve_code")
     private String verticalCurveCode;
 
+    @ApiModelProperty(value = "单元编码")
+    @TableField("unit_code")
+    private String unitCode;
+
     @ApiModelProperty("区间id")
     @TableField("section_id")
     private String sectionId;

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/ICurveManagementService.java

@@ -12,4 +12,6 @@ import org.jeecg.modules.deviceAsset.vo.CurveManagementQueryVO;
 public interface ICurveManagementService extends IService<CurveManagement> {
 
     Page<CurveManagementQueryVO> queryPageList(Page<CurveManagementQueryVO> pageData, CurveManagementDTO dto);
+
+    void edit(CurveManagement curveManagement);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/IRailManagementService.java

@@ -17,4 +17,8 @@ import org.jeecg.modules.deviceAsset.vo.RailManagementVO;
 public interface IRailManagementService extends IService<RailManagement> {
 
     Page<RailManagementVO> queryPageList(Page<RailManagementVO> pageData, RailManagementDTO dto);
+
+    void edit(RailManagement railManagement);
+
+    void intelligentGeneration();
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/ISwitchManagementService.java

@@ -15,4 +15,6 @@ import org.jeecg.modules.deviceAsset.vo.SwitchManagementQueryVO;
 public interface ISwitchManagementService extends IService<SwitchManagement> {
 
     Page<SwitchManagementQueryVO> queryPageList(Page<SwitchManagementQueryVO> pageData, SwitchManagementQueryDTO dto);
+
+    void edit(SwitchManagement switchManagement);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/IVerticalCurveManagementService.java

@@ -17,4 +17,6 @@ import org.jeecg.modules.deviceAsset.vo.VerticalCurveManagementVO;
 public interface IVerticalCurveManagementService extends IService<VerticalCurveManagement> {
 
     Page<VerticalCurveManagementVO> queryPageList(Page<VerticalCurveManagementVO> pageData, VerticalCurveManagementDTO dto);
+
+    void edit(VerticalCurveManagement verticalCurveManagement);
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/impl/CurveManagementServiceImpl.java

 package org.jeecg.modules.deviceAsset.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.deviceAsset.dto.CurveManagementDTO;
 import org.jeecg.modules.deviceAsset.entity.CurveManagement;
 import org.jeecg.modules.deviceAsset.mapper.CurveManagementMapper;
 import org.jeecg.modules.deviceAsset.service.ICurveManagementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.deviceAsset.vo.CurveManagementQueryVO;
+import org.jeecg.modules.subwayNetwork.mapper.LineAliasMapper;
+import org.jeecg.modules.utils.UnitCodeUtil;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 资产管理-曲线管理 服务实现类
@@ -20,8 +25,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class CurveManagementServiceImpl extends ServiceImpl<CurveManagementMapper, CurveManagement> implements ICurveManagementService {
 
+    @Resource
+    private LineAliasMapper lineAliasMapper;
+
     @Override
     public Page<CurveManagementQueryVO> queryPageList(Page<CurveManagementQueryVO> pageData, CurveManagementDTO dto) {
         return this.baseMapper.queryPageList(pageData, dto);
     }
+
+    @Override
+    public void edit(CurveManagement curveManagement) {
+        if (ObjectUtil.isEmpty(curveManagement.getId())) {
+            String utilCode = UnitCodeUtil.curveUnitCodeUtil(curveManagement.getLineAliasId());
+            curveManagement.setUnitCode(utilCode);
+
+            this.save(curveManagement);
+        } else {
+            this.updateById(curveManagement);
+        }
+
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/impl/RailManagementServiceImpl.java

 package org.jeecg.modules.deviceAsset.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.deviceAsset.dto.RailManagementDTO;
 import org.jeecg.modules.deviceAsset.entity.RailManagement;
@@ -7,6 +8,7 @@ import org.jeecg.modules.deviceAsset.mapper.RailManagementMapper;
 import org.jeecg.modules.deviceAsset.service.IRailManagementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.deviceAsset.vo.RailManagementVO;
+import org.jeecg.modules.utils.UnitCodeUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -22,6 +24,23 @@ public class RailManagementServiceImpl extends ServiceImpl<RailManagementMapper,
 
     @Override
     public Page<RailManagementVO> queryPageList(Page<RailManagementVO> pageData, RailManagementDTO dto) {
-        return this.baseMapper.queryPageList(pageData,dto);
+        return this.baseMapper.queryPageList(pageData, dto);
+    }
+
+    @Override
+    public void edit(RailManagement railManagement) {
+        if (ObjectUtil.isEmpty(railManagement.getId())) {
+            String utilCode = UnitCodeUtil.railUnitCodeUtil(railManagement.getLineAliasId());
+            railManagement.setUnitCode(utilCode);
+
+            this.save(railManagement);
+        } else {
+            this.updateById(railManagement);
+        }
+    }
+
+    @Override
+    public void intelligentGeneration() {
+        throw new NullPointerException();
     }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/impl/SwitchManagementServiceImpl.java

 package org.jeecg.modules.deviceAsset.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +15,7 @@ import org.jeecg.modules.subwayNetwork.entity.LightRail;
 import org.jeecg.modules.subwayNetwork.mapper.LightRailMapper;
 import org.jeecg.modules.subwayNetwork.service.ILightRailService;
 import org.jeecg.modules.subwayNetwork.vo.LightRailQueryVO;
+import org.jeecg.modules.utils.UnitCodeUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -29,4 +31,15 @@ public class SwitchManagementServiceImpl extends ServiceImpl<SwitchManagementMap
     public Page<SwitchManagementQueryVO> queryPageList(Page<SwitchManagementQueryVO> pageData, SwitchManagementQueryDTO dto) {
         return this.baseMapper.queryPageList(pageData, dto);
     }
+
+    @Override
+    public void edit(SwitchManagement switchManagement) {
+        if (ObjectUtil.isEmpty(switchManagement.getId())) {
+            String utilCode = UnitCodeUtil.switchUnitCodeUtil(switchManagement.getLineAliasId());
+            switchManagement.setUnitCode(utilCode);
+            this.save(switchManagement);
+        } else {
+            this.updateById(switchManagement);
+        }
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/impl/VerticalCurveManagementServiceImpl.java

 package org.jeecg.modules.deviceAsset.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.deviceAsset.dto.VerticalCurveManagementDTO;
 import org.jeecg.modules.deviceAsset.entity.VerticalCurveManagement;
@@ -7,6 +8,7 @@ import org.jeecg.modules.deviceAsset.mapper.VerticalCurveManagementMapper;
 import org.jeecg.modules.deviceAsset.service.IVerticalCurveManagementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.deviceAsset.vo.VerticalCurveManagementVO;
+import org.jeecg.modules.utils.UnitCodeUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -24,4 +26,15 @@ public class VerticalCurveManagementServiceImpl extends ServiceImpl<VerticalCurv
     public Page<VerticalCurveManagementVO> queryPageList(Page<VerticalCurveManagementVO> pageData, VerticalCurveManagementDTO dto) {
         return this.baseMapper.queryPageList(pageData, dto);
     }
+
+    @Override
+    public void edit(VerticalCurveManagement verticalCurveManagement) {
+        if (ObjectUtil.isEmpty(verticalCurveManagement.getId())) {
+            String utilCode = UnitCodeUtil.verticalCurveUnitCodeUtil(verticalCurveManagement.getLineAliasId());
+            verticalCurveManagement.setUnitCode(utilCode);
+            this.save(verticalCurveManagement);
+        } else {
+            this.updateById(verticalCurveManagement);
+        }
+    }
 }

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/service/impl/SubwaySectionServiceImpl.java

@@ -57,8 +57,8 @@ public class SubwaySectionServiceImpl extends ServiceImpl<SubwaySectionMapper, S
         SubwaySection subwaySection = BeanUtil.copyProperties(dto, SubwaySection.class);
         LightRail rail = lightRailMapper.selectById(dto.getLightRailId()); // 线路id
         subwaySection.setLightRailName(rail.getRailLineName());// 线路昵称
-        subwaySection.setSectionStartingMileage(startTrainStation.getStartingMileage()); // 区间起始里程
-        subwaySection.setSectionEndMileage(endTrainStation.getEndMileage());// 区间结束里程
+        subwaySection.setSectionStartingMileage(startTrainStation.getCenterMileage()); // 区间起始里程
+        subwaySection.setSectionEndMileage(endTrainStation.getCenterMileage());// 区间结束里程
         if (ObjectUtil.isEmpty(dto.getId())) {
             this.save(subwaySection);
         } else {

jeecg-module-system/src/main/java/org/jeecg/modules/utils/UnitCodeUtil.java

+package org.jeecg.modules.utils;
+
+import cn.hutool.extra.pinyin.PinyinUtil;
+import org.jeecg.modules.deviceAsset.entity.CurveManagement;
+import org.jeecg.modules.deviceAsset.entity.RailManagement;
+import org.jeecg.modules.deviceAsset.entity.SwitchManagement;
+import org.jeecg.modules.deviceAsset.entity.VerticalCurveManagement;
+import org.jeecg.modules.deviceAsset.service.ICurveManagementService;
+import org.jeecg.modules.deviceAsset.service.IRailManagementService;
+import org.jeecg.modules.deviceAsset.service.ISwitchManagementService;
+import org.jeecg.modules.deviceAsset.service.IVerticalCurveManagementService;
+import org.jeecg.modules.subwayNetwork.entity.LineAlias;
+import org.jeecg.modules.subwayNetwork.service.ILineAliasService;
+
+/**
+ * @describe:单元编码生成工具
+ */
+public class UnitCodeUtil {
+
+    private static ILineAliasService lineAliasService;
+
+    private static ISwitchManagementService switchManagementService;
+
+    private static ICurveManagementService curveManagementService;
+
+    private static IVerticalCurveManagementService verticalCurveManagementService;
+
+    private static IRailManagementService railManagementService;
+
+    public static void setService(ILineAliasService lineAliasService,
+                                  ISwitchManagementService switchManagementService,
+                                  ICurveManagementService curveManagementService,
+                                  IVerticalCurveManagementService verticalCurveManagementService,
+                                  IRailManagementService railManagementService) {
+        UnitCodeUtil.lineAliasService = lineAliasService;
+        UnitCodeUtil.switchManagementService = switchManagementService;
+        UnitCodeUtil.curveManagementService = curveManagementService;
+        UnitCodeUtil.verticalCurveManagementService = verticalCurveManagementService;
+        UnitCodeUtil.railManagementService = railManagementService;
+    }
+
+    /**
+     * 钢轨单元编码:线别码+GG+流水号(5位流水号)
+     * 实例:SXGG00001
+     * SQX - 竖曲线
+     * 000001-流水号
+     *
+     * @param lineId 线别ID
+     */
+    public static String railUnitCodeUtil(String lineId) {
+        // 获取线别拼音
+        LineAlias lineAlias = lineAliasService.getById(lineId);
+        String lineAliasPinyin = PinyinUtil.getFirstLetter(lineAlias.getLineAliasName(), "").toLowerCase();
+
+
+        // 查询最大的编号
+        String unitCode = lineAliasPinyin + "SQX";
+        RailManagement record = railManagementService.lambdaQuery()
+                .likeRight(RailManagement::getUnitCode, unitCode)
+                .orderByDesc(RailManagement::getUnitCode)
+                .last("limit 1")
+                .one();
+
+
+        // 流水号初始化为1
+        Integer serialNum = 1;
+        if (null != record && record.getUnitCode() != null) {
+            // 流水号+1
+            serialNum = Integer.parseInt(record.getUnitCode().substring(6)) + 1;
+        }
+        String serialNumStr = supplementZero(4, serialNum);
+
+        return unitCode + serialNumStr;
+    }
+
+    /**
+     * 曲线代码生成: 01SQX0001
+     * 01 - 上行;02-表示下行
+     * SQX - 竖曲线
+     * 000001-流水号
+     *
+     * @param lineId 线别ID
+     */
+    public static String verticalCurveUnitCodeUtil(String lineId) {
+        // 获取线别拼音
+        LineAlias lineAlias = lineAliasService.getById(lineId);
+        String lineAliasPinyin = PinyinUtil.getFirstLetter(lineAlias.getLineAliasName(), "").toLowerCase();
+
+
+        // 查询最大的编号
+        String unitCode = lineAliasPinyin + "SQX";
+        VerticalCurveManagement record = verticalCurveManagementService.lambdaQuery()
+                .likeRight(VerticalCurveManagement::getUnitCode, unitCode)
+                .orderByDesc(VerticalCurveManagement::getUnitCode)
+                .last("limit 1")
+                .one();
+
+
+        // 流水号初始化为1
+        Integer serialNum = 1;
+        if (null != record && record.getUnitCode() != null) {
+            // 流水号+1
+            serialNum = Integer.parseInt(record.getUnitCode().substring(6)) + 1;
+        }
+        String serialNumStr = supplementZero(4, serialNum);
+
+        return unitCode + serialNumStr;
+    }
+
+    /**
+     * 曲线代码生成: L201QX0001
+     * 01 - 上行;02-表示下行
+     * QX - 曲线
+     * 000001-流水号
+     *
+     * @param lineId 线别ID
+     */
+    public static String curveUnitCodeUtil(String lineId) {
+        // 获取线别拼音
+        LineAlias lineAlias = lineAliasService.getById(lineId);
+        String lineAliasPinyin = PinyinUtil.getFirstLetter(lineAlias.getLineAliasName(), "").toLowerCase();
+
+
+        // 查询最大的编号
+        String unitCode = lineAliasPinyin + "QX";
+        CurveManagement record = curveManagementService.lambdaQuery()
+                .likeRight(CurveManagement::getUnitCode, unitCode)
+                .orderByDesc(CurveManagement::getUnitCode)
+                .last("limit 1")
+                .one();
+
+        // 流水号初始化为1
+        Integer serialNum = 1;
+        if (null != record && record.getUnitCode() != null) {
+            // 流水号+1
+            serialNum = Integer.parseInt(record.getUnitCode().substring(6)) + 1;
+        }
+        String serialNumStr = supplementZero(4, serialNum);
+
+        return unitCode + serialNumStr;
+    }
+
+    /**
+     * 道岔代码生成: 01DC0001
+     * 01 - 上行;02-表示下行
+     * DC - 道岔
+     * 000001-流水号
+     *
+     * @param lineId 线别ID
+     */
+    public static String switchUnitCodeUtil(String lineId) {
+        // 获取线别拼音
+        LineAlias lineAlias = lineAliasService.getById(lineId);
+        String lineAliasPinyin = PinyinUtil.getFirstLetter(lineAlias.getLineAliasName(), "").toLowerCase();
+
+
+        // 查询最大的编号
+        String unitCode = lineAliasPinyin + "DC";
+        SwitchManagement record = switchManagementService.lambdaQuery()
+                .likeRight(SwitchManagement::getUnitCode, unitCode)
+                .orderByDesc(SwitchManagement::getUnitCode)
+                .last("limit 1")
+                .one();
+
+        // 流水号初始化为1
+        Integer serialNum = 1;
+        if (null != record && record.getUnitCode() != null) {
+            // 流水号+1
+            serialNum = Integer.parseInt(record.getUnitCode().substring(6)) + 1;
+        }
+        String serialNumStr = supplementZero(4, serialNum);
+
+        return unitCode + serialNumStr;
+    }
+
+
+    /**
+     * 将元数据前补零，补后的总长度为指定的长度，以宇符串的形式返回
+     *
+     * @param numLength 字符总长度
+     * @param num       转值的数量
+     */
+    public static String supplementZero(int numLength, int num) {
+        return String.format("%0" + numLength + "d", num);
+    }
+
+}
\ No newline at end of file