feat:1.代码提交

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

@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration;
  * @date: 2021年02月18日 16:30
  */
 @Slf4j
-@Configuration
+//@Configuration
 public class CodeGenerateDbConfig {
     @Value("${spring.datasource.dynamic.datasource.master.url:}")
     private String url;

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

+package org.jeecg.modules.deviceAsset.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.deviceAsset.dto.CurveManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.CurveManagement;
+import org.jeecg.modules.deviceAsset.service.ICurveManagementService;
+import org.jeecg.modules.deviceAsset.vo.CurveManagementQueryVO;
+import org.springframework.web.bind.annotation.*;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 资产管理-曲线管理 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@RestController
+@RequestMapping("/deviceAsset/curveManagement")
+@Api(tags = "资产管理-曲线管理")
+public class CurveManagementController extends JeecgController<CurveManagement, ICurveManagementService> {
+
+
+    @AutoLog(value = "资产管理-曲线管理 -分页列表查询")
+    @ApiOperation(value = "资产管理-曲线管理-分页列表查询", notes = "资产管理-曲线管理-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<CurveManagementQueryVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                               CurveManagementDTO dto) {
+        Page<CurveManagementQueryVO> 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 CurveManagement curveManagement) {
+        if (ObjectUtil.isEmpty(curveManagement.getId())) {
+            this.service.save(curveManagement);
+        } else {
+            this.service.updateById(curveManagement);
+        }
+
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @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("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @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/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/controller/FastenerManagementController.java

+package org.jeecg.modules.deviceAsset.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+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.deviceAsset.dto.FastenerManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.FastenerManagement;
+import org.jeecg.modules.deviceAsset.service.IFastenerManagementService;
+import org.jeecg.modules.deviceAsset.vo.FastenerManagementVO;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 资产管理-扣件管理 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@RestController
+@RequestMapping("/deviceAsset/fastenerManagement")
+@Api(tags = "资产管理-扣件管理")
+public class FastenerManagementController extends JeecgController<FastenerManagement, IFastenerManagementService> {
+    @AutoLog(value = "资产管理-扣件管理 -分页列表查询")
+    @ApiOperation(value = "资产管理-道岔管理-分页列表查询", notes = "资产管理-道岔管理-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<FastenerManagementVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             FastenerManagementDTO dto) {
+        Page<FastenerManagementVO> 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 FastenerManagement fastenerManagement) {
+        if (ObjectUtil.isEmpty(fastenerManagement.getId())) {
+            this.service.save(fastenerManagement);
+        } else {
+            this.service.updateById(fastenerManagement);
+        }
+
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @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("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @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/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/controller/SignBoardManagementController.java

+package org.jeecg.modules.deviceAsset.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.deviceAsset.dto.FastenerManagementDTO;
+import org.jeecg.modules.deviceAsset.dto.SignBoardManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.FastenerManagement;
+import org.jeecg.modules.deviceAsset.entity.SignBoardManagement;
+import org.jeecg.modules.deviceAsset.service.ISignBoardManagementService;
+import org.jeecg.modules.deviceAsset.vo.FastenerManagementVO;
+import org.jeecg.modules.deviceAsset.vo.SignBoardManagementVO;
+import org.springframework.web.bind.annotation.*;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 资产管理-轨行区标识牌管理 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@RestController
+@RequestMapping("/deviceAsset/signBoardManagement")
+@Api(tags = "资产管理-轨行区标识管理")
+public class SignBoardManagementController extends JeecgController<SignBoardManagement, ISignBoardManagementService> {
+    @AutoLog(value = "资产管理-轨行区标识管理 -分页列表查询")
+    @ApiOperation(value = "资产管理-道岔管理-分页列表查询", notes = "资产管理-道岔管理-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SignBoardManagementVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                              SignBoardManagementDTO dto) {
+        Page<SignBoardManagementVO> 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 SignBoardManagement signBoardManagement) {
+        if (ObjectUtil.isEmpty(signBoardManagement.getId())) {
+            this.service.save(signBoardManagement);
+        } else {
+            this.service.updateById(signBoardManagement);
+        }
+
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @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("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @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/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/controller/TrackBedManagementController.java

+package org.jeecg.modules.deviceAsset.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.deviceAsset.dto.TrackBedManagementDTO;
+import org.jeecg.modules.deviceAsset.dto.VerticalCurveManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.TrackBedManagement;
+import org.jeecg.modules.deviceAsset.entity.VerticalCurveManagement;
+import org.jeecg.modules.deviceAsset.service.ITrackBedManagementService;
+import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO;
+import org.jeecg.modules.deviceAsset.vo.VerticalCurveManagementVO;
+import org.springframework.web.bind.annotation.*;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 资产管理-道床管理 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@RestController
+@RequestMapping("/deviceAsset/trackBedManagement")
+@Api(tags = "资产管理-道床管理")
+public class TrackBedManagementController extends JeecgController<TrackBedManagement, ITrackBedManagementService> {
+    @AutoLog(value = "资产管理-道床管理-分页列表查询")
+    @ApiOperation(value = "资产管理-道床管理-分页列表查询", notes = "资产管理-道床管理-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<TrackBedManagementVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             TrackBedManagementDTO dto) {
+        Page<TrackBedManagementVO> 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 TrackBedManagement trackBedManagement) {
+        if (ObjectUtil.isEmpty(trackBedManagement.getId())) {
+            this.service.save(trackBedManagement);
+        } else {
+            this.service.updateById(trackBedManagement);
+        }
+
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @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("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @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/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/controller/VerticalCurveManagementController.java

+package org.jeecg.modules.deviceAsset.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.deviceAsset.dto.CurveManagementDTO;
+import org.jeecg.modules.deviceAsset.dto.VerticalCurveManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.CurveManagement;
+import org.jeecg.modules.deviceAsset.entity.VerticalCurveManagement;
+import org.jeecg.modules.deviceAsset.service.IVerticalCurveManagementService;
+import org.jeecg.modules.deviceAsset.vo.CurveManagementQueryVO;
+import org.jeecg.modules.deviceAsset.vo.VerticalCurveManagementVO;
+import org.springframework.web.bind.annotation.*;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 资产管理-竖曲线管理 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@RestController
+@RequestMapping("/deviceAsset/verticalCurveManagement")
+@Api(tags = "资产管理-竖曲线管理")
+public class VerticalCurveManagementController extends JeecgController<VerticalCurveManagement, IVerticalCurveManagementService> {
+    @AutoLog(value = "资产管理-竖曲线管理-分页列表查询")
+    @ApiOperation(value = "资产管理-竖曲线管理-分页列表查询", notes = "资产管理-竖曲线管理-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<VerticalCurveManagementVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                  VerticalCurveManagementDTO dto) {
+        Page<VerticalCurveManagementVO> 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 VerticalCurveManagement verticalCurveManagement) {
+        if (ObjectUtil.isEmpty(verticalCurveManagement.getId())) {
+            this.service.save(verticalCurveManagement);
+        } else {
+            this.service.updateById(verticalCurveManagement);
+        }
+
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @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("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @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/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/dto/CurveManagementDTO.java

+package org.jeecg.modules.deviceAsset.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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-06
+ */
+@Getter
+@Setter
+public class CurveManagementDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("曲线编号")
+    private String curveCode;
+
+    @ApiModelProperty("曲线偏角a(°′″)")
+    private String curveDeflectionAngle;
+
+    @ApiModelProperty("曲线半径R(m)")
+    private BigDecimal curveAdius;
+
+    @ApiModelProperty("缓和曲线长I(m)")
+    private BigDecimal transitionCurveLen;
+
+    @ApiModelProperty("切线长T(m)")
+    private BigDecimal tangentLen;
+
+    @ApiModelProperty("曲线长L(m)")
+    private BigDecimal curveLen;
+
+    @ApiModelProperty("直缓（直圆）里程ZH(ZY)")
+    private String curveMileageZh;
+
+    @ApiModelProperty("缓圆里程(HY)")
+    private String curveMileageHy;
+
+    @ApiModelProperty("圆缓里程(YH)")
+    private String curveMileageYh;
+
+    @ApiModelProperty("缓直（圆直）里程HZ(YZ)")
+    private String curveMileageHz;
+
+    @ApiModelProperty("超高H(mm)")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/dto/FastenerManagementDTO.java

+package org.jeecg.modules.deviceAsset.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Getter
+@Setter
+public class FastenerManagementDTO {
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("扣件编号")
+    @TableField("fastener_code")
+    private String fastenerCode;
+
+    @ApiModelProperty("扣件类型")
+    @TableField("fastener_type")
+    private String fastenerType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("结束里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("扣件长度")
+    @TableField("fastener_len")
+    private BigDecimal fastenerLen;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/dto/SignBoardManagementDTO.java

+package org.jeecg.modules.deviceAsset.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资产管理-轨行区标识牌管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_da_sign_board_management")
+@ApiModel(value = "SignBoardManagement对象", description = "资产管理-轨行区标识牌管理")
+public class SignBoardManagementDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("轨行区标识牌编号")
+    @TableField("sign_board_code")
+    private String signBoardCode;
+
+    @ApiModelProperty("轨行区标识牌类型")
+    @TableField("sign_board_type")
+    private String signBoardType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("里程")
+    @TableField("mileage")
+    private BigDecimal mileage;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/dto/TrackBedManagementDTO.java

+package org.jeecg.modules.deviceAsset.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资产管理-道床管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_da_track_bed_management")
+@ApiModel(value = "TrackBedManagement对象", description = "资产管理-道床管理")
+public class TrackBedManagementDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("轨枕编号")
+    @TableField("track_bed_code")
+    private String trackBedCode;
+
+    @ApiModelProperty("轨枕类型")
+    @TableField("track_bed_type")
+    private String trackBedType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("结束里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("扣件长度")
+    @TableField("fastener_len")
+    private BigDecimal fastenerLen;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/dto/VerticalCurveManagementDTO.java

+package org.jeecg.modules.deviceAsset.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资产管理-竖曲线管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_da_vertical_curve_management")
+@ApiModel(value = "VerticalCurveManagement对象", description = "资产管理-竖曲线管理")
+public class VerticalCurveManagementDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("竖曲线编号")
+    @TableField("vertical_curve_code")
+    private String verticalCurveCode;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("中心里程")
+    @TableField("center_mileage")
+    private BigDecimal centerMileage;
+
+    @ApiModelProperty("结束里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("竖曲线半径R(m)")
+    @TableField("vertical_curve_adius")
+    private BigDecimal verticalCurveAdius;
+
+    @ApiModelProperty("切线长T(m)")
+    @TableField("tangent_len")
+    private BigDecimal tangentLen;
+
+    @ApiModelProperty("外矢距/E(m)")
+    @TableField("apex_distance")
+    private BigDecimal apexDistance;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

+package org.jeecg.modules.deviceAsset.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: 资产管理-曲线管理
+ */
+@Data
+@TableName("t_da_curve_management")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "t_da_curve_management对象", description = "资产管理-曲线管理")
+public class CurveManagement implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "曲线编号")
+    private String curveCode;
+
+    @ApiModelProperty(value = "曲线偏角 a   (°′″)")
+    private String curveDeflectionAngle;
+
+    @ApiModelProperty(value = "曲线半径R(m)")
+    private BigDecimal curveAdius;
+
+    @ApiModelProperty(value = "缓和曲线长I(m)")
+    private BigDecimal transitionCurveLen;
+
+    @ApiModelProperty(value = "切线长T(m)")
+    private BigDecimal tangentLen;
+
+    @ApiModelProperty(value = "直缓（直圆）里程ZH(ZY)")
+    private String curveMileageZh;
+
+    @ApiModelProperty(value = "缓圆里程(HY)")
+    private String curveMileageHy;
+
+    @ApiModelProperty(value = "圆缓里程(YH)")
+    private String curveMileageYh;
+
+    @ApiModelProperty(value = "缓直（圆直）里程HZ(YZ)")
+    private String curveMileageHz;
+
+    @ApiModelProperty(value = "超高H(mm)")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty(value = "区间id")
+    private String sectionId;
+
+    @ApiModelProperty(value = "线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+}

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

+package org.jeecg.modules.deviceAsset.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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-06
+ */
+@Getter
+@Setter
+@TableName("t_da_fastener_management")
+@ApiModel(value = "FastenerManagement对象", description = "资产管理-扣件管理")
+public class FastenerManagement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("扣件编号")
+    @TableField("fastener_code")
+    private String fastenerCode;
+
+    @ApiModelProperty("扣件类型")
+    @TableField("fastener_type")
+    private String fastenerType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("结束里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("扣件长度")
+    @TableField("fastener_len")
+    private BigDecimal fastenerLen;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

+package org.jeecg.modules.deviceAsset.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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-06
+ */
+@Getter
+@Setter
+@TableName("t_da_sign_board_management")
+@ApiModel(value = "SignBoardManagement对象", description = "资产管理-轨行区标识牌管理")
+public class SignBoardManagement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("轨行区标识牌编号")
+    @TableField("sign_board_code")
+    private String signBoardCode;
+
+    @ApiModelProperty("轨行区标识牌类型")
+    @TableField("sign_board_type")
+    private String signBoardType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("里程")
+    @TableField("mileage")
+    private BigDecimal mileage;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

+package org.jeecg.modules.deviceAsset.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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-06
+ */
+@Getter
+@Setter
+@TableName("t_da_track_bed_management")
+@ApiModel(value = "TrackBedManagement对象", description = "资产管理-道床管理")
+public class TrackBedManagement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("轨枕编号")
+    @TableField("track_bed_code")
+    private String trackBedCode;
+
+    @ApiModelProperty("轨枕类型")
+    @TableField("track_bed_type")
+    private String trackBedType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("结束里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("扣件长度")
+    @TableField("fastener_len")
+    private BigDecimal fastenerLen;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

+package org.jeecg.modules.deviceAsset.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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-06
+ */
+@Getter
+@Setter
+@TableName("t_da_vertical_curve_management")
+@ApiModel(value = "VerticalCurveManagement对象", description = "资产管理-竖曲线管理")
+public class VerticalCurveManagement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("竖曲线编号")
+    @TableField("vertical_curve_code")
+    private String verticalCurveCode;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("中心里程")
+    @TableField("center_mileage")
+    private BigDecimal centerMileage;
+
+    @ApiModelProperty("结束里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("竖曲线半径R(m)")
+    @TableField("vertical_curve_adius")
+    private BigDecimal verticalCurveAdius;
+
+    @ApiModelProperty("切线长T(m)")
+    @TableField("tangent_len")
+    private BigDecimal tangentLen;
+
+    @ApiModelProperty("外矢距/E(m)")
+    @TableField("apex_distance")
+    private BigDecimal apexDistance;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/CurveManagementMapper.java

+package org.jeecg.modules.deviceAsset.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.CurveManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.CurveManagement;
+import org.jeecg.modules.deviceAsset.vo.CurveManagementQueryVO;
+
+/**
+ * @Description: 资产管理-道岔管理
+ */
+public interface CurveManagementMapper extends BaseMapper<CurveManagement> {
+    Page<CurveManagementQueryVO> queryPageList(Page<CurveManagementQueryVO> pageData, CurveManagementDTO dto);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/FastenerManagementMapper.java

+package org.jeecg.modules.deviceAsset.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.FastenerManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.FastenerManagement;
+import org.jeecg.modules.deviceAsset.vo.FastenerManagementVO;
+
+/**
+ * <p>
+ * 资产管理-扣件管理 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface FastenerManagementMapper extends BaseMapper<FastenerManagement> {
+
+    Page<FastenerManagementVO> queryPageList(Page<FastenerManagementVO> pageData, FastenerManagementDTO dto);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/SignBoardManagementMapper.java

+package org.jeecg.modules.deviceAsset.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.SignBoardManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.SignBoardManagement;
+import org.jeecg.modules.deviceAsset.vo.SignBoardManagementVO;
+
+/**
+ * <p>
+ * 资产管理-轨行区标识牌管理 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface SignBoardManagementMapper extends BaseMapper<SignBoardManagement> {
+
+    Page<SignBoardManagementVO> queryPageList(Page<SignBoardManagementVO> pageData, SignBoardManagementDTO dto);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/TrackBedManagementMapper.java

+package org.jeecg.modules.deviceAsset.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.TrackBedManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.TrackBedManagement;
+import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO;
+
+/**
+ * <p>
+ * 资产管理-道床管理 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface TrackBedManagementMapper extends BaseMapper<TrackBedManagement> {
+
+    Page<TrackBedManagementVO> queryPageList(Page<TrackBedManagementVO> pageData, TrackBedManagementDTO dto);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/VerticalCurveManagementMapper.java

+package org.jeecg.modules.deviceAsset.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.VerticalCurveManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.VerticalCurveManagement;
+import org.jeecg.modules.deviceAsset.vo.VerticalCurveManagementVO;
+
+/**
+ * <p>
+ * 资产管理-竖曲线管理 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface VerticalCurveManagementMapper extends BaseMapper<VerticalCurveManagement> {
+
+    Page<VerticalCurveManagementVO> queryPageList(Page<VerticalCurveManagementVO> pageData, VerticalCurveManagementDTO dto);
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/CurveManagementMapper.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.deviceAsset.mapper.CurveManagementMapper">
+
+
+    <select id="queryPageList" resultType="org.jeecg.modules.deviceAsset.vo.CurveManagementQueryVO">
+        SELECT
+            t1.*
+        FROM
+            t_da_curve_management t1
+    </select>
+</mapper>
\ No newline at end of file

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/FastenerManagementMapper.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.deviceAsset.mapper.FastenerManagementMapper">
+
+    <select id="queryPageList" resultType="org.jeecg.modules.deviceAsset.vo.FastenerManagementVO">
+        select * from t_da_fastener_management
+    </select>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/SignBoardManagementMapper.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.deviceAsset.mapper.SignBoardManagementMapper">
+
+    <select id="queryPageList" resultType="org.jeecg.modules.deviceAsset.vo.SignBoardManagementVO">
+        select t1.* from t_da_sign_board_management t1
+    </select>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/TrackBedManagementMapper.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.deviceAsset.mapper.TrackBedManagementMapper">
+
+    <select id="queryPageList" resultType="org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO">
+        select *
+        from t_da_track_bed_management
+    </select>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/VerticalCurveManagementMapper.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.deviceAsset.mapper.VerticalCurveManagementMapper">
+
+    <select id="queryPageList" resultType="org.jeecg.modules.deviceAsset.vo.VerticalCurveManagementVO">
+        select * from t_da_vertical_curve_management
+    </select>
+</mapper>

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

+package org.jeecg.modules.deviceAsset.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.deviceAsset.dto.CurveManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.CurveManagement;
+import org.jeecg.modules.deviceAsset.vo.CurveManagementQueryVO;
+
+/**
+ * @Description: 资产管理-曲线管理
+ */
+public interface ICurveManagementService extends IService<CurveManagement> {
+
+    Page<CurveManagementQueryVO> queryPageList(Page<CurveManagementQueryVO> pageData, CurveManagementDTO dto);
+}

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

+package org.jeecg.modules.deviceAsset.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.deviceAsset.dto.FastenerManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.FastenerManagement;
+import org.jeecg.modules.deviceAsset.vo.FastenerManagementVO;
+
+/**
+ * <p>
+ * 资产管理-扣件管理 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface IFastenerManagementService extends IService<FastenerManagement> {
+
+    Page<FastenerManagementVO> queryPageList(Page<FastenerManagementVO> pageData, FastenerManagementDTO dto);
+}

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

+package org.jeecg.modules.deviceAsset.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.deviceAsset.dto.SignBoardManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.SignBoardManagement;
+import org.jeecg.modules.deviceAsset.vo.SignBoardManagementVO;
+
+/**
+ * <p>
+ * 资产管理-轨行区标识牌管理 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface ISignBoardManagementService extends IService<SignBoardManagement> {
+
+    Page<SignBoardManagementVO> queryPageList(Page<SignBoardManagementVO> pageData, SignBoardManagementDTO dto);
+}

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

@@ -7,7 +7,7 @@ import org.jeecg.modules.deviceAsset.entity.SwitchManagement;
 import org.jeecg.modules.deviceAsset.vo.SwitchManagementQueryVO;
 
 /**
- * @Description: 线路车站-轻轨线路
+ * @Description: 资产管理-道岔管理
  * @Author: jeecg-boot
  * @Date: 2023-06-14
  * @Version: V1.0

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

+package org.jeecg.modules.deviceAsset.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.deviceAsset.dto.TrackBedManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.TrackBedManagement;
+import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO;
+
+/**
+ * <p>
+ * 资产管理-道床管理 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface ITrackBedManagementService extends IService<TrackBedManagement> {
+
+    Page<TrackBedManagementVO> queryPageList(Page<TrackBedManagementVO> pageData, TrackBedManagementDTO dto);
+}

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

+package org.jeecg.modules.deviceAsset.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.deviceAsset.dto.VerticalCurveManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.VerticalCurveManagement;
+import org.jeecg.modules.deviceAsset.vo.VerticalCurveManagementVO;
+
+/**
+ * <p>
+ * 资产管理-竖曲线管理 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+public interface IVerticalCurveManagementService extends IService<VerticalCurveManagement> {
+
+    Page<VerticalCurveManagementVO> queryPageList(Page<VerticalCurveManagementVO> pageData, VerticalCurveManagementDTO dto);
+}

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

+package org.jeecg.modules.deviceAsset.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资产管理-曲线管理 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Service
+public class CurveManagementServiceImpl extends ServiceImpl<CurveManagementMapper, CurveManagement> implements ICurveManagementService {
+
+    @Override
+    public Page<CurveManagementQueryVO> queryPageList(Page<CurveManagementQueryVO> pageData, CurveManagementDTO dto) {
+        return this.baseMapper.queryPageList(pageData, dto);
+    }
+}

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

+package org.jeecg.modules.deviceAsset.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.FastenerManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.FastenerManagement;
+import org.jeecg.modules.deviceAsset.mapper.FastenerManagementMapper;
+import org.jeecg.modules.deviceAsset.service.IFastenerManagementService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.deviceAsset.vo.FastenerManagementVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资产管理-扣件管理 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Service
+public class FastenerManagementServiceImpl extends ServiceImpl<FastenerManagementMapper, FastenerManagement> implements IFastenerManagementService {
+
+    @Override
+    public Page<FastenerManagementVO> queryPageList(Page<FastenerManagementVO> pageData, FastenerManagementDTO dto) {
+        return this.baseMapper.queryPageList(pageData, dto);
+    }
+}

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

+package org.jeecg.modules.deviceAsset.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.SignBoardManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.SignBoardManagement;
+import org.jeecg.modules.deviceAsset.mapper.SignBoardManagementMapper;
+import org.jeecg.modules.deviceAsset.service.ISignBoardManagementService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.deviceAsset.vo.SignBoardManagementVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资产管理-轨行区标识牌管理 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Service
+public class SignBoardManagementServiceImpl extends ServiceImpl<SignBoardManagementMapper, SignBoardManagement> implements ISignBoardManagementService {
+
+    @Override
+    public Page<SignBoardManagementVO> queryPageList(Page<SignBoardManagementVO> pageData, SignBoardManagementDTO dto) {
+        return this.baseMapper.queryPageList(pageData,dto);
+    }
+}

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

+package org.jeecg.modules.deviceAsset.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.TrackBedManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.TrackBedManagement;
+import org.jeecg.modules.deviceAsset.mapper.TrackBedManagementMapper;
+import org.jeecg.modules.deviceAsset.service.ITrackBedManagementService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.deviceAsset.vo.TrackBedManagementVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资产管理-道床管理 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Service
+public class TrackBedManagementServiceImpl extends ServiceImpl<TrackBedManagementMapper, TrackBedManagement> implements ITrackBedManagementService {
+
+    @Override
+    public Page<TrackBedManagementVO> queryPageList(Page<TrackBedManagementVO> pageData, TrackBedManagementDTO dto) {
+        return this.baseMapper.queryPageList(pageData,dto);
+    }
+}

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

+package org.jeecg.modules.deviceAsset.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.deviceAsset.dto.VerticalCurveManagementDTO;
+import org.jeecg.modules.deviceAsset.entity.VerticalCurveManagement;
+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.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资产管理-竖曲线管理 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Service
+public class VerticalCurveManagementServiceImpl extends ServiceImpl<VerticalCurveManagementMapper, VerticalCurveManagement> implements IVerticalCurveManagementService {
+
+    @Override
+    public Page<VerticalCurveManagementVO> queryPageList(Page<VerticalCurveManagementVO> pageData, VerticalCurveManagementDTO dto) {
+        return this.baseMapper.queryPageList(pageData, dto);
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/vo/CurveManagementQueryVO.java

+package org.jeecg.modules.deviceAsset.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资产管理-曲线管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+public class CurveManagementQueryVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("曲线编号")
+    private String curveCode;
+
+    @ApiModelProperty("曲线偏角a(°′″)")
+    private String curveDeflectionAngle;
+
+    @ApiModelProperty("曲线半径R(m)")
+    private BigDecimal curveAdius;
+
+    @ApiModelProperty("缓和曲线长I(m)")
+    private BigDecimal transitionCurveLen;
+
+    @ApiModelProperty("切线长T(m)")
+    private BigDecimal tangentLen;
+
+    @ApiModelProperty("曲线长L(m)")
+    private BigDecimal curveLen;
+
+    @ApiModelProperty("直缓（直圆）里程ZH(ZY)")
+    private String curveMileageZh;
+
+    @ApiModelProperty("缓圆里程(HY)")
+    private String curveMileageHy;
+
+    @ApiModelProperty("圆缓里程(YH)")
+    private String curveMileageYh;
+
+    @ApiModelProperty("缓直（圆直）里程HZ(YZ)")
+    private String curveMileageHz;
+
+    @ApiModelProperty("超高H(mm)")
+    private BigDecimal superHigh;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/vo/FastenerManagementVO.java

+package org.jeecg.modules.deviceAsset.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Getter
+@Setter
+public class FastenerManagementVO {
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("扣件编号")
+    @TableField("fastener_code")
+    private String fastenerCode;
+
+    @ApiModelProperty("扣件类型")
+    @TableField("fastener_type")
+    private String fastenerType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("结束里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("扣件长度")
+    @TableField("fastener_len")
+    private BigDecimal fastenerLen;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/vo/SignBoardManagementVO.java

+package org.jeecg.modules.deviceAsset.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资产管理-轨行区标识牌管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_da_sign_board_management")
+@ApiModel(value = "SignBoardManagement对象", description = "资产管理-轨行区标识牌管理")
+public class SignBoardManagementVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("轨行区标识牌编号")
+    @TableField("sign_board_code")
+    private String signBoardCode;
+
+    @ApiModelProperty("轨行区标识牌类型")
+    @TableField("sign_board_type")
+    private String signBoardType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("里程")
+    @TableField("mileage")
+    private BigDecimal mileage;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/vo/TrackBedManagementVO.java

+package org.jeecg.modules.deviceAsset.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资产管理-道床管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_da_track_bed_management")
+@ApiModel(value = "TrackBedManagement对象", description = "资产管理-道床管理")
+public class TrackBedManagementVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("轨枕编号")
+    @TableField("track_bed_code")
+    private String trackBedCode;
+
+    @ApiModelProperty("轨枕类型")
+    @TableField("track_bed_type")
+    private String trackBedType;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("结束里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("扣件长度")
+    @TableField("fastener_len")
+    private BigDecimal fastenerLen;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/deviceAsset/vo/VerticalCurveManagementVO.java

+package org.jeecg.modules.deviceAsset.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资产管理-竖曲线管理
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_da_vertical_curve_management")
+@ApiModel(value = "VerticalCurveManagement对象", description = "资产管理-竖曲线管理")
+public class VerticalCurveManagementVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("id")
+    private String id;
+
+    @ApiModelProperty("创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty("创建日期")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty("竖曲线编号")
+    @TableField("vertical_curve_code")
+    private String verticalCurveCode;
+
+    @ApiModelProperty("区间id")
+    @TableField("section_id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("起始里程")
+    @TableField("starting_mileage")
+    private BigDecimal startingMileage;
+
+    @ApiModelProperty("中心里程")
+    @TableField("center_mileage")
+    private BigDecimal centerMileage;
+
+    @ApiModelProperty("结束里程")
+    @TableField("end_mileage")
+    private BigDecimal endMileage;
+
+    @ApiModelProperty("竖曲线半径R(m)")
+    @TableField("vertical_curve_adius")
+    private BigDecimal verticalCurveAdius;
+
+    @ApiModelProperty("切线长T(m)")
+    @TableField("tangent_len")
+    private BigDecimal tangentLen;
+
+    @ApiModelProperty("外矢距/E(m)")
+    @TableField("apex_distance")
+    private BigDecimal apexDistance;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java

-//package org.jeecg.modules.ngalain.aop;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//import org.aspectj.lang.ProceedingJoinPoint;
-//import org.aspectj.lang.annotation.Around;
-//import org.aspectj.lang.annotation.Aspect;
-//import org.aspectj.lang.annotation.Pointcut;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.context.request.RequestAttributes;
-//import org.springframework.web.context.request.RequestContextHolder;
-//import org.springframework.web.context.request.ServletRequestAttributes;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;;
-//
-//
-//// 暂时注释掉，提高系统性能
-////@Aspect   //定义一个切面
-////@Configuration
-//public class LogRecordAspect {
-//private static final Logger logger = LoggerFactory.getLogger(LogRecordAspect.class);
-//
-//    // 定义切点Pointcut
-//    @Pointcut("execution(public * org.jeecg.modules.*.*.*Controller.*(..))")
-//    public void excudeService() {
-//    }
-//
-//    @Around("excudeService()")
-//    public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
-//        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
-//        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
-//        HttpServletRequest request = sra.getRequest();
-//
-//        String url = request.getRequestURL().toString();
-//        String method = request.getMethod();
-//        String uri = request.getRequestURI();
-//        String queryString = request.getQueryString();
-//        logger.info("请求开始, 各个参数, url: {}, method: {}, uri: {}, params: {}", url, method, uri, queryString);
-//
-//        // result的值就是被拦截方法的返回值
-//        Object result = pjp.proceed();
-//
-//        logger.info("请求结束，controller的返回值是 " + result);
-//        return result;
-//    }
-//}
\ No newline at end of file
+package org.jeecg.modules.ngalain.aop;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;;
+
+
+// 暂时注释掉，提高系统性能
+//@Aspect   //定义一个切面
+//@Configuration
+public class LogRecordAspect {
+private static final Logger logger = LoggerFactory.getLogger(LogRecordAspect.class);
+
+    // 定义切点Pointcut
+    @Pointcut("execution(public * org.jeecg.modules.*.*.*Controller.*(..))")
+    public void excudeService() {
+    }
+
+    @Around("excudeService()")
+    public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
+        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
+        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
+        HttpServletRequest request = sra.getRequest();
+
+        String url = request.getRequestURL().toString();
+        String method = request.getMethod();
+        String uri = request.getRequestURI();
+        String queryString = request.getQueryString();
+        logger.info("请求开始, 各个参数, url: {}, method: {}, uri: {}, params: {}", url, method, uri, queryString);
+
+        // result的值就是被拦截方法的返回值
+        Object result = pjp.proceed();
+
+        logger.info("请求结束，controller的返回值是 " + result);
+        return result;
+    }
+}
\ No newline at end of file

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/subwayNetwork/controller/LightAliasController.java

@@ -102,6 +102,7 @@ public class LightAliasController extends JeecgController<LineAlias, ILineAliasS
         return Result.OK(list);
     }
 
+
     @AutoLog(value = "线路车站-线别管理-获取区间车站映射")
     @ApiOperation(value = "线路车站-线别管理-获取区间车站映射", notes = "线路车站-线别管理-获取区间车站映射")
     @GetMapping(value = "/getSectionStation")
@@ -109,5 +110,4 @@ public class LightAliasController extends JeecgController<LineAlias, ILineAliasS
         return Result.OK(lineAliasService.getSectionStation());
     }
 
-
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/subwayNetwork/controller/LightRailController.java

@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.modules.subwayNetwork.vo.LightRailQueryVO;
+import org.jeecg.modules.subwayNetwork.vo.SectionStationMapVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -130,4 +131,11 @@ public class LightRailController extends JeecgController<LightRail, ILightRailSe
         return Result.OK(list);
     }
 
+
+    @AutoLog(value = "线路车站-线别管理-获取区间车站映射")
+    @ApiOperation(value = "线路车站-线别管理-获取区间车站映射", notes = "线路车站-线别管理-获取区间车站映射")
+    @GetMapping(value = "/getSectionStation")
+    public Result<List<SectionStationMapVO>> getSectionStation() {
+        return Result.OK(lightRailService.getSectionStation());
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/subwayNetwork/controller/SubwaySectionController.java

@@ -66,7 +66,7 @@ public class SubwaySectionController extends JeecgController<SubwaySection, ISub
     @ApiOperation(value = "线路车站-地铁区间-通过id删除", notes = "线路车站-地铁区间-通过id删除")
     @GetMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        subwaySectionService.removeById(id);
+        subwaySectionService.delete(id);
         return Result.OK("删除成功!");
     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/subwayNetwork/mapper/LightRailMapper.java

@@ -5,6 +5,9 @@ import org.jeecg.modules.subwayNetwork.dto.LightRailQueryDTO;
 import org.jeecg.modules.subwayNetwork.entity.LightRail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.subwayNetwork.vo.LightRailQueryVO;
+import org.jeecg.modules.subwayNetwork.vo.SectionStationMapVO;
+
+import java.util.List;
 
 /**
  * @Description: 线路车站-线别管理
@@ -13,4 +16,6 @@ import org.jeecg.modules.subwayNetwork.vo.LightRailQueryVO;
 public interface LightRailMapper extends BaseMapper<LightRail> {
 
     IPage<LightRailQueryVO> queryPageList(IPage<LightRailQueryVO> page, LightRailQueryDTO query);
+
+    List<SectionStationMapVO> getSectionStation();
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/subwayNetwork/mapper/xml/LightRailMapper.xml

@@ -27,5 +27,17 @@
         </where>
         GROUP BY t1.id
     </select>
+    <select id="getSectionStation" resultType="org.jeecg.modules.subwayNetwork.vo.SectionStationMapVO">
+        SELECT
+            id,
+            light_rail_id,
+            light_rail_name,
+            section_name ,
+            section_id ,
+            station_id,
+            station_name
+        FROM
+            t_sn_section_station_map
+    </select>
 
 </mapper>
\ No newline at end of file

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/subwayNetwork/service/ILightRailService.java

@@ -6,6 +6,9 @@ import org.jeecg.modules.subwayNetwork.dto.LightRailQueryDTO;
 import org.jeecg.modules.subwayNetwork.entity.LightRail;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.subwayNetwork.vo.LightRailQueryVO;
+import org.jeecg.modules.subwayNetwork.vo.SectionStationMapVO;
+
+import java.util.List;
 
 /**
  * @Description: 线路车站-轻轨线路
@@ -22,4 +25,6 @@ public interface ILightRailService extends IService<LightRail> {
      * @return
      */
     IPage<LightRailQueryVO> queryPageList(PageSearch<LightRailQueryDTO> dto);
+
+    List<SectionStationMapVO> getSectionStation();
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/subwayNetwork/service/ISubwaySectionService.java

@@ -19,4 +19,6 @@ public interface ISubwaySectionService extends IService<SubwaySection> {
     void edit(SubwaySectionEditDTO dto);
 
     IPage<SubwaySectionVO> queryPageList(PageSearch<SubwaySectionQueryDTO> dto);
+
+    void delete(String id);
 }

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

@@ -9,8 +9,11 @@ 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.subwayNetwork.vo.SectionStationMapVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description: 线路车站-线别管理
  */
@@ -24,4 +27,9 @@ public class LightRailServiceImpl extends ServiceImpl<LightRailMapper, LightRail
         page = this.baseMapper.queryPageList(page, dto.getQuery());
         return page;
     }
+
+    @Override
+    public List<SectionStationMapVO> getSectionStation() {
+        return this.baseMapper.getSectionStation();
+    }
 }

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

@@ -109,4 +109,13 @@ public class SubwaySectionServiceImpl extends ServiceImpl<SubwaySectionMapper, S
         return page;
 
     }
+
+    @Override
+    public void delete(String id) {
+        LambdaQueryWrapper<SectionStationMap> ssmQueryWrapper = new LambdaQueryWrapper<>();
+        ssmQueryWrapper.eq(SectionStationMap::getSectionId, id);
+        sectionStationMapMapper.delete(ssmQueryWrapper);
+
+        this.removeById(id);
+    }
 }

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

 package org.jeecg.codegenerate;
 
-import java.math.BigDecimal;
+import com.baomidou.mybatisplus.generator.FastAutoGenerator;
+import com.baomidou.mybatisplus.generator.config.OutputFile;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 
 public class CodeGenerate {
+    public static String url = "jdbc:mysql://47.94.207.62:3306/hzsomms?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull";
+    public static String username = "root";
+    public static String password = "superAdmin&321";
+
     public static void main(String[] args) {
-        BigDecimal divide = new BigDecimal(128).divide(new BigDecimal(2.58), 6, BigDecimal.ROUND_HALF_UP);
-        System.out.println("divide.setScale(0,BigDecimal.ROUND_UP).intValue() = " + divide.setScale(0, BigDecimal.ROUND_UP).intValue());
-        // 数据源
-//        DataSourceConfig.Builder dataSourceConfig = new DataSourceConfig.Builder("jdbc:mysql://47.94.207.62:3306/hzsomms?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull",
-//                "root",
-//                "superAdmin&321")
-//                .dbQuery(new MySqlQuery())
-//                .schema("mybatis-plus")
-//                .typeConvert(new MySqlTypeConvert())
-//                .keyWordsHandler(new MySqlKeyWordsHandler())
-//                .build();
-//
-//
-//        // 全局配置
-//        GlobalConfig globalConfig = new GlobalConfig.Builder()
-//                .fileOverride()
-//                .outputDir("/opt/baomidou")
-//                .author("baomidou")
-//                .enableKotlin()
-//                .enableSwagger()
-//                .dateType(DateType.TIME_PACK)1
-//                .commentDate("yyyy-MM-dd")
-//                .build();
-//
-//        FastAutoGenerator.create(dataSourceConfig)
-//                .execute();
+        String projectPath = System.getProperty("user.dir");
+        System.out.println("projectPath = " + projectPath);
+
+        // 输出目录
+        String outputDir = projectPath + "\\jeecg-module-system\\jeecg-system-biz\\src\\main\\java\\";
+//        String outputDir = "F:\\workspace\\demo\\";
+
+        // 模块名
+        String moduleName = "deviceAsset";
+
+        // 表名
+        String[] tables = {
+                "t_da_curve_management",
+                "t_da_fastener_management",
+                "t_da_sign_board_management",
+                "t_da_track_bed_management",
+                "t_da_vertical_curve_management",
+        };
+
 
+        FastAutoGenerator.create(url, username, password)
+                // 全局配置
+                .globalConfig(builder -> {
+                    builder.author("hkl")
+                            .enableSwagger()
+                            .commentDate("yyyy-MM-dd")
+                            .dateType(DateType.ONLY_DATE)
+                            .outputDir(outputDir)
+                            .build();
+                })
+                // 包配置
+                .packageConfig(builder -> {
+                    builder.moduleName(moduleName)
+                            .parent("org.jeecg.modules")
+                            .service("service")
+                            .serviceImpl("service.impl")
+                            .mapper("mapper")
+                            .xml("mapper.xml")
+                            .controller("controller")
+                            .build();
+                })
+                // 设置过滤前缀
+                .strategyConfig(builder -> {
+                    builder.addInclude(tables) // 设置需要生成的表名
+                            .addTablePrefix("t_sn", "t_da"); // 设置过滤表前缀
 
+                    // entity实体策略
+                    builder.entityBuilder()
+                            .enableLombok()
+                            .enableTableFieldAnnotation();
+
+                    // 控制层策略
+                    builder.controllerBuilder()
+                            .superClass(JeecgController.class)
+                            .enableRestStyle();
+
+                })
+                .injectionConfig(consumer -> {
+                    Map<String, String> customFile = new HashMap<>();
+                    // DTO
+                    customFile.put("DTO.java", "/generator/dto.java.ftl");
+                    customFile.put("VO.java", "/generator/vo.java.ftl");
+                    consumer.customFile(customFile).build();
+
+                })
+
+                // 使用Freemarker引擎模板，默认的是Velocity引擎模板
+                .templateEngine(new EnhanceFreemarkerTemplateEngine())
+                .execute();
+    }
 
+    /**
+     * 代码生成器支持自定义[DTO\VO等]模版
+     */
+    public static class EnhanceFreemarkerTemplateEngine extends FreemarkerTemplateEngine {
+        @Override
+        protected void outputCustomFile(@NotNull Map<String, String> customFile, @NotNull TableInfo tableInfo, @NotNull Map<String, Object> objectMap) {
+            String entityName = tableInfo.getEntityName();
+            String otherPath = this.getPathInfo(OutputFile.other);
+            customFile.forEach((key, value) -> {
+                String fileName = String.format(otherPath + File.separator + entityName + "%s", key);
+                this.outputFile(new File(fileName), objectMap, value);
+            });
+        }
     }
 }

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneGUI.java

-package org.jeecg.codegenerate;
-
-import org.jeecgframework.codegenerate.window.CodeWindow;
-
-/**
- * @Title: 单表代码生成器入口
- * @Author 张代浩
- * @site www.jeecg.com
- * @Version:V1.0.1
- */
-public class JeecgOneGUI {
-
-	/** 使用手册： https://help.jeecg.com/vue3/codegen/gui.html */
-    public static void main(String[] args) {
-    	new CodeWindow().pack();
-	}
-
-}
\ No newline at end of file

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/codegenerate/JeecgOneToMainUtil.java

-package org.jeecg.codegenerate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jeecgframework.codegenerate.generate.impl.CodeGenerateOneToMany;
-import org.jeecgframework.codegenerate.generate.pojo.onetomany.MainTableVo;
-import org.jeecgframework.codegenerate.generate.pojo.onetomany.SubTableVo;
-
-/**
- * 代码生成器入口【一对多】
- * @Author 张代浩
- * @site www.jeecg.com
- * 
- */
-public class JeecgOneToMainUtil {
-
-	/**
-	 * 一对多(父子表)数据模型，生成方法
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		//第一步：设置主表配置
-		MainTableVo mainTable = new MainTableVo();
-        //表名
-		mainTable.setTableName("jeecg_order_main");
-        //实体名
-		mainTable.setEntityName("GuiTestOrderMain");
-        //包名
-		mainTable.setEntityPackage("gui");
-        //描述
-		mainTable.setFtlDescription("GUI订单管理");
-		
-		//第二步：设置子表集合配置
-		List<SubTableVo> subTables = new ArrayList<SubTableVo>();
-		//[1].子表一
-		SubTableVo po = new SubTableVo();
-        //表名
-		po.setTableName("jeecg_order_customer");
-        //实体名
-		po.setEntityName("GuiTestOrderCustom");
-        //包名
-		po.setEntityPackage("gui");
-        //描述
-		po.setFtlDescription("客户明细");
-		//子表外键参数配置
-		/*说明: 
-		 * a) 子表引用主表主键ID作为外键，外键字段必须以_ID结尾;
-		 * b) 主表和子表的外键字段名字，必须相同（除主键ID外）;
-		 * c) 多个外键字段，采用逗号分隔;
-		*/
-		po.setForeignKeys(new String[]{"order_id"});
-		subTables.add(po);
-		//[2].子表二
-		SubTableVo po2 = new SubTableVo();
-        //表名
-		po2.setTableName("jeecg_order_ticket");
-        //实体名
-		po2.setEntityName("GuiTestOrderTicket");
-        //包名
-		po2.setEntityPackage("gui");
-        //描述
-		po2.setFtlDescription("产品明细");
-		//子表外键参数配置
-		/*说明: 
-		 * a) 子表引用主表主键ID作为外键，外键字段必须以_ID结尾;
-		 * b) 主表和子表的外键字段名字，必须相同（除主键ID外）;
-		 * c) 多个外键字段，采用逗号分隔;
-		*/
-		po2.setForeignKeys(new String[]{"order_id"});
-		subTables.add(po2);
-		mainTable.setSubTables(subTables);
-		
-		//第三步：一对多(父子表)数据模型,代码生成
-		try {
-			new CodeGenerateOneToMany(mainTable,subTables).generateCodeFile(null);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}

jeecg-module-system/jeecg-system-start/src/main/resources/generator/dto.java.ftl

+package ${package.Entity};
+
+<#list table.importPackages as pkg>
+    import ${pkg};
+</#list>
+<#if swagger>
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+</#if>
+<#if entityLombokModel>
+    import lombok.Getter;
+    import lombok.Setter;
+    <#if chainModel>
+        import lombok.experimental.Accessors;
+    </#if>
+</#if>
+
+/**
+* <p>
+    * ${table.comment!}
+    * </p>
+*
+* @author ${author}
+* @since ${date}
+*/
+<#if entityLombokModel>
+    @Getter
+    @Setter
+    <#if chainModel>
+        @Accessors(chain = true)
+    </#if>
+</#if>
+<#if table.convert>
+    @TableName("${schemaName}${table.name}")
+</#if>
+<#if swagger>
+    @ApiModel(value = "${entity}对象", description = "${table.comment!}")
+</#if>
+<#if superEntityClass??>
+    public class ${entity} extends ${superEntityClass}<#if activeRecord><${entity}></#if> {
+<#elseif activeRecord>
+    public class ${entity} extends Model<${entity}> {
+<#elseif entitySerialVersionUID>
+    public class ${entity} implements Serializable {
+<#else>
+    public class ${entity} {
+</#if>
+<#if entitySerialVersionUID>
+
+    private static final long serialVersionUID = 1L;
+</#if>
+<#-- ----------  BEGIN 字段循环遍历  ---------->
+<#list table.fields as field>
+    <#if field.keyFlag>
+        <#assign keyPropertyName="${field.propertyName}"/>
+    </#if>
+
+    <#if field.comment!?length gt 0>
+        <#if swagger>
+            @ApiModelProperty("${field.comment}")
+        <#else>
+            /**
+            * ${field.comment}
+            */
+        </#if>
+    </#if>
+    <#if field.keyFlag>
+    <#-- 主键 -->
+        <#if field.keyIdentityFlag>
+            @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO)
+        <#elseif idType??>
+            @TableId(value = "${field.annotationColumnName}", type = IdType.${idType})
+        <#elseif field.convert>
+            @TableId("${field.annotationColumnName}")
+        </#if>
+    <#-- 普通字段 -->
+    <#elseif field.fill??>
+    <#-- -----   存在字段填充设置   ----->
+        <#if field.convert>
+            @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill})
+        <#else>
+            @TableField(fill = FieldFill.${field.fill})
+        </#if>
+    <#elseif field.convert>
+        @TableField("${field.annotationColumnName}")
+    </#if>
+<#-- 乐观锁注解 -->
+    <#if field.versionField>
+        @Version
+    </#if>
+<#-- 逻辑删除注解 -->
+    <#if field.logicDeleteField>
+        @TableLogic
+    </#if>
+    private ${field.propertyType} ${field.propertyName};
+</#list>
+<#------------  END 字段循环遍历  ---------->
+
+<#if !entityLombokModel>
+    <#list table.fields as field>
+        <#if field.propertyType == "boolean">
+            <#assign getprefix="is"/>
+        <#else>
+            <#assign getprefix="get"/>
+        </#if>
+        public ${field.propertyType} ${getprefix}${field.capitalName}() {
+        return ${field.propertyName};
+        }
+
+        <#if chainModel>
+            public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+        <#else>
+            public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+        </#if>
+        this.${field.propertyName} = ${field.propertyName};
+        <#if chainModel>
+            return this;
+        </#if>
+        }
+    </#list>
+</#if>
+
+<#if entityColumnConstant>
+    <#list table.fields as field>
+        public static final String ${field.name?upper_case} = "${field.name}";
+
+    </#list>
+</#if>
+<#if activeRecord>
+    @Override
+    public Serializable pkVal() {
+    <#if keyPropertyName??>
+        return this.${keyPropertyName};
+    <#else>
+        return null;
+    </#if>
+    }
+
+</#if>
+<#if !entityLombokModel>
+    @Override
+    public String toString() {
+    return "${entity}{" +
+    <#list table.fields as field>
+        <#if field_index==0>
+            "${field.propertyName}=" + ${field.propertyName} +
+        <#else>
+            ", ${field.propertyName}=" + ${field.propertyName} +
+        </#if>
+    </#list>
+    "}";
+    }
+</#if>
+}

jeecg-module-system/jeecg-system-start/src/main/resources/generator/vo.java.ftl

+package ${package.Entity};
+
+<#list table.importPackages as pkg>
+    import ${pkg};
+</#list>
+<#if swagger>
+    import io.swagger.annotations.ApiModel;
+    import io.swagger.annotations.ApiModelProperty;
+</#if>
+<#if entityLombokModel>
+    import lombok.Getter;
+    import lombok.Setter;
+    <#if chainModel>
+        import lombok.experimental.Accessors;
+    </#if>
+</#if>
+
+/**
+* <p>
+    * ${table.comment!}
+    * </p>
+*
+* @author ${author}
+* @since ${date}
+*/
+<#if entityLombokModel>
+    @Getter
+    @Setter
+    <#if chainModel>
+        @Accessors(chain = true)
+    </#if>
+</#if>
+<#if table.convert>
+    @TableName("${schemaName}${table.name}")
+</#if>
+<#if swagger>
+    @ApiModel(value = "${entity}对象", description = "${table.comment!}")
+</#if>
+<#if superEntityClass??>
+    public class ${entity} extends ${superEntityClass}<#if activeRecord><${entity}></#if> {
+<#elseif activeRecord>
+    public class ${entity} extends Model<${entity}> {
+<#elseif entitySerialVersionUID>
+    public class ${entity} implements Serializable {
+<#else>
+    public class ${entity} {
+</#if>
+<#if entitySerialVersionUID>
+
+    private static final long serialVersionUID = 1L;
+</#if>
+<#-- ----------  BEGIN 字段循环遍历  ---------->
+<#list table.fields as field>
+    <#if field.keyFlag>
+        <#assign keyPropertyName="${field.propertyName}"/>
+    </#if>
+
+    <#if field.comment!?length gt 0>
+        <#if swagger>
+            @ApiModelProperty("${field.comment}")
+        <#else>
+            /**
+            * ${field.comment}
+            */
+        </#if>
+    </#if>
+    <#if field.keyFlag>
+    <#-- 主键 -->
+        <#if field.keyIdentityFlag>
+            @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO)
+        <#elseif idType??>
+            @TableId(value = "${field.annotationColumnName}", type = IdType.${idType})
+        <#elseif field.convert>
+            @TableId("${field.annotationColumnName}")
+        </#if>
+    <#-- 普通字段 -->
+    <#elseif field.fill??>
+    <#-- -----   存在字段填充设置   ----->
+        <#if field.convert>
+            @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill})
+        <#else>
+            @TableField(fill = FieldFill.${field.fill})
+        </#if>
+    <#elseif field.convert>
+        @TableField("${field.annotationColumnName}")
+    </#if>
+<#-- 乐观锁注解 -->
+    <#if field.versionField>
+        @Version
+    </#if>
+<#-- 逻辑删除注解 -->
+    <#if field.logicDeleteField>
+        @TableLogic
+    </#if>
+    private ${field.propertyType} ${field.propertyName};
+</#list>
+<#------------  END 字段循环遍历  ---------->
+
+<#if !entityLombokModel>
+    <#list table.fields as field>
+        <#if field.propertyType == "boolean">
+            <#assign getprefix="is"/>
+        <#else>
+            <#assign getprefix="get"/>
+        </#if>
+        public ${field.propertyType} ${getprefix}${field.capitalName}() {
+        return ${field.propertyName};
+        }
+
+        <#if chainModel>
+            public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+        <#else>
+            public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+        </#if>
+        this.${field.propertyName} = ${field.propertyName};
+        <#if chainModel>
+            return this;
+        </#if>
+        }
+    </#list>
+</#if>
+
+<#if entityColumnConstant>
+    <#list table.fields as field>
+        public static final String ${field.name?upper_case} = "${field.name}";
+
+    </#list>
+</#if>
+<#if activeRecord>
+    @Override
+    public Serializable pkVal() {
+    <#if keyPropertyName??>
+        return this.${keyPropertyName};
+    <#else>
+        return null;
+    </#if>
+    }
+
+</#if>
+<#if !entityLombokModel>
+    @Override
+    public String toString() {
+    return "${entity}{" +
+    <#list table.fields as field>
+        <#if field_index==0>
+            "${field.propertyName}=" + ${field.propertyName} +
+        <#else>
+            ", ${field.propertyName}=" + ${field.propertyName} +
+        </#if>
+    </#list>
+    "}";
+    }
+</#if>
+}

jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties

-#code_generate_project_path
-project_path=E:\\workspace\\jeecg-boot
-#bussi_package[User defined]
-bussi_package=org.jeecg.modules.demo
-
-
-#default code path
-#source_root_package=src
-#webroot_package=WebRoot
-
-#maven code path
-source_root_package=src.main.java
-webroot_package=src.main.webapp
-
-#ftl resource url
-templatepath=/jeecg/code-template
-system_encoding=utf-8
-
-#db Table id [User defined] 
-db_table_id=id
-
-#db convert flag[true/false]
-db_filed_convert=true
-
-#page Search Field num [User defined]
-page_search_filed_num=1
-#page_filter_fields
-page_filter_fields=create_time,create_by,update_time,update_by
-exclude_table=act_,ext_act_,design_,onl_,sys_,qrtz_

jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_database.properties

-#mysql
-diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
-username=root
-password=root
-database_name=jeecg-boot
-
-#oracle
-#diver_name=oracle.jdbc.driver.OracleDriver
-#url=jdbc:oracle:thin:@192.168.1.200:1521:ORCL
-#username=scott
-#password=tiger
-#database_name=ORCL
-
-#postgre
-#diver_name=org.postgresql.Driver
-#url=jdbc:postgresql://localhost:5432/jeecg
-#username=postgres
-#password=postgres
-#database_name=jeecg
-
-#SQLServer2005\u4ee5\u4e0a
-#diver_name=org.hibernate.dialect.SQLServerDialect
-#url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg
-#username=sa
-#password=SA
-#database_name=jeecg
\ No newline at end of file