Commit 989a7497 authored by hkl's avatar hkl

feat:1.道岔使用情况检查业务

parent 4a519ec2
......@@ -29,9 +29,8 @@ public class CodeGenerate {
// 表名
String[] tables = {
"t_xd_record_patrol_master",
"t_xd_record_patrol__master_assist",
"t_xd_record_patrol_master_info",
"t_ek_use_turnout_record_check",
};
......
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.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.checkData.equipmentCheckData.dto.UseTurnoutRecordCheckDTO;
import org.jeecg.modules.checkData.equipmentCheckData.entity.UseTurnoutRecordCheck;
import org.jeecg.modules.checkData.equipmentCheckData.service.IUseTurnoutRecordCheckService;
import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO;
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.*;
/**
* <p>
* 检查数据设备-检查记录数据-道岔使用情况检查数据 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@RestController
@RequestMapping("/checkData/equipmentCheckData/useTurnoutRecordCheck")
public class UseTurnoutRecordCheckController extends JeecgController<UseTurnoutRecordCheck, IUseTurnoutRecordCheckService> {
@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,
UseTurnoutRecordCheckDTO dto) {
Page<UseTurnoutRecordCheckVO> 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 = "/getTurnoutCodeList")
public Result<List<Map<String, Object>>> getTurnoutCodeList(@ApiParam("设备检查记录主表id") String recordsMasterCheckId) {
List<UseTurnoutRecordCheck> records = this.service.lambdaQuery()
.eq(UseTurnoutRecordCheck::getRecordsMasterCheckId, recordsMasterCheckId)
.list();
List<Map<String, Object>> list = new ArrayList<>();
for (UseTurnoutRecordCheck useTurnoutRecordCheck : records) {
Map<String, Object> map = new HashMap<>();
map.put("label", useTurnoutRecordCheck.getTurnoutCode());
map.put("value", useTurnoutRecordCheck.getId());
list.add(map);
}
return Result.OK(list);
}
@AutoLog(value = "检查数据设备-检查记录数据-道岔检查详情页")
@ApiOperation(value = "检查数据设备-检查记录数据-道岔检查详情页", notes = "检查数据设备-检查记录数据-道岔检查详情页")
@GetMapping(value = "/getDetail")
public Result<UseTurnoutRecordCheckDetailVO> getDetail(@ApiParam("设备检查记录主表id") String id) {
UseTurnoutRecordCheckDetailVO data = new UseTurnoutRecordCheckDetailVO();
return Result.OK(data);
}
}
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
*/
@Data
@ApiModel(value = "UseTurnoutRecordCheckDTO对象", description = "检查数据设备-检查记录数据-道岔使用情况检查数据")
public class UseTurnoutRecordCheckDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("道岔编码")
private String turnoutCode;
}
package org.jeecg.modules.checkData.equipmentCheckData.entity;
import com.alibaba.fastjson.JSONObject;
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.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 检查数据设备-检查记录数据-道岔使用情况检查数据
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@Getter
@Setter
@TableName("t_ek_use_turnout_record_check")
@ApiModel(value = "UseTurnoutRecordCheck对象", description = "检查数据设备-检查记录数据-道岔使用情况检查数据")
public class UseTurnoutRecordCheck 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("道岔id")
@TableField("switch_management_id")
private String switchManagementId;
@ApiModelProperty("车站id")
@TableField("train_station_id")
private String trainStationId;
@ApiModelProperty("检查日期")
@TableField("check_time")
private Date checkTime;
@ApiModelProperty("道岔编码")
@TableField("turnout_code")
private String turnoutCode;
@ApiModelProperty("几何尺寸")
@TableField(value = "geometric_dimensions", typeHandler = FastjsonTypeHandler.class)
private JSONObject geometricDimensions;
@ApiModelProperty("转辙器")
@TableField(value = "switch_part", typeHandler = FastjsonTypeHandler.class)
private JSONObject switchPart;
@ApiModelProperty("钢轨及其连接零件")
@TableField(value = "rail_and_conn_part", typeHandler = FastjsonTypeHandler.class)
private String railAndConnPart;
@ApiModelProperty("是否删除(0:未删除,1:已删除)")
@TableField("del_flag")
private String delFlag;
}
package org.jeecg.modules.checkData.equipmentCheckData.mapper;
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.UseTurnoutRecordCheckVO;
/**
* <p>
* 检查数据设备-检查记录数据-道岔使用情况检查数据 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-07-09
*/
public interface UseTurnoutRecordCheckMapper extends BaseMapper<UseTurnoutRecordCheck> {
Page<UseTurnoutRecordCheckVO> queryPageList(Page<UseTurnoutRecordCheckVO> pageData, UseTurnoutRecordCheckDTO 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.equipmentCheckData.mapper.UseTurnoutRecordCheckMapper">
<select id="queryPageList"
resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO">
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.gauge_code,
COUNT(1) turnout_num,
t3.station_name,
t2.remark
FROM
t_ek_use_turnout_record_check t1
LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id and t2.del_flag = '0'
LEFT JOIN t_sn_train_station t3 ON t1.station_id = t3.id
WHERE t1.del_flag = '0'
<if test="dto.turnoutCode != null and dto.turnoutCode != ''">
AND t1.gauge_code like concat('%',#{dto.turnoutCode},'%')
</if>
GROUP BY t1.gauge_code
</select>
</mapper>
package org.jeecg.modules.checkData.equipmentCheckData.service;
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.extension.service.IService;
import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO;
/**
* <p>
* 检查数据设备-检查记录数据-道岔使用情况检查数据 服务类
* </p>
*
* @author hkl
* @since 2023-07-09
*/
public interface IUseTurnoutRecordCheckService extends IService<UseTurnoutRecordCheck> {
Page<UseTurnoutRecordCheckVO> queryPageList(Page<UseTurnoutRecordCheckVO> pageData, UseTurnoutRecordCheckDTO dto);
}
package org.jeecg.modules.checkData.equipmentCheckData.service.impl;
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 org.jeecg.modules.checkData.equipmentCheckData.mapper.UseTurnoutRecordCheckMapper;
import org.jeecg.modules.checkData.equipmentCheckData.service.IUseTurnoutRecordCheckService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckVO;
import org.springframework.stereotype.Service;
/**
* <p>
* 检查数据设备-检查记录数据-道岔使用情况检查数据 服务实现类
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@Service
public class UseTurnoutRecordCheckServiceImpl extends ServiceImpl<UseTurnoutRecordCheckMapper, UseTurnoutRecordCheck> implements IUseTurnoutRecordCheckService {
@Override
public Page<UseTurnoutRecordCheckVO> queryPageList(Page<UseTurnoutRecordCheckVO> pageData, UseTurnoutRecordCheckDTO dto) {
return this.baseMapper.queryPageList(pageData,dto);
}
}
{
"trackGauge": {
"checkName": "轨距",
"row1Title":"前顺破终点s1",
"row1Value":"",
"row2Title":"尖轨尖端处s2",
"row2Value":"",
"row3Title":"尖轨中直s3",
"row3Value":"",
"row4Title":"尖轨中曲s3",
"row4Value":"",
"row5Title":"尖轨跟端直s5",
"row5Value":"",
"row6Title":"尖轨跟端曲s4",
"row6Value":"",
"row7Title":"直线前s6",
"row7Value":"",
"row8Title":"直线中s9",
"row8Value":"",
"row9Title":"直线后s10",
"row9Value":"",
"row10Title":"导曲线前s7",
"row10Value":"",
"row11Title":"导曲线中s8",
"row11Value":"",
"row12Title":"导曲线后s11",
"row12Value":"",
"row13Title":"叉心前直s17",
"row13Value":"",
"row14Title":"叉心前曲s12",
"row14Value":"",
"row15Title":"叉心中直s16",
"row15Value":"",
"row16Title":"叉心中曲s13",
"row16Value":"",
"row17Title":"叉心后直s15",
"row17Value":"",
"row18Title":"叉心后曲s14",
"row18Value":"",
"row19Title":"查照间隔直93",
"row19Value":"",
"row20Title":"查照间隔曲92",
"row20Value":"",
"row21Title":"互背距离直46",
"row21Value":"",
"row22Title":"互背距离曲46",
"row22Value":""
},
"horizontal": {
"checkName": "水平",
"row1Title":"前顺破终点s1",
"row1Value":"",
"row2Title":"尖轨尖端处s2",
"row2Value":"",
"row3Title":"尖轨中直s3",
"row3Value":"",
"row4Title":"尖轨中曲s3",
"row4Value":"",
"row5Title":"尖轨跟端直s5",
"row5Value":"",
"row6Title":"尖轨跟端曲s4",
"row6Value":"",
"row7Title":"直线前s6",
"row7Value":"",
"row8Title":"直线中s9",
"row8Value":"",
"row9Title":"直线后s10",
"row9Value":"",
"row10Title":"导曲线前s7",
"row10Value":"",
"row11Title":"导曲线中s8",
"row11Value":"",
"row12Title":"导曲线后s11",
"row12Value":"",
"row13Title":"叉心前直s17",
"row13Value":"",
"row14Title":"叉心前曲s12",
"row14Value":"",
"row15Title":"叉心中直s16",
"row15Value":"",
"row16Title":"叉心中曲s13",
"row16Value":"",
"row17Title":"叉心后直s15",
"row17Value":"",
"row18Title":"叉心后曲s14",
"row18Value":"",
"row19Title":"查照间隔直93",
"row19Value":"",
"row20Title":"查照间隔曲92",
"row20Value":"",
"row21Title":"互背距离直46",
"row21Value":"",
"row22Title":"互背距离曲46",
"row22Value":""
},
"offsetDistance": {
"checkName": "支距",
"row1Title":"支距1z1",
"row1Value":"",
"row2Title":"支距2z2",
"row2Value":"",
"row3Title":"支距3z3",
"row3Value":"",
"row4Title":"支距4z4",
"row4Value":"",
"row5Title":"支距5z5",
"row5Value":"",
"row6Title":"支距6z6",
"row6Value":"",
"row7Title":"支距7z7",
"row7Value":""
},
"flange": {
"checkName": "轮缘槽",
"row1Title":"尖端开口C1直",
"row1Value":"",
"row2Title":"尖端开口C1曲",
"row2Value":"",
"row3Title":"尖端第一动程C2直",
"row3Value":"",
"row4Title":"尖端第一动程C2曲",
"row4Value":"",
"row5Title":"尖端第二动程C3直",
"row5Value":"",
"row6Title":"尖端第二动程C3曲",
"row6Value":"",
"row7Title":"护轨平直段轮缘槽C4直",
"row7Value":"",
"row8Title":"护轨平直段轮缘槽C4曲",
"row8Value":"",
"row9Title":"辙叉平直段轮缘槽C5直",
"row9Value":"",
"row10Title":"辙叉平直段轮缘槽C5曲",
"row10Value":""
}
}
\ No newline at end of file
[
{
"checkName": "滑床板",
"qualified": 1,
"notQualified": "",
"sort": 1
},
{
"checkName": "顶铁",
"qualified": 1,
"notQualified": "",
"sort": 2
}
]
\ No newline at end of file
[
{
"checkName": "接头螺栓",
"qualified": 1,
"notQualified": "",
"sort": 1
},
{
"checkName": "护轨螺栓",
"qualified": 1,
"notQualified": "",
"sort": 2
}
]
\ No newline at end of file
package org.jeecg.modules.checkData.equipmentCheckData.vo;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date;
/**
* <p>
* 检查数据设备-检查记录数据-道岔使用情况检查数据
* </p>
*
* @author hkl
* @since 2023-07-09
*/
@Data
@ApiModel(value = "UseTurnoutRecordCheck对象", description = "检查数据设备-检查记录数据-道岔使用情况检查数据")
public class UseTurnoutRecordCheckDetailVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@Excel(name = "检查批次编号", width = 15, orderNum = "1")
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("创建人")
private String createBy;
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("设备检查记录主表id")
private String recordsMasterCheckId;
@ApiModelProperty("道岔id")
private String switchManagementId;
@ApiModelProperty("检查日期")
private Date checkTime;
@ApiModelProperty("道岔编码")
private String turnoutCode;
@ApiModelProperty("几何尺寸")
private JSONObject geometricDimensions;
@ApiModelProperty("转辙器")
private JSONObject switchPart;
@ApiModelProperty("钢轨及其连接零件")
private JSONObject railAndConnPart;
}
package org.jeecg.modules.checkData.equipmentCheckData.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
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-07-09
*/
@Data
@ApiModel(value = "UseTurnoutRecordCheck对象", description = "检查数据设备-检查记录数据-道岔使用情况检查数据")
public class UseTurnoutRecordCheckVO {
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 turnoutNum;
@ApiModelProperty("备注")
private String remark;
}
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