Skip to content

H
hzsomms
Commit b970ea93 authored by hkl's avatar hkl
Browse files
Options

feat:1.检查数据-设备检查记录数据-曲线磨耗情况检查

parent 3e7af45b
Hide whitespace changes
Inline Side-by-side
Showing with 548 additions and 70 deletions
jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java
View file @ b970ea93
......@@ -29,7 +29,7 @@ public class CodeGenerate {
// 表名
String[] tables = {
"t_ek_rail_wear_record",
"t_ek_curve_wear_record",
};
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/CurveWearRecordController.java 0 → 100644
View file @ b970ea93
package org.jeecg.modules.checkData.equipmentCheckData.controller;
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 io.swagger.annotations.ApiParam;
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.checkData.equipmentCheckData.dto.CurveWearRecordDTO;
import org.jeecg.modules.checkData.equipmentCheckData.entity.CurveWearRecord;
import org.jeecg.modules.checkData.equipmentCheckData.service.ICurveWearRecordService;
import org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordDetailVO;
import org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 检查数据设备-设备检查记录数据-曲线磨耗情况检查 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@RestController
@RequestMapping("/checkData/equipmentCheckData/curveWearRecord")
@Api(tags = "检查数据设备-设备检查记录数据-曲线磨耗情况检查")
public class CurveWearRecordController extends JeecgController<CurveWearRecord, ICurveWearRecordService> {
@AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-分页列表查询")
@ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-分页列表查询", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<CurveWearRecordVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
CurveWearRecordDTO dto) {
Page<CurveWearRecordVO> pageData = new Page<>(pageNo, pageSize);
pageData = this.service.queryPageList(pageData, dto);
return Result.OK(pageData);
}
@AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取曲线编号List")
@ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取道岔编号List", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取道岔编号List")
@GetMapping(value = "/getCurveCodeList")
public Result<List<Map<String, Object>>> getCurveCodeList(@ApiParam("设备检查记录主表id") String recordsMasterCheckId) {
List<CurveWearRecord> records = this.service.lambdaQuery()
.eq(CurveWearRecord::getRecordsMasterCheckId, recordsMasterCheckId)
.list();
List<Map<String, Object>> list = new ArrayList<>();
for (CurveWearRecord curveWearRecord : records) {
Map<String, Object> map = new HashMap<>();
map.put("label", curveWearRecord.getCurveCode());
map.put("value", curveWearRecord.getId());
list.add(map);
}
return Result.OK(list);
}
@AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页")
@ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页")
@GetMapping(value = "/getDetail")
public Result<CurveWearRecordDetailVO> getDetail(@ApiParam("曲线磨损记录id") String curveWearRecordId) {
CurveWearRecordDetailVO data = this.service.getDetail(curveWearRecordId);
return Result.OK(data);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/UseTurnoutRecordCheckController.java
View file @ b970ea93
......@@ -25,7 +25,7 @@ import java.util.*;
/**
* <p>
* 检查数据设备-检查记录数据-道岔使用情况检查数据 前端控制器
* 检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔使用情况检查数据 前端控制器
* </p>
*
* @author hkl
......@@ -33,11 +33,11 @@ import java.util.*;
*/
@RestController
@RequestMapping("/checkData/equipmentCheckData/useTurnoutRecordCheck")
@Api(tags = "检查数据设备-检查记录数据")
@Api(tags = "检查数据设备-设备检查记录数据-曲线磨耗情况检查")
public class UseTurnoutRecordCheckController extends JeecgController<UseTurnoutRecordCheck, IUseTurnoutRecordCheckService> {
@AutoLog(value = "检查数据设备-检查记录数据-分页列表查询")
@ApiOperation(value = "检查数据设备-检查记录数据-分页列表查询", notes = "检查数据设备-检查记录数据-分页列表查询")
@AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-分页列表查询")
@ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-分页列表查询", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<UseTurnoutRecordCheckVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
......@@ -47,8 +47,8 @@ public class UseTurnoutRecordCheckController extends JeecgController<UseTurnoutR
return Result.OK(pageData);
}
@AutoLog(value = "检查数据设备-检查记录数据-获取道岔编号List")
@ApiOperation(value = "检查数据设备-检查记录数据-获取道岔编号List", notes = "检查数据设备-检查记录数据-获取道岔编号List")
@AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取道岔编号List")
@ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取道岔编号List", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-获取道岔编号List")
@GetMapping(value = "/getTurnoutCodeList")
public Result<List<Map<String, Object>>> getTurnoutCodeList(@ApiParam("设备检查记录主表id") String recordsMasterCheckId) {
List<UseTurnoutRecordCheck> records = this.service.lambdaQuery()
......@@ -66,8 +66,8 @@ public class UseTurnoutRecordCheckController extends JeecgController<UseTurnoutR
}
@AutoLog(value = "检查数据设备-检查记录数据-道岔检查详情页")
@ApiOperation(value = "检查数据设备-检查记录数据-道岔检查详情页", notes = "检查数据设备-检查记录数据-道岔检查详情页")
@AutoLog(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页")
@ApiOperation(value = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页", notes = "检查数据设备-设备检查记录数据-曲线磨耗情况检查-道岔检查详情页")
@GetMapping(value = "/getDetail")
public Result<UseTurnoutRecordCheckDetailVO> getDetail(@ApiParam("设备检查记录表id") String useTurnoutRecordId) {
UseTurnoutRecordCheckDetailVO data = this.service.getDetail(useTurnoutRecordId);
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/CurveWearRecordDTO.java 0 → 100644
View file @ b970ea93
package org.jeecg.modules.checkData.equipmentCheckData.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* <p>
* 检查数据设备-设备检查记录数据-曲线磨耗情况检查
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@Data
@ApiModel(value = "CurveWearRecordDTO对象", description = "检查数据设备-设备检查记录数据-曲线磨耗情况检查")
public class CurveWearRecordDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("曲线编码")
private String curveCode;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RailWearRecordDTO.java
View file @ b970ea93
......@@ -2,69 +2,28 @@ package org.jeecg.modules.checkData.equipmentCheckData.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
/**
* <p>
* 检查数据-设备检查记录数据-钢轨伤损情况检查表
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@Getter
@Setter
@ApiModel(value = "RailWearRecord对象", description = "检查数据-设备检查记录数据-钢轨伤损情况检查表")
* <p>
* 检查数据-设备检查记录数据-钢轨伤损情况检查表
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@Data
@ApiModel(value = "RailWearRecord对象", description = "检查数据-设备检查记录数据-钢轨伤损情况检查表")
public class RailWearRecordDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("设备检查记录主表id")
private String recordsMasterCheckId;
@ApiModelProperty("钢轨轨型")
@ApiModelProperty("钢轨轨型")
private String railType;
@ApiModelProperty("线别Id")
private String lineAliasId;
@ApiModelProperty("线别名称")
private String lineAliasName;
@ApiModelProperty("左股仪器编码")
private String leftFemoralApparatusCode;
@ApiModelProperty("左股仪器")
private String leftFemoralApparatus;
@ApiModelProperty("右股仪器编码")
private String rightFemoralApparatusCode;
@ApiModelProperty("右股仪器")
private String rightFemoralApparatus;
@ApiModelProperty("是否删除（0：未删除，1：已删除）")
private String delFlag;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/CurveWearRecord.java 0 → 100644
View file @ b970ea93
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
* 检查数据设备-设备检查记录数据-曲线磨耗情况检查
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@Data
@TableName("t_ek_curve_wear_record")
@ApiModel(value = "CurveWearRecord对象", description = "检查数据设备-设备检查记录数据-曲线磨耗情况检查")
public class CurveWearRecord 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")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("设备检查记录主表id")
@TableField("records_master_check_id")
private String recordsMasterCheckId;
@ApiModelProperty("检查日期")
@TableField("check_time")
private Date checkTime;
@ApiModelProperty("曲线编码")
@TableField("curve_code")
private String curveCode;
@ApiModelProperty("曲线半径")
@TableField("curve_radius")
private BigDecimal curveRadius;
@ApiModelProperty("曲线超高")
@TableField("curve_super_high")
private BigDecimal curveSuperHigh;
@ApiModelProperty("圆曲线长")
@TableField("curve_tangent_len")
private BigDecimal curveTangentLen;
@ApiModelProperty("缓和曲线长")
@TableField("transition_curve_high")
private BigDecimal transitionCurveHigh;
@ApiModelProperty("圆曲转向")
@TableField("curve_turn")
private String curveTurn;
@ApiModelProperty("检查人")
@TableField("check_by")
private String checkBy;
@ApiModelProperty("检查数据")
@TableField("check_data")
private String checkData;
@ApiModelProperty("是否删除（0：未删除，1：已删除）")
@TableField("del_flag")
private String delFlag;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/CurveWearRecordMapper.java 0 → 100644
View file @ b970ea93
package org.jeecg.modules.checkData.equipmentCheckData.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.checkData.equipmentCheckData.dto.CurveWearRecordDTO;
import org.jeecg.modules.checkData.equipmentCheckData.entity.CurveWearRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordDetailVO;
import org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordVO;
import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
/**
* <p>
* 检查数据设备-设备检查记录数据-曲线磨耗情况检查 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-07-09
*/
public interface CurveWearRecordMapper extends BaseMapper<CurveWearRecord> {
Page<CurveWearRecordVO> queryPageList(Page<CurveWearRecordVO> pageData, CurveWearRecordDTO dto);
CurveWearRecordDetailVO getDetail(String curveWearRecordId);
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/UseTurnoutRecordCheckMapper.java
View file @ b970ea93
package org.jeecg.modules.checkData.equipmentCheckData.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.checkData.equipmentCheckData.dto.UseTurnoutRecordCheckDTO;
import org.jeecg.modules.checkData.equipmentCheckData.entity.UseTurnoutRecordCheck;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO;
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/CurveWearRecordMapper.xml 0 → 100644
View file @ b970ea93
<?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.CurveWearRecordMapper">
<select id="queryPageList"
resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordVO">
SELECT
t2.id recordsMasterCheckId,
t2.ek_code,
t2.work_code,
t2.check_time,
t2.check_by,
t2.verify_by,
t2.verify_time,
t2.subway_section_id,
t2.subway_section_name,
t2.light_rail_id,
t2.light_rail_name,
t2.line_alias_id,
t2.line_alias_name,
t2.starting_mileage,
t2.end_mileage,
t1.curve_code,
COUNT(1) curve_num,
t2.remark
FROM
t_ek_curve_wear_record t1
LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id
WHERE t1.del_flag = '0'
GROUP BY t1.curve_code
</select>
<select id="getDetail"
resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordDetailVO">
SELECT
t1.*
FROM
t_ek_curve_wear_record t1
where t1.id = #{curveWearRecordId}
</select>
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/UseTurnoutRecordCheckMapper.xml
View file @ b970ea93
......@@ -43,6 +43,7 @@
t2.byroad_end_mileage,
t2.open_to,
t2.line_alias_id,
t2.switch_model,
(SELECT line_alias_name FROM t_sn_line_alias WHERE id = t2.line_alias_id limit 1) line_alias_name
FROM
t_ek_use_turnout_record_check t1
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/ICurveWearRecordService.java 0 → 100644
View file @ b970ea93
package org.jeecg.modules.checkData.equipmentCheckData.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.checkData.equipmentCheckData.dto.CurveWearRecordDTO;
import org.jeecg.modules.checkData.equipmentCheckData.entity.CurveWearRecord;
import org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordDetailVO;
import org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordVO;
/**
* <p>
* 检查数据设备-设备检查记录数据-曲线磨耗情况检查 服务类
* </p>
*
* @author hkl
* @since 2023-07-09
*/
public interface ICurveWearRecordService extends IService<CurveWearRecord> {
Page<CurveWearRecordVO> queryPageList(Page<CurveWearRecordVO> pageData, CurveWearRecordDTO dto);
CurveWearRecordDetailVO getDetail(String curveWearRecordId);
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/CurveWearRecordServiceImpl.java 0 → 100644
View file @ b970ea93
package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.checkData.equipmentCheckData.dto.CurveWearRecordDTO;
import org.jeecg.modules.checkData.equipmentCheckData.entity.CurveWearRecord;
import org.jeecg.modules.checkData.equipmentCheckData.mapper.CurveWearRecordMapper;
import org.jeecg.modules.checkData.equipmentCheckData.service.ICurveWearRecordService;
import org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordDetailVO;
import org.jeecg.modules.checkData.equipmentCheckData.vo.CurveWearRecordVO;
import org.springframework.stereotype.Service;
/**
* <p>
* 检查数据设备-设备检查记录数据-曲线磨耗情况检查 服务实现类
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@Service
public class CurveWearRecordServiceImpl extends ServiceImpl<CurveWearRecordMapper, CurveWearRecord> implements ICurveWearRecordService {
@Override
public Page<CurveWearRecordVO> queryPageList(Page<CurveWearRecordVO> pageData, CurveWearRecordDTO dto) {
return this.baseMapper.queryPageList(pageData,dto);
}
@Override
public CurveWearRecordDetailVO getDetail(String curveWearRecordId) {
return this.baseMapper.getDetail(curveWearRecordId);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/template/曲线磨耗检查详情-检查数据.json 0 → 100644
View file @ b970ea93
{
"name": "检查数据",
"vertical": {
"checkName": "垂直消磨",
"unit": "mm",
"2H": "",
"HY": "",
"QZ": "",
"YH": "",
"HZ": ""
},
"side": {
"checkName": "侧面消磨",
"unit": "mm",
"2H": "",
"HY": "",
"QZ": "",
"YH": "",
"HZ": ""
}
}
\ No newline at end of file
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/template/道岔使用情况检-几何尺寸.json
View file @ b970ea93
......@@ -41,9 +41,9 @@
"row19Value":"",
"row20Title":"查照间隔曲92",
"row20Value":"",
"row21Title":"互背距离直46",
"row21Title":"护背距离直46",
"row21Value":"",
"row22Title":"互背距离曲46",
"row22Title":"护背距离曲46",
"row22Value":""
},
"horizontal": {
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/CurveWearRecordDetailVO.java 0 → 100644
View file @ b970ea93
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-09
*/
@Data
@ApiModel(value = "CurveWearRecordDetailVO对象", description = "CurveWearRecordDetailVO对象")
public class CurveWearRecordDetailVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("设备检查记录主表id")
private String recordsMasterCheckId;
@ApiModelProperty("检查日期")
private Date checkTime;
@ApiModelProperty("曲线编码")
private String curveCode;
@ApiModelProperty("检查人")
private String checkBy;
@ApiModelProperty("检查数据")
private String checkData;
@ApiModelProperty("曲线半径")
private BigDecimal curveRadius;
@ApiModelProperty("曲线超高")
private BigDecimal curveSuperHigh;
@ApiModelProperty("圆曲线长")
private BigDecimal curveTangentLen;
@ApiModelProperty("缓和曲线长")
private BigDecimal transitionCurveHigh;
@ApiModelProperty("圆曲转向")
private String curveTurn;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/CurveWearRecordVO.java 0 → 100644
View file @ b970ea93
package org.jeecg.modules.checkData.equipmentCheckData.vo;
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-09
*/
@Data
@ApiModel(value = "CurveWearRecordVO对象", description = "检查数据设备-设备检查记录数据-曲线磨耗情况检查")
public class CurveWearRecordVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("设备检查记录主表id")
private String recordsMasterCheckId;
@ApiModelProperty("检查批次号")
private String ekCode;
@ApiModelProperty("工单编号")
private String workCode;
@ApiModelProperty("轨距水平尺编号")
private String gaugeCode;
@ApiModelProperty("检查区间id")
private String subwaySectionId;
@ApiModelProperty("检查区间名称")
private String subwaySectionName;
@ApiModelProperty("所属线路id")
private String lightRailId;
@ApiModelProperty("所属线路名称")
private String lightRailName;
@ApiModelProperty("所属线别id")
private String lineAliasId;
@ApiModelProperty("所属线别名称")
private String lineAliasName;
@ApiModelProperty("车站id")
private String stationId;
@ApiModelProperty("车站名称")
private String stationName;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("检查日期")
private Date checkTime;
@ApiModelProperty("检查人")
private String checkBy;
@ApiModelProperty("审核人姓名")
private String verifyBy;
@ApiModelProperty("审核时间")
private Date verifyTime;
@ApiModelProperty("起点里程")
private BigDecimal startingMileage;
@ApiModelProperty("终点里程")
private BigDecimal endMileage;
@ApiModelProperty("道岔数量")
private Integer curveNum;
@ApiModelProperty("道岔code")
private Integer curveCode;
@ApiModelProperty("备注")
private String remark;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/UseTurnoutRecordCheckDetailVO.java
View file @ b970ea93
......@@ -60,4 +60,7 @@ public class UseTurnoutRecordCheckDetailVO {
@ApiModelProperty(value = "岔前/岔后里程")
private BigDecimal byroadEndMileage;
@ApiModelProperty(value = "道岔型号")
private String switchModel;
}
jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/vo/CurveManagementQueryVO.java
View file @ b970ea93
......@@ -54,7 +54,6 @@ public class CurveManagementQueryVO implements Serializable {
@ApiModelProperty("曲线长L(m)")
private BigDecimal curveLen;
@ApiModelProperty("直缓（直圆）里程ZH(ZY)")
private BigDecimal curveMileageZh;
......
jeecg-module-system/src/main/resources/generator/dto.java.ftl
View file @ b970ea93
......@@ -3,7 +3,6 @@ package ${package.Entity};
<#list table.importPackages as pkg>
import ${pkg};
</#list>
import lombok.Data;
<#if swagger>
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -25,7 +24,11 @@ import lombok.Data;
* @since ${date}
*/
<#if entityLombokModel>
@Data
@Getter
@Setter
<#if chainModel>
@Accessors(chain = true)
</#if>
</#if>
<#if swagger>
@ApiModel(value = "${entity}对象", description = "${table.comment!}")
......
jeecg-module-system/src/main/resources/generator/vo.java.ftl
View file @ b970ea93
......@@ -3,7 +3,6 @@ package ${package.Entity};
<#list table.importPackages as pkg>
import ${pkg};
</#list>
import lombok.Data;
<#if swagger>
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -25,10 +24,14 @@ import lombok.Data;
* @since ${date}
*/
<#if entityLombokModel>
@Data
@Getter
@Setter
<#if chainModel>
@Accessors(chain = true)
</#if>
</#if>
<#if swagger>
@ApiModel(value = "${entity}VO对象", description = "${table.comment!}")
@ApiModel(value = "${entity}对象", description = "${table.comment!}")
</#if>
public class ${entity}VO {
......@@ -52,6 +55,26 @@ public class ${entity}VO {
*/
</#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
......
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