Merge branch 'dev' into 'dev-szl'

Dev

See merge request !9

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

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

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

+package org.jeecg.modules.checkData.equipmentCheckData.controller;
+
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.TurnoutUseCheck;
+import org.jeecg.modules.checkData.equipmentCheckData.service.ITurnoutUseCheckService;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.base.controller.JeecgController;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-设备检查记录数据 前端控制器
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-07
+ */
+@RestController
+@RequestMapping("/checkData/equipmentCheckData/turnoutUseCheck")
+public class TurnoutUseCheckController extends JeecgController<TurnoutUseCheck, ITurnoutUseCheckService> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.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.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-设备检查记录数据
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-07
+ */
+@Data
+@ApiModel(value = "TurnoutUseCheck对象", description = "检查数据-设备检查记录数据-设备检查记录数据")
+public class TurnoutUseCheckDTO {
+
+    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 checkBatchCode;
+
+    @ApiModelProperty("工单编号")
+    private String workCode;
+
+    @ApiModelProperty("轨距水平尺编号")
+    private String gaugeLevelCode;
+
+    @ApiModelProperty("检查人姓名")
+    private String checkBy;
+
+    @ApiModelProperty("检查日期")
+    private Date checkTime;
+
+    @ApiModelProperty("道岔数量")
+    private Integer turnoutNum;
+
+    @ApiModelProperty("车站id")
+    private String trainStationId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty("曲线半径R(m)")
+    private BigDecimal curveAdius;
+
+    @ApiModelProperty("审核人姓名")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    private Date verifyTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/TurnoutUseCheck.java

+package org.jeecg.modules.checkData.equipmentCheckData.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-07
+ */
+@Getter
+@Setter
+@TableName("t_ek_turnout_use_check")
+@ApiModel(value = "TurnoutUseCheck对象", description = "检查数据-设备检查记录数据-设备检查记录数据")
+public class TurnoutUseCheck 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("check_batch_code")
+    private String checkBatchCode;
+
+    @ApiModelProperty("工单编号")
+    @TableField("work_code")
+    private String workCode;
+
+    @ApiModelProperty("轨距水平尺编号")
+    @TableField("gauge_level_code")
+    private String gaugeLevelCode;
+
+    @ApiModelProperty("检查人姓名")
+    @TableField("check_by")
+    private String checkBy;
+
+    @ApiModelProperty("检查日期")
+    @TableField("check_time")
+    private Date checkTime;
+
+    @ApiModelProperty("道岔数量")
+    @TableField("turnout_num")
+    private Integer turnoutNum;
+
+    @ApiModelProperty("车站id")
+    @TableField("train_station_id")
+    private String trainStationId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("审核人姓名")
+    @TableField("verify_by")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    @TableField("verify_time")
+    private Date verifyTime;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.mapper;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.TurnoutUseCheck;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-设备检查记录数据 Mapper 接口
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-07
+ */
+public interface TurnoutUseCheckMapper extends BaseMapper<TurnoutUseCheck> {
+
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.checkData.equipmentCheckData.mapper.TurnoutUseCheckMapper">
+
+</mapper>

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

+package org.jeecg.modules.checkData.equipmentCheckData.service;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.TurnoutUseCheck;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-设备检查记录数据 服务类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-07
+ */
+public interface ITurnoutUseCheckService extends IService<TurnoutUseCheck> {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
+
+import org.jeecg.modules.checkData.equipmentCheckData.entity.TurnoutUseCheck;
+import org.jeecg.modules.checkData.equipmentCheckData.mapper.TurnoutUseCheckMapper;
+import org.jeecg.modules.checkData.equipmentCheckData.service.ITurnoutUseCheckService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-设备检查记录数据 服务实现类
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-07
+ */
+@Service
+public class TurnoutUseCheckServiceImpl extends ServiceImpl<TurnoutUseCheckMapper, TurnoutUseCheck> implements ITurnoutUseCheckService {
+
+}

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

+package org.jeecg.modules.checkData.equipmentCheckData.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 检查数据-设备检查记录数据-设备检查记录数据
+ * </p>
+ *
+ * @author hkl
+ * @since 2023-07-07
+ */
+@Data
+@ApiModel(value = "TurnoutUseCheckVO对象", description = "检查数据-设备检查记录数据-设备检查记录数据")
+public class TurnoutUseCheckVO {
+
+    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("check_batch_code")
+    private String checkBatchCode;
+
+    @ApiModelProperty("工单编号")
+    @TableField("work_code")
+    private String workCode;
+
+    @ApiModelProperty("轨距水平尺编号")
+    @TableField("gauge_level_code")
+    private String gaugeLevelCode;
+
+    @ApiModelProperty("检查人姓名")
+    @TableField("check_by")
+    private String checkBy;
+
+    @ApiModelProperty("检查日期")
+    @TableField("check_time")
+    private Date checkTime;
+
+    @ApiModelProperty("道岔数量")
+    @TableField("turnout_num")
+    private Integer turnoutNum;
+
+    @ApiModelProperty("车站id")
+    @TableField("train_station_id")
+    private String trainStationId;
+
+    @ApiModelProperty("线别id")
+    @TableField("line_alias_id")
+    private String lineAliasId;
+
+    @ApiModelProperty("曲线半径R(m)")
+    @TableField("curve_adius")
+    private BigDecimal curveAdius;
+
+    @ApiModelProperty("审核人姓名")
+    @TableField("verify_by")
+    private String verifyBy;
+
+    @ApiModelProperty("审核时间")
+    @TableField("verify_time")
+    private Date verifyTime;
+
+    @ApiModelProperty("备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

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

@@ -33,7 +33,7 @@ import java.util.Arrays;
 @RequestMapping("/deviceAsset/railManagement")
 @Api(tags = "资产管理-钢轨管理")
 public class RailManagementController extends JeecgController<RailManagement, IRailManagementService> {
-    @AutoLog(value = "资产管理-钢轨管理 -分页列表查询")
+    @AutoLog(value = "资产管理-钢轨管理-分页列表查询")
     @ApiOperation(value = "资产管理-道岔管理-分页列表查询", notes = "资产管理-道岔管理-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<RailManagementVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,