【CHG】日期格式

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbJcxcController.java

@@ -11,12 +11,11 @@ import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.validation.Valid;
-import javax.xml.crypto.Data;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -129,10 +128,10 @@ public class BusJcbJcxcController extends BaseController {
         params.put("${stationName()}", info.getStationName());
         params.put("${temperature}", info.getTemperature());
         if(info.getCheckDate() != null) {
-            Date jcrqArr = info.getCheckDate();
+            LocalDate jcrqArr = info.getCheckDate();
             params.put("${year}", jcrqArr.getYear());
             params.put("${month}", jcrqArr.getMonth());
-            params.put("${day}", jcrqArr.getDay());
+            params.put("${day}", jcrqArr.getDayOfMonth());
         }
         params.put("${gz1lcz}", info.getGz1lcz().toString());
         params.put("${gz2lcz}", info.getGz2lcz().toString());

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

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -51,7 +51,7 @@ public class BusJcbBlq extends BaseEntity{
 
     @ApiModelProperty(value = "检查日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date checkDate;
+    private LocalDate checkDate;
 
     @ApiModelProperty(value = "图片路径")
     @Length(min = 1, max = 255, message = "【图片路径】长度必须介于 {min} 和 {max} 之间")

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

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -61,7 +61,7 @@ public class BusJcbDmcgyq extends BaseEntity{
     private String temperature;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date checkDate;
+    private LocalDate checkDate;
 
     @ApiModelProperty(value = "地感器外观-是否安装牢固")
     @Length(min = 1, max = 1, message = "【地感器外观-是否安装牢固】长度必须介于 {min} 和 {max} 之间")

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

@@ -5,7 +5,7 @@ import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -56,7 +56,7 @@ public class BusJcbFdfxjyq extends BaseEntity{
 
     @ApiModelProperty(value = "检查日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date checkDate;
+    private LocalDate checkDate;
 
     @ApiModelProperty(value = "图片路径")
     @Length(min = 1, max = 255, message = "【图片路径】长度必须介于 {min} 和 {max} 之间")

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

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -58,7 +58,7 @@ public class BusJcbGlkg extends BaseEntity{
     private String temperature;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date checkDate;
+    private LocalDate checkDate;
 
     @ApiModelProperty(value = "机构箱-完好无损并加锁")
     @Length(min = 1, max = 1, message = "【机构箱-完好无损并加锁】长度必须介于 {min} 和 {max} 之间")

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

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -51,7 +51,7 @@ public class BusJcbJcxc extends BaseEntity{
     private String temperature;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date checkDate;
+    private LocalDate checkDate;
 
     @ApiModelProperty(value = "工支1拉出值")
     private Integer gz1lcz;

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

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -51,7 +51,7 @@ public class BusJcbWjcxc extends BaseEntity{
     private String temperature;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date checkDate;
+    private LocalDate checkDate;
 
     @ApiModelProperty(value = "零部件状态是否良好")
     @Length(min = 1, max = 1, message = "【零部件状态是否良好】长度必须介于 {min} 和 {max} 之间")

railway-common/src/main/java/com/railway/common/utils/DateUtils.java

@@ -3,6 +3,8 @@ package com.railway.common.utils;
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
@@ -77,6 +79,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     return new SimpleDateFormat(YYYYMMDD).format(date);
   }
 
+  public static String parseCheckDate(final LocalDate date) {
+    return date.format(DateTimeFormatter.ofPattern(YYYYMMDD));
+  }
+
   public static String parseDateToStr(final String srcFormat, final String targetFormat, final String ts) {
     Date date = dateTime(srcFormat, ts);
     return new SimpleDateFormat(targetFormat).format(date);