Merge branch 'dev-szl' into 'dev'

道岔使用情况检查数据类导入接口 -shizhilong

See merge request !47

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/UseTurnoutRecordCheckController.java

-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.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.jeecg.modules.utils.BeanCopyUtil;
-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")
-@Api(tags = "检查数据设备-设备检查记录数据-曲线磨耗情况检查")
-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 useTurnoutRecordId) {
-        UseTurnoutRecordCheckDetailVO data = this.service.getDetail(useTurnoutRecordId);
-        return Result.OK(data);
-    }
-
-}
-

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RecordsMasterTurnoutInfoDTO.java

@@ -128,4 +128,7 @@ public class RecordsMasterTurnoutInfoDTO {
 
     @ApiModelProperty("是否删除（0：未删除，1：已删除）")
     private String delFlag;
+
+    @ApiModelProperty("导入道岔顺序")
+    private Integer sort;
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/UseTurnoutRecordCheckDTO.java

-package org.jeecg.modules.checkData.equipmentCheckData.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-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 ekCode;
-
-    @ApiModelProperty("道岔编码")
-    private String turnoutCode;
-
-    @ApiModelProperty("开始时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date startTime;
-
-    @ApiModelProperty("结束时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date endTime;
-
-}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/RecordsMasterTurnoutInfo.java

@@ -61,7 +61,7 @@ public class RecordsMasterTurnoutInfo implements Serializable {
     @TableField("switch_code")
     private String switchCode;
 
-    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓）")
+    @ApiModelProperty("检查项目类型（1：轨距；2：水平；3：支距；4：轮缘槽；5：滑床板；6：顶铁；7：接头螺栓；8：护轨螺栓；9:道岔）")
     @TableField("type")
     private String type;
 
@@ -170,5 +170,8 @@ public class RecordsMasterTurnoutInfo implements Serializable {
     @TableField("del_flag")
     private String delFlag;
 
+    @ApiModelProperty("导入道岔顺序")
+    @TableField("sort")
+    private Integer sort;
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/UseTurnoutRecordCheck.java

-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("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 String geometricDimensions;
-
-    @ApiModelProperty("转辙器")
-    @TableField(value = "switch_part", typeHandler = FastjsonTypeHandler.class)
-    private String switchPart;
-
-    @ApiModelProperty("钢轨及其连接零件")
-    @TableField(value = "rail_and_conn_part", typeHandler = FastjsonTypeHandler.class)
-    private String railAndConnPart;
-
-    @ApiModelProperty("是否删除（0：未删除，1：已删除）")
-    @TableField("del_flag")
-    private String delFlag;
-
-
-}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/CurveWearRecordMapper.java

@@ -6,7 +6,6 @@ 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>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/RailWearRecordMapper.java

@@ -6,7 +6,6 @@ import org.jeecg.modules.checkData.equipmentCheckData.entity.RailWearRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordDetailVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordVO;
-import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
 
 /**
  * <p>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/UseTurnoutRecordCheckMapper.java

-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 org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
-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);
-
-    UseTurnoutRecordCheckDetailVO getDetail(String useTurnoutRecordId);
-}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/mapper/xml/UseTurnoutRecordCheckMapper.xml

-<?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
-            LEFT JOIN t_sn_light_rail t4 on t2.light_rail_id = t4.id
-            AND t3.light_rail_id = t4.id
-        WHERE t1.del_flag = '0'
-        <if test="dto.turnoutCode != null and dto.turnoutCode != ''">
-            AND t1.gauge_code like concat('%',#{dto.turnoutCode},'%')
-        </if>
-        <if test="dto.ekCode != null and dto.ekCode != ''">
-            AND t2.ek_code like concat('%',#{dto.ekCode},'%')
-        </if>
-        <if test="dto.startTime != null">
-            AND t2.check_time >= #{dto.startTime}
-        </if>
-        <if test="dto.endTime != null">
-            AND t2.check_time <![CDATA[  <=  ]]> #{dto.endTime}
-        </if>
-            AND t4.status = 1
-        GROUP BY t1.gauge_code
-    </select>
-    <select id="getDetail"
-            resultType="org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO">
-        SELECT
-            t1.*,
-            t2.byroad_pre_mileage,
-            t2.byroad_center_mileage,
-            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
-            LEFT JOIN t_da_switch_management t2 ON t1.switch_management_id = t2.id
-        WHERE t1.id =#{useTurnoutRecordId}
-    </select>
-</mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/IUseTurnoutRecordCheckService.java

-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.UseTurnoutRecordCheckDetailVO;
-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);
-
-    UseTurnoutRecordCheckDetailVO getDetail(String useTurnoutRecordId);
-}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/RailWearRecordServiceImpl.java

@@ -8,7 +8,6 @@ import org.jeecg.modules.checkData.equipmentCheckData.service.IRailWearRecordSer
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordDetailVO;
 import org.jeecg.modules.checkData.equipmentCheckData.vo.RailWearRecordVO;
-import org.jeecg.modules.checkData.equipmentCheckData.vo.UseTurnoutRecordCheckDetailVO;
 import org.springframework.stereotype.Service;
 
 /**

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/service/impl/UseTurnoutRecordCheckServiceImpl.java

-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.UseTurnoutRecordCheckDetailVO;
-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);
-    }
-
-    @Override
-    public UseTurnoutRecordCheckDetailVO getDetail(String useTurnoutRecordId) {
-        return this.baseMapper.getDetail(useTurnoutRecordId);
-    }
-}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordPatrolMasterAssistVO.java

 package org.jeecg.modules.checkData.equipmentCheckData.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordPatrolMasterInfoOneVO.java

 package org.jeecg.modules.checkData.equipmentCheckData.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordPatrolMasterInfoVO.java

 package org.jeecg.modules.checkData.equipmentCheckData.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordPatrolMasterVO.java

 package org.jeecg.modules.checkData.equipmentCheckData.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import org.jeecg.modules.utils.DicMap;
 import org.springframework.format.annotation.DateTimeFormat;
 

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordsMasterCheckVO.java

 package org.jeecg.modules.checkData.equipmentCheckData.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordsMasterTurnoutInfoVO.java

@@ -128,5 +128,7 @@ public class RecordsMasterTurnoutInfoVO {
     @ApiModelProperty("是否删除（0：未删除，1：已删除）")
     private String delFlag;
 
+    @ApiModelProperty("导入道岔顺序")
+    private Integer sort;
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/TrackBedManagementCheckVO.java

 package org.jeecg.modules.checkData.equipmentCheckData.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/TurnoutUseCheckVO.java

 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;

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/UseTurnoutRecordCheckDetailVO.java

-package org.jeecg.modules.checkData.equipmentCheckData.vo;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.math.BigDecimal;
-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;
-
-    @ApiModelProperty("检查日期")
-    private Date checkTime;
-
-    @ApiModelProperty("道岔编码")
-    private String turnoutCode;
-
-    @ApiModelProperty("几何尺寸")
-    private String geometricDimensions;
-
-    @ApiModelProperty("转辙器")
-    private String switchPart;
-
-    @ApiModelProperty("钢轨及其连接零件")
-    private String railAndConnPart;
-
-    @ApiModelProperty(value = "线别Id")
-    private String lineAliasId;
-
-    @ApiModelProperty(value = "线别名称")
-    private String lineAliasName;
-
-    @ApiModelProperty(value = "开向")
-    private String openTo;
-
-    @ApiModelProperty(value = "岔前/岔前里程")
-    private BigDecimal byroadPreMileage;
-
-    @ApiModelProperty(value = "岔心里程")
-    private BigDecimal byroadCenterMileage;
-
-    @ApiModelProperty(value = "岔前/岔后里程")
-    private BigDecimal byroadEndMileage;
-
-    @ApiModelProperty(value = "道岔型号")
-    private String switchModel;
-}

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/UseTurnoutRecordCheckVO.java

-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;
-}