Commit 600f87aa authored by shizhilong's avatar shizhilong

钢轨波磨情况检查数据接口 -shizhilong

parent 9231f222
...@@ -81,6 +81,12 @@ public class RecordsMasterCheckDTO { ...@@ -81,6 +81,12 @@ public class RecordsMasterCheckDTO {
@ApiModelProperty("终点里程") @ApiModelProperty("终点里程")
private BigDecimal endMileage; private BigDecimal endMileage;
@ApiModelProperty("共通字段1(根据字段type来赋值)")
private String numOne;
@ApiModelProperty("共通字段2(根据字段type来赋值)")
private String numTwo;
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remark; private String remark;
......
package org.jeecg.modules.checkData.equipmentCheckData.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长
* </p>
*
* @author hkl
* @since 2023-08-04
*/
@Data
public class RecordsMasterCorrWaveDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("设备检查记录主表id")
private String recordsMasterId;
@ApiModelProperty("类型(1:RMS;2:AP2P;3:FIL)")
private String type;
@ApiModelProperty("波长")
private String wave;
@ApiModelProperty("值1")
private BigDecimal numOne;
@ApiModelProperty("值2")
private BigDecimal numTwo;
@ApiModelProperty("值3")
private BigDecimal numThree;
@ApiModelProperty("是否删除(0:未删除,1:已删除)")
private String delFlag;
@ApiModelProperty("导入顺序")
private Integer sort;
}
package org.jeecg.modules.checkData.equipmentCheckData.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长详情
* </p>
*
* @author hkl
* @since 2023-08-04
*/
@Data
public class RecordsMasterCorrWaveInfoDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("设备检查记录主表id")
private String recordsMasterId;
@ApiModelProperty("类型(1:RMS;2:AP2P;3:FIL)")
@TableField("type")
private String type;
@ApiModelProperty("编号")
private String code;
@ApiModelProperty("里程")
private String mileage;
@ApiModelProperty("波长")
private String waveNum;
@ApiModelProperty("值")
private String numOne;
@ApiModelProperty("限定值")
private String restrictNum;
@ApiModelProperty("是否删除(0:未删除,1:已删除)")
private String delFlag;
@ApiModelProperty("导入顺序")
private Integer sort;
}
...@@ -3,6 +3,7 @@ package org.jeecg.modules.checkData.equipmentCheckData.entity; ...@@ -3,6 +3,7 @@ package org.jeecg.modules.checkData.equipmentCheckData.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
...@@ -15,6 +16,7 @@ import lombok.Setter; ...@@ -15,6 +16,7 @@ import lombok.Setter;
import org.jeecg.modules.utils.ExcelExport; import org.jeecg.modules.utils.ExcelExport;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
/** /**
* <p> * <p>
* 设备检查记录主表 * 设备检查记录主表
...@@ -114,6 +116,14 @@ public class RecordsMasterCheck implements Serializable { ...@@ -114,6 +116,14 @@ public class RecordsMasterCheck implements Serializable {
@ExcelExport(value = "终点里程", sort = 8) @ExcelExport(value = "终点里程", sort = 8)
private BigDecimal endMileage; private BigDecimal endMileage;
@ApiModelProperty("共通字段1(根据字段type来赋值)")
@TableField("num_one")
private String numOne;
@ApiModelProperty("共通字段2(根据字段type来赋值)")
@TableField("num_two")
private String numTwo;
@ApiModelProperty("备注") @ApiModelProperty("备注")
@TableField("remark") @TableField("remark")
@ExcelExport(value = "备注", sort = 13) @ExcelExport(value = "备注", sort = 13)
...@@ -128,19 +138,19 @@ public class RecordsMasterCheck implements Serializable { ...@@ -128,19 +138,19 @@ public class RecordsMasterCheck implements Serializable {
@TableField("check_time") @TableField("check_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelExport(value = "检查日期", format = "yyyy-MM-dd",sort = 10) @ExcelExport(value = "检查日期", format = "yyyy-MM-dd", sort = 10)
private Date checkTime; private Date checkTime;
@ApiModelProperty("审核人姓名") @ApiModelProperty("审核人姓名")
@TableField("verify_by") @TableField("verify_by")
@ExcelExport(value = "审核人姓名",sort = 11) @ExcelExport(value = "审核人姓名", sort = 11)
private String verifyBy; private String verifyBy;
@ApiModelProperty("审核时间") @ApiModelProperty("审核时间")
@TableField("verify_time") @TableField("verify_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelExport(value = "审核日期",format = "yyyy-MM-dd",sort = 12) @ExcelExport(value = "审核日期", format = "yyyy-MM-dd", sort = 12)
private Date verifyTime; private Date verifyTime;
@ApiModelProperty("是否删除(0:未删除;1:已删除)") @ApiModelProperty("是否删除(0:未删除;1:已删除)")
......
package org.jeecg.modules.checkData.equipmentCheckData.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.jeecg.modules.checkData.equipmentCheckData.vo.RecordsMasterCorrWaveInfoVO;
import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长
* </p>
*
* @author hkl
* @since 2023-08-04
*/
@Getter
@Setter
@TableName("t_ek_records_master_corr_wave")
@ApiModel(value = "RecordsMasterCorrWave对象", description = "设备检查记录数据-钢轨波磨情况检查数据-波长")
public class RecordsMasterCorrWave implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("设备检查记录主表id")
@TableField("records_master_id")
private String recordsMasterId;
@ApiModelProperty("类型(1:RMS;2:AP2P;3:FIL)")
@TableField("type")
private String type;
@ApiModelProperty("波长")
@TableField("wave")
private String wave;
@ApiModelProperty("值1")
@TableField("num_one")
private BigDecimal numOne;
@ApiModelProperty("值2")
@TableField("num_two")
private BigDecimal numTwo;
@ApiModelProperty("值3")
@TableField("num_three")
private BigDecimal numThree;
@ApiModelProperty("是否删除(0:未删除,1:已删除)")
@TableField("del_flag")
private String delFlag;
@ApiModelProperty("导入顺序")
@TableField("sort")
private Integer sort;
}
package org.jeecg.modules.checkData.equipmentCheckData.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长详情
* </p>
*
* @author hkl
* @since 2023-08-04
*/
@Getter
@Setter
@TableName("t_ek_records_master_corr_wave_info")
@ApiModel(value = "RecordsMasterCorrWaveInfo对象", description = "设备检查记录数据-钢轨波磨情况检查数据-波长详情")
public class RecordsMasterCorrWaveInfo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("设备检查记录主表id")
@TableField("records_master_id")
private String recordsMasterId;
@ApiModelProperty("类型(1:RMS;2:AP2P;3:FIL)")
@TableField("type")
private String type;
@ApiModelProperty("编号")
@TableField("code")
private String code;
@ApiModelProperty("里程")
@TableField("mileage")
private String mileage;
@ApiModelProperty("波长")
@TableField("wave_num")
private String waveNum;
@ApiModelProperty("值")
@TableField("num_one")
private String numOne;
@ApiModelProperty("限定值")
@TableField("restrict_num")
private String restrictNum;
@ApiModelProperty("是否删除(0:未删除,1:已删除)")
@TableField("del_flag")
private String delFlag;
@ApiModelProperty("导入顺序")
@TableField("sort")
private Integer sort;
}
package org.jeecg.modules.checkData.equipmentCheckData.mapper;
import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordsMasterCorrWaveInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长详情 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-08-04
*/
public interface RecordsMasterCorrWaveInfoMapper extends BaseMapper<RecordsMasterCorrWaveInfo> {
}
package org.jeecg.modules.checkData.equipmentCheckData.mapper;
import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordsMasterCorrWave;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-08-04
*/
public interface RecordsMasterCorrWaveMapper extends BaseMapper<RecordsMasterCorrWave> {
}
<?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.RecordsMasterCorrWaveInfoMapper">
</mapper>
<?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.RecordsMasterCorrWaveMapper">
</mapper>
package org.jeecg.modules.checkData.equipmentCheckData.service;
import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordsMasterCorrWaveInfo;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长详情 服务类
* </p>
*
* @author hkl
* @since 2023-08-04
*/
public interface IRecordsMasterCorrWaveInfoService extends IService<RecordsMasterCorrWaveInfo> {
}
package org.jeecg.modules.checkData.equipmentCheckData.service;
import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordsMasterCorrWave;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长 服务类
* </p>
*
* @author hkl
* @since 2023-08-04
*/
public interface IRecordsMasterCorrWaveService extends IService<RecordsMasterCorrWave> {
}
package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordsMasterCorrWaveInfo;
import org.jeecg.modules.checkData.equipmentCheckData.mapper.RecordsMasterCorrWaveInfoMapper;
import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordsMasterCorrWaveInfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长详情 服务实现类
* </p>
*
* @author hkl
* @since 2023-08-04
*/
@Service
public class RecordsMasterCorrWaveInfoServiceImpl extends ServiceImpl<RecordsMasterCorrWaveInfoMapper, RecordsMasterCorrWaveInfo> implements IRecordsMasterCorrWaveInfoService {
}
package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
import org.jeecg.modules.checkData.equipmentCheckData.entity.RecordsMasterCorrWave;
import org.jeecg.modules.checkData.equipmentCheckData.mapper.RecordsMasterCorrWaveMapper;
import org.jeecg.modules.checkData.equipmentCheckData.service.IRecordsMasterCorrWaveService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长 服务实现类
* </p>
*
* @author hkl
* @since 2023-08-04
*/
@Service
public class RecordsMasterCorrWaveServiceImpl extends ServiceImpl<RecordsMasterCorrWaveMapper, RecordsMasterCorrWave> implements IRecordsMasterCorrWaveService {
}
...@@ -77,6 +77,12 @@ public class RecordsMasterCheckVO { ...@@ -77,6 +77,12 @@ public class RecordsMasterCheckVO {
@ApiModelProperty("终点里程") @ApiModelProperty("终点里程")
private BigDecimal endMileage; private BigDecimal endMileage;
@ApiModelProperty("共通字段1(根据字段type来赋值)")
private String numOne;
@ApiModelProperty("共通字段2(根据字段type来赋值)")
private String numTwo;
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remark; private String remark;
......
package org.jeecg.modules.checkData.equipmentCheckData.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长详情
* </p>
*
* @author hkl
* @since 2023-08-04
*/
@Data
public class RecordsMasterCorrWaveInfoVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("设备检查记录主表id")
private String recordsMasterId;
@ApiModelProperty("类型(1:RMS;2:AP2P;3:FIL)")
@TableField("type")
private String type;
@ApiModelProperty("编号")
private String code;
@ApiModelProperty("里程")
private String mileage;
@ApiModelProperty("波长")
private String waveNum;
@ApiModelProperty("值")
private String numOne;
@ApiModelProperty("限定值")
private String restrictNum;
@ApiModelProperty("是否删除(0:未删除,1:已删除)")
private String delFlag;
@ApiModelProperty("导入顺序")
private Integer sort;
}
package org.jeecg.modules.checkData.equipmentCheckData.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* <p>
* 设备检查记录数据-钢轨波磨情况检查数据-波长
* </p>
*
* @author hkl
* @since 2023-08-04
*/
@Data
public class RecordsMasterCorrWaveVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("设备检查记录主表id")
private String recordsMasterId;
@ApiModelProperty("类型(1:RMS;2:AP2P;3:FIL)")
private String type;
@ApiModelProperty("波长")
private String wave;
@ApiModelProperty("值1")
private BigDecimal numOne;
@ApiModelProperty("值2")
private BigDecimal numTwo;
@ApiModelProperty("值3")
private BigDecimal numThree;
@ApiModelProperty("是否删除(0:未删除,1:已删除)")
private String delFlag;
@ApiModelProperty("导入顺序")
private Integer sort;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment