Commit 6f927bee authored by hkl's avatar hkl

feat:1.检查数据-动静态几何尺寸数据-轨检仪静态检查数据

parent d4767a76
......@@ -25,11 +25,13 @@ public class CodeGenerate {
String outputDir = projectPath + "\\jeecg-module-system\\src\\main\\java\\";
// 模块名
String moduleName = "checkData.equipmentCheckData";
String moduleName = "checkData.dynamicStaticGeometricData";
// 表名
String[] tables = {
"t_ek_curve_wear_record",
"t_dsg_rail_inspection_equipment",
"t_dsg_rail_inspection_equipment_item",
"t_dsg_rail_inspection_equipment_item_detail",
};
......@@ -58,7 +60,7 @@ public class CodeGenerate {
// 设置过滤前缀
.strategyConfig(builder -> {
builder.addInclude(tables) // 设置需要生成的表名
.addTablePrefix("t_sn", "t_da","t_ek","t_xd"); // 设置过滤表前缀
.addTablePrefix("t_sn", "t_da","t_ek","t_xd","t_dsg"); // 设置过滤表前缀
// entity实体策略
builder.entityBuilder()
......
package org.jeecg.modules.checkData.dynamicStaticGeometricData.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipment;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentService;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-16
*/
@RestController
@RequestMapping("/checkData/dynamicStaticGeometricData/railInspectionEquipment")
public class RailInspectionEquipmentController extends JeecgController<RailInspectionEquipment, IRailInspectionEquipmentService> {
@AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
@ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<RailInspectionEquipmentVO>> queryPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
RailInspectionEquipmentDTO dto) {
Page<RailInspectionEquipmentVO> 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 RailInspectionEquipment railInspectionEquipment) {
this.service.edit(railInspectionEquipment);
return Result.OK("编辑成功!");
}
@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("删除成功!");
}
@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("批量删除成功!");
}
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentItemService;
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 org.jeecg.common.system.base.controller.JeecgController;
import java.util.List;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-16
*/
@RestController
@RequestMapping("/checkData/dynamicStaticGeometricData/railInspectionEquipmentItem")
public class RailInspectionEquipmentItemController extends JeecgController<RailInspectionEquipmentItem, IRailInspectionEquipmentItemService> {
@AutoLog(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
@ApiOperation(value = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询", notes = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-分页列表查询")
@GetMapping(value = "/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "railInspectionEquipmentId", value = "轨检仪静态检查数据id")
})
public Result<List<RailInspectionEquipmentItemVO>> queryList(String railInspectionEquipmentId) {
List<RailInspectionEquipmentItemVO> record = this.service.queryList(railInspectionEquipmentId);
return Result.OK(record);
}
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.dto;
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 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-16
*/
@Data
@ApiModel(value = "RailInspectionEquipment对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据")
public class RailInspectionEquipmentDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("检查批次编号")
private String ekCode;
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.dto;
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 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-16
*/
@Data
@ApiModel(value = "RailInspectionEquipmentItem对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目")
public class RailInspectionEquipmentItemDTO {
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("动静态几何尺寸数据主表主键-》外键")
private String movementMasterId;
@ApiModelProperty("检查起始里程(m)")
private BigDecimal courseStartingMileage;
@ApiModelProperty("检查终点里程(m)")
private BigDecimal courseEndMileage;
@ApiModelProperty("曲线半径(m)")
private BigDecimal curveRadius;
@ApiModelProperty("超高(mm)")
private BigDecimal superHigh;
@ApiModelProperty("加宽(mm)")
private BigDecimal widen;
@ApiModelProperty("顺坡率(‰)")
private BigDecimal slopeRatio;
@ApiModelProperty("长度(m)")
private BigDecimal longExtent;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是否删除(0:未删除;1:已删除)")
private String delFlag;
@ApiModelProperty("导入排序")
private Integer sort;
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.dto;
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 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-16
*/
@Data
@ApiModel(value = "RailInspectionEquipmentItemDetail对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表")
public class RailInspectionEquipmentItemDetailDTO {
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 railInspectionEquipmentId;
@ApiModelProperty("轨检仪静态检查数据检查项id")
private String railInspectionEquipmentItemId;
@ApiModelProperty("轨号")
private String trackCode;
@ApiModelProperty("测点")
private Integer measurePoint;
@ApiModelProperty("轨距")
private String trackGauge;
@ApiModelProperty("水平")
private String level;
@ApiModelProperty("三角坑")
private String triangularPit;
@ApiModelProperty("方向")
private String direction;
@ApiModelProperty("高低")
private String height;
@ApiModelProperty("结构")
private String structure;
@ApiModelProperty("整改")
private String rectification;
@ApiModelProperty("是否删除(0:未删除;1:已删除)")
private String delFlag;
@ApiModelProperty("排序字段")
private Integer infoSort;
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据
* </p>
*
* @author hkl
* @since 2023-07-16
*/
@Getter
@Setter
@TableName("t_dsg_rail_inspection_equipment")
@ApiModel(value = "RailInspectionEquipment对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据")
public class RailInspectionEquipment 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("动态几何尺寸类型(1:人工静态检查;2:轨检仪静态检查)")
@TableField("type")
private String type;
@ApiModelProperty("检查批次编号")
@TableField("ek_code")
private String ekCode;
@ApiModelProperty("工单编号")
@TableField("work_code")
private String workCode;
@ApiModelProperty("检查区间id")
@TableField("subway_section_id")
private String subwaySectionId;
@ApiModelProperty("检查区间名称")
@TableField("subway_section_name")
private String subwaySectionName;
@ApiModelProperty("所属线路id")
@TableField("light_rail_id")
private String lightRailId;
@ApiModelProperty("所属线路名称")
@TableField("light_rail_name")
private String lightRailName;
@ApiModelProperty("所属线别id")
@TableField("line_alias_id")
private String lineAliasId;
@ApiModelProperty("所属线别名称")
@TableField("line_alias_name")
private String lineAliasName;
@ApiModelProperty("起始里程")
@TableField("starting_mileage")
private BigDecimal startingMileage;
@ApiModelProperty("终点里程")
@TableField("end_mileage")
private BigDecimal endMileage;
@ApiModelProperty("钢轨单元数量")
@TableField("rail_num")
private Integer railNum;
@ApiModelProperty("曲线数量")
@TableField("curve_num")
private Integer curveNum;
@ApiModelProperty("竖曲线数量")
@TableField("vertical_curve_num")
private Integer verticalCurveNum;
@ApiModelProperty("道岔数量")
@TableField("switch_num")
private Integer switchNum;
@ApiModelProperty("检查人姓名")
@TableField("check_by")
private String checkBy;
@ApiModelProperty("检查日期")
@TableField("check_time")
private Date checkTime;
@ApiModelProperty("审核人姓名")
@TableField("verify_by")
private String verifyBy;
@ApiModelProperty("审核时间")
@TableField("verify_time")
private Date verifyTime;
@ApiModelProperty("备注")
@TableField("remark")
private String remark;
@ApiModelProperty("是否删除(0:未删除;1:已删除)")
@TableField("del_flag")
private String delFlag;
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目
* </p>
*
* @author hkl
* @since 2023-07-16
*/
@Getter
@Setter
@TableName("t_dsg_rail_inspection_equipment_item")
@ApiModel(value = "RailInspectionEquipmentItem对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目")
public class RailInspectionEquipmentItem 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("rail_inspection_equipment_id")
private String railInspectionEquipmentId;
@ApiModelProperty("检查起始里程(m)")
@TableField("course_starting_mileage")
private BigDecimal courseStartingMileage;
@ApiModelProperty("检查终点里程(m)")
@TableField("course_end_mileage")
private BigDecimal courseEndMileage;
@ApiModelProperty("曲线半径(m)")
@TableField("curve_radius")
private BigDecimal curveRadius;
@ApiModelProperty("超高(mm)")
@TableField("super_high")
private BigDecimal superHigh;
@ApiModelProperty("加宽(mm)")
@TableField("widen")
private BigDecimal widen;
@ApiModelProperty("顺坡率(‰)")
@TableField("slope_ratio")
private BigDecimal slopeRatio;
@ApiModelProperty("长度(m)")
@TableField("long_extent")
private BigDecimal longExtent;
@ApiModelProperty("备注")
@TableField("remark")
private String remark;
@ApiModelProperty("是否删除(0:未删除;1:已删除)")
@TableField("del_flag")
private String delFlag;
@ApiModelProperty("导入排序")
@TableField("sort")
private Integer sort;
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表
* </p>
*
* @author hkl
* @since 2023-07-16
*/
@Getter
@Setter
@TableName("t_dsg_rail_inspection_equipment_item_detail")
@ApiModel(value = "RailInspectionEquipmentItemDetail对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表")
public class RailInspectionEquipmentItemDetail 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("rail_inspection_equipment_id")
private String railInspectionEquipmentId;
@ApiModelProperty("轨检仪静态检查数据检查项id")
@TableField("rail_inspection_equipment_item_id")
private String railInspectionEquipmentItemId;
@ApiModelProperty("轨号")
@TableField("track_code")
private String trackCode;
@ApiModelProperty("测点")
@TableField("measure_point")
private Integer measurePoint;
@ApiModelProperty("轨距")
@TableField("track_gauge")
private String trackGauge;
@ApiModelProperty("水平")
@TableField("level")
private String level;
@ApiModelProperty("三角坑")
@TableField("triangular_pit")
private String triangularPit;
@ApiModelProperty("方向")
@TableField("direction")
private String direction;
@ApiModelProperty("高低")
@TableField("height")
private String height;
@ApiModelProperty("结构")
@TableField("structure")
private String structure;
@ApiModelProperty("整改")
@TableField("rectification")
private String rectification;
@ApiModelProperty("是否删除(0:未删除;1:已删除)")
@TableField("del_flag")
private String delFlag;
@ApiModelProperty("排序字段")
@TableField("info_sort")
private Integer infoSort;
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-07-16
*/
public interface RailInspectionEquipmentItemDetailMapper extends BaseMapper<RailInspectionEquipmentItemDetail> {
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
import java.util.List;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-07-16
*/
public interface RailInspectionEquipmentItemMapper extends BaseMapper<RailInspectionEquipmentItem> {
List<RailInspectionEquipmentItemVO> queryList(String railInspectionEquipmentId);
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-07-16
*/
public interface RailInspectionEquipmentMapper extends BaseMapper<RailInspectionEquipment> {
Page<RailInspectionEquipmentVO> queryPageList(Page<RailInspectionEquipmentVO> pageData, RailInspectionEquipmentDTO dto);
}
<?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.dynamicStaticGeometricData.mapper.RailInspectionEquipmentItemDetailMapper">
</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.dynamicStaticGeometricData.mapper.RailInspectionEquipmentItemMapper">
<select id="queryList"
resultType="org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO">
SELECT
t1.id,
t1.create_by,
t1.create_time,
t1.update_by,
t1.update_time,
t1.rail_inspection_equipment_id,
t1.course_starting_mileage,
t1.course_end_mileage,
t1.curve_radius,
t1.super_high,
t1.widen,
t1.slope_ratio,
t1.long_extent,
t1.remark,
t1.del_flag,
t1.sort
FROM
t_dsg_rail_inspection_equipment_item t1
WHERE
t1.del_flag = '0'
AND t1.rail_inspection_equipment_id = #{railInspectionEquipmentId}
</select>
</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.dynamicStaticGeometricData.mapper.RailInspectionEquipmentMapper">
<select id="queryPageList"
resultType="org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO">
SELECT
t1.id,
t1.create_by,
t1.create_time,
t1.update_by,
t1.update_time,
t1.type,
t1.ek_code,
t1.work_code,
t1.subway_section_id,
t1.subway_section_name,
t1.light_rail_id,
t1.light_rail_name,
t1.line_alias_id,
t1.line_alias_name,
t1.starting_mileage,
t1.end_mileage,
t1.rail_num,
t1.curve_num,
t1.vertical_curve_num,
t1.switch_num,
t1.check_by,
t1.check_time,
t1.verify_by,
t1.verify_time,
t1.remark,
t1.del_flag
FROM t_dsg_rail_inspection_equipment t1
WHERE t1.del_flag = '0'
<if test="dto.ekCode != null and dto.ekCode != ''">
AND t1.ek_code like concat('%',#{dto.ekCode},'%')
</if>
<if test="dto.subwaySectionId != null and dto.subwaySectionId != ''">
AND t1.subway_section_id = #{dto.subwaySectionId}
</if>
<if test="dto.lightRailId != null and dto.lightRailId != ''">
AND t1.light_rail_id = #{dto.lightRailId}
</if>
<if test="dto.lineAliasId != null and dto.lineAliasId != ''">
AND t1.line_alias_id = #{dto.lineAliasId}
</if>
order by t1.create_time desc
</select>
</mapper>
package org.jeecg.modules.checkData.dynamicStaticGeometricData.service;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetail;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表 服务类
* </p>
*
* @author hkl
* @since 2023-07-16
*/
public interface IRailInspectionEquipmentItemDetailService extends IService<RailInspectionEquipmentItemDetail> {
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.service;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
import java.util.List;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目 服务类
* </p>
*
* @author hkl
* @since 2023-07-16
*/
public interface IRailInspectionEquipmentItemService extends IService<RailInspectionEquipmentItem> {
List<RailInspectionEquipmentItemVO> queryList(String railInspectionEquipmentId);
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipment;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据 服务类
* </p>
*
* @author hkl
* @since 2023-07-16
*/
public interface IRailInspectionEquipmentService extends IService<RailInspectionEquipment> {
Page<RailInspectionEquipmentVO> queryPageList(Page<RailInspectionEquipmentVO> pageData, RailInspectionEquipmentDTO dto);
void edit(RailInspectionEquipment railInspectionEquipment);
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.service.impl;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemDetail;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper.RailInspectionEquipmentItemDetailMapper;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentItemDetailService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表 服务实现类
* </p>
*
* @author hkl
* @since 2023-07-16
*/
@Service
public class RailInspectionEquipmentItemDetailServiceImpl extends ServiceImpl<RailInspectionEquipmentItemDetailMapper, RailInspectionEquipmentItemDetail> implements IRailInspectionEquipmentItemDetailService {
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.service.impl;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItem;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentItemVO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper.RailInspectionEquipmentItemMapper;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目 服务实现类
* </p>
*
* @author hkl
* @since 2023-07-16
*/
@Service
public class RailInspectionEquipmentItemServiceImpl extends ServiceImpl<RailInspectionEquipmentItemMapper, RailInspectionEquipmentItem> implements IRailInspectionEquipmentItemService {
@Override
public List<RailInspectionEquipmentItemVO> queryList(String railInspectionEquipmentId) {
return this.baseMapper.queryList(railInspectionEquipmentId);
}
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.dto.RailInspectionEquipmentDTO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipment;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.entity.RailInspectionEquipmentVO;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.mapper.RailInspectionEquipmentMapper;
import org.jeecg.modules.checkData.dynamicStaticGeometricData.service.IRailInspectionEquipmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据 服务实现类
* </p>
*
* @author hkl
* @since 2023-07-16
*/
@Service
public class RailInspectionEquipmentServiceImpl extends ServiceImpl<RailInspectionEquipmentMapper, RailInspectionEquipment> implements IRailInspectionEquipmentService {
@Override
public Page<RailInspectionEquipmentVO> queryPageList(Page<RailInspectionEquipmentVO> pageData, RailInspectionEquipmentDTO dto) {
return this.baseMapper.queryPageList(pageData, dto);
}
@Override
public void edit(RailInspectionEquipment railInspectionEquipment) {
if (ObjectUtil.isEmpty(railInspectionEquipment.getId())) {
this.save(railInspectionEquipment);
} else {
this.updateById(railInspectionEquipment);
}
}
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表
* </p>
*
* @author hkl
* @since 2023-07-16
*/
@Getter
@Setter
@ApiModel(value = "RailInspectionEquipmentItemDetail对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目-明细表")
public class RailInspectionEquipmentItemDetailVO {
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 railInspectionEquipmentId;
@ApiModelProperty("轨检仪静态检查数据检查项id")
private String railInspectionEquipmentItemId;
@ApiModelProperty("轨号")
private String trackCode;
@ApiModelProperty("测点")
private Integer measurePoint;
@ApiModelProperty("轨距")
private String trackGauge;
@ApiModelProperty("水平")
private String level;
@ApiModelProperty("三角坑")
private String triangularPit;
@ApiModelProperty("方向")
private String direction;
@ApiModelProperty("高低")
private String height;
@ApiModelProperty("结构")
private String structure;
@ApiModelProperty("整改")
private String rectification;
@ApiModelProperty("是否删除(0:未删除;1:已删除)")
private String delFlag;
@ApiModelProperty("排序字段")
private Integer infoSort;
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.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 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-16
*/
@Data
@ApiModel(value = "RailInspectionEquipmentItemVO对象", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据-检查项目")
public class RailInspectionEquipmentItemVO {
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 railInspectionEquipmentId;
@ApiModelProperty("检查起始里程(m)")
private BigDecimal courseStartingMileage;
@ApiModelProperty("检查终点里程(m)")
private BigDecimal courseEndMileage;
@ApiModelProperty("曲线半径(m)")
private BigDecimal curveRadius;
@ApiModelProperty("超高(mm)")
private BigDecimal superHigh;
@ApiModelProperty("加宽(mm)")
private BigDecimal widen;
@ApiModelProperty("顺坡率(‰)")
private BigDecimal slopeRatio;
@ApiModelProperty("长度(m)")
private BigDecimal longExtent;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是否删除(0:未删除;1:已删除)")
private String delFlag;
@ApiModelProperty("导入排序")
private Integer sort;
}
package org.jeecg.modules.checkData.dynamicStaticGeometricData.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 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-16
*/
@Data
@ApiModel(value = "RailInspectionEquipmentVO", description = "检查数据-动静态几何尺寸数据-轨检仪静态检查数据")
public class RailInspectionEquipmentVO {
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("动静态几何尺寸数据主表主键-》外键")
private String movementMasterId;
@ApiModelProperty("检查起始里程(m)")
private BigDecimal courseStartingMileage;
@ApiModelProperty("检查终点里程(m)")
private BigDecimal courseEndMileage;
@ApiModelProperty("曲线半径(m)")
private BigDecimal curveRadius;
@ApiModelProperty("超高(mm)")
private BigDecimal superHigh;
@ApiModelProperty("加宽(mm)")
private BigDecimal widen;
@ApiModelProperty("顺坡率(‰)")
private BigDecimal slopeRatio;
@ApiModelProperty("长度(m)")
private BigDecimal longExtent;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是否删除(0:未删除;1:已删除)")
private String delFlag;
@ApiModelProperty("导入排序")
private Integer sort;
}
......@@ -54,12 +54,6 @@ public class RailManagementController extends JeecgController<RailManagement, IR
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "资产管理-钢轨管理-通过id删除")
@ApiOperation(value = "资产管理-钢轨管理-通过id删除", notes = "资产管理-钢轨管理-通过id删除")
@GetMapping(value = "/delete")
......@@ -68,12 +62,6 @@ public class RailManagementController extends JeecgController<RailManagement, IR
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "资产管理-钢轨管理-批量删除")
@ApiOperation(value = "资产管理-钢轨管理-批量删除", notes = "资产管理-钢轨管理-批量删除")
@GetMapping(value = "/deleteBatch")
......@@ -81,4 +69,14 @@ public class RailManagementController extends JeecgController<RailManagement, IR
this.service.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@AutoLog(value = "资产管理-钢轨管理-智能生成")
@ApiOperation(value = "资产管理-钢轨管理-智能生成", notes = "资产管理-钢轨管理-智能生成")
@GetMapping(value = "/intelligentGeneration")
public Result<String> intelligentGeneration(@RequestParam(name = "ids", required = true) String ids) {
this.service.intelligentGeneration();
return Result.OK("生成成功");
}
}
......@@ -19,4 +19,6 @@ public interface IRailManagementService extends IService<RailManagement> {
Page<RailManagementVO> queryPageList(Page<RailManagementVO> pageData, RailManagementDTO dto);
void edit(RailManagement railManagement);
void intelligentGeneration();
}
......@@ -38,4 +38,9 @@ public class RailManagementServiceImpl extends ServiceImpl<RailManagementMapper,
this.updateById(railManagement);
}
}
@Override
public void intelligentGeneration() {
throw new NullPointerException();
}
}
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