Skip to content

H
hzsomms
Commit 0d9027e1 authored by 史志龙's avatar 史志龙
Browse files
Options

Merge branch 'dev-szl' into 'dev' 

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

See merge request !51
parents 8f653dad 600f87aa
Show whitespace changes
Inline Side-by-side
Showing with 831 additions and 17 deletions
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/RecordsMasterCheckController.java
View file @ 0d9027e1
......@@ -36,11 +36,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.transaction.Transactional;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.*;
/**
* <p>
......@@ -64,6 +60,10 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
private IRailWearRecordService railWearRecordService;
@Autowired
private ICurveWearRecordService curveWearRecordService;
@Autowired
private IRecordsMasterCorrWaveService recordsMasterCorrWaveService;
@Autowired
private IRecordsMasterCorrWaveInfoService recordsMasterCorrWaveInfoService;
//********************************设备检查记录相关接口*************************************************************
/**
......@@ -146,6 +146,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
return Result.OK("操作成功!");
}
/**
* 删除设备检查记录主数据及相关联的数据
*
......@@ -169,6 +170,10 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
} else if ("5".equals(type)) {
//道床使用情况检查数据
trackBedManagementCheckService.lambdaUpdate().eq(TrackBedManagementCheck::getRecordsMasterCheckId, id).remove();
} else {
//钢轨波磨情况检查数据
recordsMasterCorrWaveService.lambdaUpdate().eq(RecordsMasterCorrWave::getRecordsMasterId, id).remove();
recordsMasterCorrWaveInfoService.lambdaUpdate().eq(RecordsMasterCorrWaveInfo::getRecordsMasterId, id).remove();
}
//删除设备检查记录主数据
this.service.lambdaUpdate().eq(RecordsMasterCheck::getId, id).remove();
......@@ -185,10 +190,10 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
@AutoLog(value = "根据设备检查记录主键查询道岔使用情况检查数据")
@ApiOperation(value = "根据设备检查记录主键查询道岔使用情况检查数据", notes = "根据设备检查记录主键查询道岔使用情况检查数据")
@GetMapping(value = "/getTurnoutInfoList")
public Result<List<RecordsMasterTurnoutInfoVO>> getTurnoutInfoList(@ApiParam(name = "设备检查记录主键id") String id,@ApiParam(name = "道岔编码") String code) {
public Result<List<RecordsMasterTurnoutInfoVO>> getTurnoutInfoList(@ApiParam(name = "设备检查记录主键id") String id, @ApiParam(name = "道岔编码") String code) {
List<RecordsMasterTurnoutInfo> listResult = recordsMasterTurnoutInfoService.lambdaQuery()
.eq(ObjectUtil.isNotEmpty(id), RecordsMasterTurnoutInfo::getRecordsMasterId, id)
.eq(RecordsMasterTurnoutInfo::getSwitchCode,code)
.eq(RecordsMasterTurnoutInfo::getSwitchCode, code)
.eq(RecordsMasterTurnoutInfo::getDelFlag, "0")
.list();
List<RecordsMasterTurnoutInfoVO> resultList = new ArrayList<>();
......@@ -197,6 +202,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
}
return Result.OK(resultList);
}
/**
* 根据设备检查记录主键回显道岔编号的集合
*
......@@ -265,17 +271,17 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
model.setSort(sort);
recordsMasterTurnoutInfoList.add(model);
} else if (str.equals("轨距")) {
this.uploadTrackGauge(recordsMasterTurnoutInfoList, i, realname, rowRecords, id, "1",switchCode);
this.uploadTrackGauge(recordsMasterTurnoutInfoList, i, realname, rowRecords, id, "1", switchCode);
} else if (str.equals("水平")) {
this.uploadTrackGauge(recordsMasterTurnoutInfoList, i, realname, rowRecords, id, "2",switchCode);
this.uploadTrackGauge(recordsMasterTurnoutInfoList, i, realname, rowRecords, id, "2", switchCode);
} else if (str.equals("支距")) {
//获取支距下一行的数据
List<Object> offsetList = rowRecords.get(i + 1);
this.uploadOffset(recordsMasterTurnoutInfoList, offsetList, realname, id,switchCode);
this.uploadOffset(recordsMasterTurnoutInfoList, offsetList, realname, id, switchCode);
} else if (str.equals("轮缘槽")) {
//获取支距下两行的数据
List<Object> flangeList = rowRecords.get(i + 2);
this.uploadFlange(recordsMasterTurnoutInfoList, flangeList, realname, id,switchCode);
this.uploadFlange(recordsMasterTurnoutInfoList, flangeList, realname, id, switchCode);
} else {
if (i != rowRecords.size() - 1) {
continue;
......@@ -305,7 +311,211 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
}
return Result.ok("操作成功");
}
//*****************************************钢轨波磨情况检查数据********************************************************
/**
* 根据设备检查记录主键回显钢轨波磨情况检查数据
*
* @param id 设备检查记录主键
* @return
*/
@AutoLog(value = "根据设备检查记录主键回显钢轨波磨情况检查数据")
@ApiOperation(value = "根据设备检查记录主键回显钢轨波磨情况检查数据", notes = "根据设备检查记录主键回显钢轨波磨情况检查数据")
@GetMapping(value = "/getCorrWaveList")
public Result<Map<String, Object>> getCorrWaveList(@ApiParam(name = "设备检查记录主键id") String id, @ApiParam(name = "检查类型") String type) {
Map<String, Object> map = new HashMap<>();
List<RecordsMasterCorrWave> listResult = recordsMasterCorrWaveService.lambdaQuery()
.eq(ObjectUtil.isNotEmpty(id), RecordsMasterCorrWave::getRecordsMasterId, id)
.eq(ObjectUtil.isNotEmpty(type), RecordsMasterCorrWave::getType, type)
.eq(RecordsMasterCorrWave::getDelFlag, "0")
.orderByAsc(RecordsMasterCorrWave::getSort)
.list();
map.put("corrWave", listResult);
List<RecordsMasterCorrWaveInfo> infoList = recordsMasterCorrWaveInfoService.lambdaQuery()
.eq(ObjectUtil.isNotEmpty(id), RecordsMasterCorrWaveInfo::getRecordsMasterId, id)
.eq(ObjectUtil.isNotEmpty(type), RecordsMasterCorrWaveInfo::getType, type)
.eq(RecordsMasterCorrWaveInfo::getDelFlag, "0")
.orderByAsc(RecordsMasterCorrWaveInfo::getSort)
.list();
map.put("corrWaveInfo", infoList);
return Result.OK(map);
}
@AutoLog(value = "钢轨波磨情况导入")
@ApiOperation(value = "钢轨波磨情况导入", notes = "钢轨波磨情况导入")
@PostMapping(value = "/corrWaveUpload")
@Transactional
public Result<String> corrWaveUpload(MultipartFile file, @ApiParam(name = "设备检查记录主键id") String id) throws Exception {
try {
//初始化数据模板
QueryWrapper<RecordsMasterCorrWave> wrapper = new QueryWrapper<>();
wrapper.eq("records_master_id", id);
recordsMasterCorrWaveService.remove(wrapper);
QueryWrapper<RecordsMasterCorrWaveInfo> infoWrapper = new QueryWrapper<>();
infoWrapper.eq("records_master_id", id);
recordsMasterCorrWaveInfoService.remove(infoWrapper);
InputStream in = file.getInputStream();
//读取Excel中的数据
List<List<Object>> rowRecords = ExcelAnalysisUtils.getListByExcel(in);
//获取当前登录人信息
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String realname = user.getRealname();
//初始化钢轨波磨情况波长数据集合
List<RecordsMasterCorrWave> recordsMasterCorrWaveList = new ArrayList<>();
//初始化钢轨波磨情况波长详情数据集合
List<RecordsMasterCorrWaveInfo> infoList = new ArrayList<>();
//初始化顺序
Integer sort = 0;
Integer type = 0;
Integer infoType = 1;
for (int i = 0; i < rowRecords.size(); i++) {
List<Object> list = rowRecords.get(i);
String str = list.get(0).toString().trim();
if (str.equals("波长")) {
type = type + 1;
sort = sort + 1;
this.uploadCorrWave(recordsMasterCorrWaveList,rowRecords,i,realname,id,type,sort);
}else if(str.equals("D.N.")){
infoType = this.uploadCorrWaveInfo(infoList,rowRecords,i,realname,id,infoType);
}else {
if (i != rowRecords.size() - 1) {
continue;
} else {
//释放资源
in.close();
}
}
}
if (recordsMasterCorrWaveList != null && recordsMasterCorrWaveList.size() > 0) {
recordsMasterCorrWaveService.saveBatch(recordsMasterCorrWaveList);
}
if (infoList != null && infoList.size() > 0) {
recordsMasterCorrWaveInfoService.saveBatch(infoList);
}
//释放资源
in.close();
} catch (Exception e) {
e.getMessage();
}
return Result.ok("操作成功");
}
//*****************************************封装解析方法*************************************************************
/**
* 处理波长详情部分
* @param recordsMasterCorrWaveInfoList
* @param rowRecords
* @param i
* @param realname
* @param id
* @param type
*/
public Integer uploadCorrWaveInfo(List<RecordsMasterCorrWaveInfo> recordsMasterCorrWaveInfoList,List<List<Object>> rowRecords,int i, String realname, String id,Integer type) {
Integer sort1 = 0;
for(int j = i+1; j < rowRecords.size(); j++){
String data = rowRecords.get(j).get(0).toString().trim();
if(ObjectUtil.isEmpty(data)){
return type+1;
}
sort1++;
RecordsMasterCorrWaveInfo model = new RecordsMasterCorrWaveInfo();
model.setId(IdWorker.get32UUID());
model.setDelFlag("0");
model.setRecordsMasterId(id);
model.setCreateTime(new Date());
model.setUpdateTime(new Date());
model.setCreateBy(realname);
model.setUpdateBy(realname);
model.setSort(sort1);
model.setType(type.toString());
//获取编号
String code = "";
code = rowRecords.get(j).get(0).toString().trim();
//获取里程
String mileage = "";
mileage = rowRecords.get(j).get(1).toString().trim();
//获取波长
String waveNum = "";
waveNum = rowRecords.get(j).get(2).toString().trim();
//获取值
String one = "";
one = rowRecords.get(j).get(3).toString().trim();
//获取限定值
String restrictNum = "";
restrictNum = rowRecords.get(j).get(4).toString().trim();
if(ObjectUtil.isNotEmpty(code)){
model.setCode(code);
}
if(ObjectUtil.isNotEmpty(mileage)){
model.setMileage(mileage);
}
if(ObjectUtil.isNotEmpty(waveNum)){
model.setWaveNum(waveNum);
}
if(ObjectUtil.isNotEmpty(one)){
model.setNumOne(one);
}
if(ObjectUtil.isNotEmpty(restrictNum)){
model.setRestrictNum(restrictNum);
}
recordsMasterCorrWaveInfoList.add(model);
}
return type;
}
/**
* 处理波长部分
* @param recordsMasterCorrWaveList
* @param rowRecords
* @param i
* @param realname
* @param id
* @param type
* @param sort
*/
public void uploadCorrWave(List<RecordsMasterCorrWave> recordsMasterCorrWaveList,List<List<Object>> rowRecords,int i, String realname, String id,Integer type,Integer sort) {
RecordsMasterCorrWave model = new RecordsMasterCorrWave();
model.setId(IdWorker.get32UUID());
model.setDelFlag("0");
model.setRecordsMasterId(id);
model.setCreateTime(new Date());
model.setUpdateTime(new Date());
model.setCreateBy(realname);
model.setUpdateBy(realname);
model.setSort(sort);
if (type <= 4) {
model.setType("1");
} else if (type > 4 && type <= 8) {
model.setType("2");
} else {
model.setType("3");
}
//获取波长
String wave = "";
wave = rowRecords.get(i).get(1).toString().trim();
//获取TH1
String one = "";
one = rowRecords.get(i).get(3).toString().trim();
//获取TH2
String two = "";
two = rowRecords.get(i).get(5).toString().trim();
//获取TH3
String three = "";
three = rowRecords.get(i).get(7).toString().trim();
if (ObjectUtil.isNotEmpty(one)) {
model.setNumOne(new BigDecimal(one));
}
if (ObjectUtil.isNotEmpty(two)) {
model.setNumTwo(new BigDecimal(two));
}
if (ObjectUtil.isNotEmpty(three)) {
model.setNumThree(new BigDecimal(three));
}
if(ObjectUtil.isNotEmpty(wave)){
model.setWave(wave);
}
recordsMasterCorrWaveList.add(model);
}
/**
* 处理滑床板部分
* @param recordsMasterTurnoutInfoList
......@@ -346,7 +556,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
* @param realname
* @param id
*/
public void uploadFlange(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, List<Object> list, String realname, String id,String switchCode) {
public void uploadFlange(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, List<Object> list, String realname, String id, String switchCode) {
RecordsMasterTurnoutInfo model = new RecordsMasterTurnoutInfo();
model.setId(IdWorker.get32UUID());
model.setDelFlag("0");
......@@ -418,7 +628,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
* @param realname
* @param id
*/
public void uploadOffset(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, List<Object> offsetList, String realname, String id,String switchCode) {
public void uploadOffset(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, List<Object> offsetList, String realname, String id, String switchCode) {
RecordsMasterTurnoutInfo model = new RecordsMasterTurnoutInfo();
model.setId(IdWorker.get32UUID());
model.setDelFlag("0");
......@@ -475,7 +685,7 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
* @param id 主表id
* @param type 导入子类型
*/
public void uploadTrackGauge(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, int i, String realname, List<List<Object>> rowRecords, String id, String type,String switchCode) {
public void uploadTrackGauge(List<RecordsMasterTurnoutInfo> recordsMasterTurnoutInfoList, int i, String realname, List<List<Object>> rowRecords, String id, String type, String switchCode) {
//初始化公里总结报告表
RecordsMasterTurnoutInfo model = new RecordsMasterTurnoutInfo();
model.setId(IdWorker.get32UUID());
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RecordsMasterCheckDTO.java
View file @ 0d9027e1
......@@ -81,6 +81,12 @@ public class RecordsMasterCheckDTO {
@ApiModelProperty("终点里程")
private BigDecimal endMileage;
@ApiModelProperty("共通字段1(根据字段type来赋值)")
private String numOne;
@ApiModelProperty("共通字段2(根据字段type来赋值)")
private String numTwo;
@ApiModelProperty("备注")
private String remark;
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RecordsMasterCorrWaveDTO.java 0 → 100644
View file @ 0d9027e1
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;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RecordsMasterCorrWaveInfoDTO.java 0 → 100644
View file @ 0d9027e1
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;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/RecordsMasterCheck.java
View file @ 0d9027e1
......@@ -3,6 +3,7 @@ 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;
......@@ -15,6 +16,7 @@ import lombok.Setter;
import org.jeecg.modules.utils.ExcelExport;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* <p>
* 设备检查记录主表
......@@ -114,6 +116,14 @@ public class RecordsMasterCheck implements Serializable {
@ExcelExport(value = "终点里程", sort = 8)
private BigDecimal endMileage;
@ApiModelProperty("共通字段1(根据字段type来赋值)")
@TableField("num_one")
private String numOne;
@ApiModelProperty("共通字段2(根据字段type来赋值)")
@TableField("num_two")
private String numTwo;
@ApiModelProperty("备注")
@TableField("remark")
@ExcelExport(value = "备注", sort = 13)
......@@ -128,19 +138,19 @@ public class RecordsMasterCheck implements Serializable {
@TableField("check_time")
@JsonFormat(timezone = "GMT+8", 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;
@ApiModelProperty("审核人姓名")
@TableField("verify_by")
@ExcelExport(value = "审核人姓名",sort = 11)
@ExcelExport(value = "审核人姓名", sort = 11)
private String verifyBy;
@ApiModelProperty("审核时间")
@TableField("verify_time")
@JsonFormat(timezone = "GMT+8", 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;
@ApiModelProperty("是否删除（0：未删除；1：已删除）")
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/RecordsMasterCorrWave.java 0 → 100644
View file @ 0d9027e1
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;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/RecordsMasterCorrWaveInfo.java 0 → 100644
View file @ 0d9027e1
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;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/RecordsMasterCorrWaveInfoMapper.java 0 → 100644
View file @ 0d9027e1
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> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/RecordsMasterCorrWaveMapper.java 0 → 100644
View file @ 0d9027e1
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> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/RecordsMasterCorrWaveInfoMapper.xml 0 → 100644
View file @ 0d9027e1
<?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>
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/RecordsMasterCorrWaveMapper.xml 0 → 100644
View file @ 0d9027e1
<?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>
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/IRecordsMasterCorrWaveInfoService.java 0 → 100644
View file @ 0d9027e1
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> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/IRecordsMasterCorrWaveService.java 0 → 100644
View file @ 0d9027e1
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> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/RecordsMasterCorrWaveInfoServiceImpl.java 0 → 100644
View file @ 0d9027e1
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 {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/RecordsMasterCorrWaveServiceImpl.java 0 → 100644
View file @ 0d9027e1
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 {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordsMasterCheckVO.java
View file @ 0d9027e1
......@@ -77,6 +77,12 @@ public class RecordsMasterCheckVO {
@ApiModelProperty("终点里程")
private BigDecimal endMileage;
@ApiModelProperty("共通字段1(根据字段type来赋值)")
private String numOne;
@ApiModelProperty("共通字段2(根据字段type来赋值)")
private String numTwo;
@ApiModelProperty("备注")
private String remark;
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordsMasterCorrWaveInfoVO.java 0 → 100644
View file @ 0d9027e1
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;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordsMasterCorrWaveVO.java 0 → 100644
View file @ 0d9027e1
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