Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package com.railway.business.baseinfo.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,6 +36,7 @@ public class BasePreventFlood extends BaseEntity{
     private String deptName;
 
     @ApiModelProperty(value = "填写日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date fillDate;
 
     @ApiModelProperty(value = "填写人")

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

@@ -1,5 +1,6 @@
 package com.railway.business.baseinfo.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -72,6 +73,7 @@ public class BusBlq extends BaseEntity{
     private String sccj;
 
     @ApiModelProperty(value = "投运日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date tyrq;
 
     @ApiModelProperty(value = "避雷器类型")
@@ -91,6 +93,7 @@ public class BusBlq extends BaseEntity{
     private String mdh;
 
     @ApiModelProperty(value = "脱离器投运日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date tlqtyrq;
 
     @ApiModelProperty(value = "脱离器状态")
@@ -102,6 +105,7 @@ public class BusBlq extends BaseEntity{
     private String sbxjzt;
 
     @ApiModelProperty(value = "预防性试验日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date yfxsyrq;
 
     @ApiModelProperty(value = "引线距接地体最小距离（mm） -t线(1)")

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

@@ -1,5 +1,6 @@
 package com.railway.business.baseinfo.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -84,9 +85,11 @@ public class BusFdfxjyq extends BaseEntity{
     private String sccj;
 
     @ApiModelProperty(value = "出厂日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date ccrq;
 
     @ApiModelProperty(value = "投运日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date tyrq;
 
     @ApiModelProperty(value = "使用寿命（年）")

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

@@ -1,5 +1,6 @@
 package com.railway.business.baseinfo.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -152,9 +153,11 @@ public class BusZzdzxx extends BaseEntity{
     private String sccj;
 
     @ApiModelProperty(value = "投运日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date tyrq;
 
     @ApiModelProperty(value = "出厂日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date ccrq;
 
     @ApiModelProperty(value = "设计寿命（年）")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcebXsjcjl.java

@@ -1,5 +1,6 @@
 package com.railway.business.catenary.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
@@ -31,6 +32,7 @@ public class BusJcebXsjcjl extends BusJceb{
     private String qxdj;
 
     @ApiModelProperty(value = "要求完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date yqwcsj;
 
     @ApiModelProperty(value = "处理措施 0紧固 1更换")
@@ -50,6 +52,7 @@ public class BusJcebXsjcjl extends BusJceb{
     private String clqxczz;
 
     @ApiModelProperty(value = "处理日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date clrq;
 
     @ApiModelProperty(value = "用户id")

railway-business/src/main/java/com/railway/business/safetool/domain/BaseSafetyTool.java

@@ -1,5 +1,6 @@
 package com.railway.business.safetool.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -56,9 +57,11 @@ public class BaseSafetyTool extends BaseEntity{
     private String testCycleText;
 
     @ApiModelProperty(value = "上次试验日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date lastTestDate;
 
     @ApiModelProperty(value = "下次试验日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date nextTestDate;
 
     @ApiModelProperty(value = "试验结果(0:失败1：成功)")
@@ -66,6 +69,7 @@ public class BaseSafetyTool extends BaseEntity{
     private String testResult;
 
     @ApiModelProperty(value = "实际试验时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date testDate;
 
     @ApiModelProperty(value = "试验结果描述")
@@ -81,6 +85,7 @@ public class BaseSafetyTool extends BaseEntity{
     private String scrapReason;
 
     @ApiModelProperty(value = "报废时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date scrapDate;
 
     @ApiModelProperty(value = "报废操作人")
@@ -92,6 +97,7 @@ public class BaseSafetyTool extends BaseEntity{
     private String produceFactory;
 
     @ApiModelProperty(value = "生产日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date produceDate;
 
     @ApiModelProperty(value = "del_flag")

railway-business/src/main/java/com/railway/business/safetool/domain/SecScheduledTool.java

@@ -5,10 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-
 import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotNull;
 /**
  * 安全计划和工具关系表
  * @author lijie 2021-12-04
@@ -31,17 +28,6 @@ public class SecScheduledTool extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
-    @ApiModelProperty(value = "create_by")
-    @Length(min = 1, max = 64, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
-    private String createBy;
-
-    @ApiModelProperty(value = "update_by")
-    @Length(min = 1, max = 64, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
-    private String updateBy;
-
-    @ApiModelProperty(value = "update_time")
-    private Date updateTime;
-
     public SecScheduledTool() {
     }
 

railway-business/src/main/resources/mapper/catenary/BusJcebGjsfxMapper.xml

@@ -8,7 +8,7 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="dept_station_id" property="deptStationId"/>
-    <result column="pillarStart" property="pillarStart"/>
+    <result column="pillar_start" property="pillarStart"/>
     <result column="pillar_end" property="pillarEnd"/>
     <result column="operation_date" property="operationDate"/>
     <result column="lmdjcspjl_zhz1" property="lmdjcspjlZhz1"/>