Browse Source

代码优化

wangxiaofei 2 weeks ago
parent
commit
0863c09f49

+ 4 - 1
taphole-iron/src/main/java/com/sckj/iron/entity/TIronTest.java

@@ -6,11 +6,13 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Data
 @ApiModel("出铁诊断实体")
@@ -88,7 +90,8 @@ public class TIronTest implements Serializable {
     @ApiModelProperty(value = "诊断时间")
     @ExcelProperty("诊断时间")
     @ColumnWidth(30)
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
 
     @ApiModelProperty(value = "出铁详情")
     @ExcelIgnore

+ 1 - 1
taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronTestServiceImpl.java

@@ -437,7 +437,7 @@ public class TIronTestServiceImpl extends ServiceImpl<TIronTestMapper, TIronTest
                 ironTest.setIronNo(String.valueOf(ironNo));
             }
             if (ObjectUtils.isNotEmpty(createTime)) {
-                ironTest.setCreateTime(LocalDateUtils.formatDate(createTime));
+                ironTest.setCreateTime(LocalDateUtils.dateToLocalDateTime(createTime));
             }
 
             String testStatus = (ironNormalCount >= 4) ? "1" : "0";

+ 3 - 2
taphole-warn/src/main/java/com/sckj/warn/vo/TExceptionLogBigScreenVo.java

@@ -3,12 +3,12 @@ package com.sckj.warn.vo;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Data
 @ApiModel("出铁告警列表")
@@ -50,7 +50,8 @@ public class TExceptionLogBigScreenVo implements Serializable {
     @ApiModelProperty(value = "告警时间")
     @ExcelProperty("告警时间")
     @ColumnWidth(25)
-    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createTime;
 
 
 }