【CHG】修改地面磁感应器查询方法

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusDmcgyq.java

@@ -1,105 +1,108 @@
 package com.railway.business.baseinfo.domain;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+
 /**
  * 基础数据-地面磁感应器
+ *
  * @author zcf 2021-10-26
  */
 @Data
 @ApiModel("基础数据 - 地面磁感应器")
 @EqualsAndHashCode(callSuper = true)
-public class BusDmcgyq extends BaseEntity{
+public class BusDmcgyq extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
 
-    @ApiModelProperty(value = "主键", hidden = true)
-    private Long id;
+  @ApiModelProperty(value = "车间ID")
+  private Long deptId;
 
-    @ApiModelProperty(value = "车间ID")
-    private Long deptId;
+  @ApiModelProperty(value = "所属部门")
+  private String deptName;
 
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
+  @ApiModelProperty(value = "线别ID")
+  private Long lineId;
 
-    @ApiModelProperty(value = "线别ID")
-    private Long lineId;
+  @ApiModelProperty(value = "线别")
+  private String lineName;
 
-    @ApiModelProperty(value = "线别")
-    private String lineName;
+  @ApiModelProperty(value = "区间ID")
+  private Long stationId;
 
-    @ApiModelProperty(value = "区间ID")
-    private Long stationId;
+  @ApiModelProperty(value = "站/区间")
+  private String stationName;
 
-    @ApiModelProperty(value = "站/区间")
-    private String stationName;
+  @ApiModelProperty(value = "车间-区间站场关联id")
+  private Long deptStationId;
 
-    @ApiModelProperty(value = "车间-区间站场关联id")
-    private Long deptStationId;
+  @ApiModelProperty(value = "行别")
+  @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
+  private String xingbie;
 
-    @ApiModelProperty(value = "行别")
-    @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    private String xingbie;
+  @ApiModelProperty(value = "行别")
+  private String xingbieText;
 
-    @ApiModelProperty(value = "行别")
-    private String xingbieText;
+  @ApiModelProperty(value = "支柱范围")
+  @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+  private String pillarArea;
 
-    @ApiModelProperty(value = "支柱范围")
-    @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    private String pillarArea;
+  @ApiModelProperty(value = "股道")
+  @Length(max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
+  private String stationTrack;
 
-    @ApiModelProperty(value = "股道")
-    @Length(max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
-    private String stationTrack;
+  @ApiModelProperty(value = "管辖模式")
+  @Length(max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
+  private String gxms;
 
-    @ApiModelProperty(value = "管辖模式")
-    @Length(max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
-    private String gxms;
+  @ApiModelProperty(value = "分相处所")
+  @Length(max = 100, message = "【分相处所】长度必须介于 {min} 和 {max} 之间")
+  private String fxcs;
 
-    @ApiModelProperty(value = "分相处所")
-    @Length(max = 100, message = "【分相处所】长度必须介于 {min} 和 {max} 之间")
-    private String fxcs;
+  @ApiModelProperty(value = "分相名称")
+  @Length(min = 1, max = 100, message = "【分相名称】长度必须介于 {min} 和 {max} 之间")
+  private String fxmc;
 
-    @ApiModelProperty(value = "分相名称")
-    @Length(min = 1, max = 100, message = "【分相名称】长度必须介于 {min} 和 {max} 之间")
-    private String fxmc;
+  @ApiModelProperty(value = "锚段号")
+  @Length(max = 50, message = "【锚段号】长度必须介于 {min} 和 {max} 之间")
+  private String mdh;
 
-    @ApiModelProperty(value = "锚段号")
-    @Length(max = 50, message = "【锚段号】长度必须介于 {min} 和 {max} 之间")
-    private String mdh;
+  @ApiModelProperty(value = "设备编号")
+  @Length(min = 1, max = 50, message = "【设备编号】长度必须介于 {min} 和 {max} 之间")
+  private String sbbh;
 
-    @ApiModelProperty(value = "设备编号")
-    @Length(min = 1, max = 50, message = "【设备编号】长度必须介于 {min} 和 {max} 之间")
-    private String sbbh;
+  @ApiModelProperty(value = "轨枕类型")
+  @Length(max = 50, message = "【轨枕类型】长度必须介于 {min} 和 {max} 之间")
+  private String gzlx;
 
-    @ApiModelProperty(value = "轨枕类型")
-    @Length(max = 50, message = "【轨枕类型】长度必须介于 {min} 和 {max} 之间")
-    private String gzlx;
+  @ApiModelProperty(value = "磁枕里程")
+  private Double marker;
 
-    @ApiModelProperty(value = "磁枕里程")
-    @JsonProperty("marker")
-    private Double czlc;
+  @ApiModelProperty(value = "磁枕里程")
+  private Double czlc;
 
-    @ApiModelProperty(value = "分相中心里程")
-    private Double fxzxlc;
+  @ApiModelProperty(value = "分相中心里程")
+  private Double fxzxlc;
 
-    @ApiModelProperty(value = "生产厂家")
-    @Length(max = 100, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
-    private String sccj;
+  @ApiModelProperty(value = "生产厂家")
+  @Length(max = 100, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
+  private String sccj;
 
-    @ApiModelProperty(value = "型号")
-    @Length(max = 100, message = "【型号】长度必须介于 {min} 和 {max} 之间")
-    private String xh;
+  @ApiModelProperty(value = "型号")
+  @Length(max = 100, message = "【型号】长度必须介于 {min} 和 {max} 之间")
+  private String xh;
 
-    @ApiModelProperty(value = "del_flag")
-    @Length(max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    private String delFlag;
+  @ApiModelProperty(value = "del_flag")
+  @Length(max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
 
-    @ApiModelProperty(value = "数据编号")
-    @Length(max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
-    private String sjbh;
+  @ApiModelProperty(value = "数据编号")
+  @Length(max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
+  private String sjbh;
 
 }

railway-business/src/main/resources/mapper/baseinfo/BusDmcgyqMapper.xml

@@ -24,6 +24,7 @@
     <result column="sbbh" property="sbbh"/>
     <result column="gzlx" property="gzlx"/>
     <result column="czlc" property="czlc"/>
+    <result column="marker" property="marker"/>
     <result column="fxzxlc" property="fxzxlc"/>
     <result column="sccj" property="sccj"/>
     <result column="xh" property="xh"/>
@@ -56,6 +57,7 @@
     t.sbbh,
     t.gzlx,
     t.marker as czlc,
+    t.marker,
     t.fxzxlc,
     t.sccj,
     t.xh,