feat:1.单元code生成

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/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/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,11 +49,7 @@ 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("编辑成功!");
     }

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,6 @@ 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);
 }

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 org.jeecg.modules.deviceAsset.dto.CurveManagementDTO;
 import org.jeecg.modules.deviceAsset.entity.CurveManagement;
@@ -7,8 +8,14 @@ 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.entity.LineAlias;
+import org.jeecg.modules.subwayNetwork.mapper.LineAliasMapper;
+import org.jeecg.modules.subwayNetwork.service.ILightRailService;
+import org.jeecg.modules.utils.UnitCodeUtil;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * 资产管理-曲线管理 服务实现类
@@ -20,8 +27,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,18 @@ 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.curveUnitCodeUtil(railManagement.getLineAliasId());
+            railManagement.setUnitCode(utilCode);
+
+            this.save(railManagement);
+        } else {
+            this.updateById(railManagement);
+        }
     }
 }

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.curveUnitCodeUtil(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.curveUnitCodeUtil(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(), "");
+
+
+        // 查询最大的编号
+        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(), "");
+
+
+        // 查询最大的编号
+        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(), "");
+
+
+        // 查询最大的编号
+        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(), "");
+
+
+        // 查询最大的编号
+        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