Przeglądaj źródła

湿度报警时间字段格式化问题修复

aihua 3 lat temu
rodzic
commit
a25e701019

+ 7 - 1
src/main/java/com/chinaitop/depot/risk/model/HumidityAlarm.java

@@ -1,6 +1,10 @@
1 1
 package com.chinaitop.depot.risk.model;
2 2
 
3
+import com.fasterxml.jackson.annotation.JsonFormat;
3 4
 import lombok.Data;
5
+import org.springframework.format.annotation.DateTimeFormat;
6
+
7
+import java.util.Date;
4 8
 
5 9
 /**
6 10
  * 湿度报警 model
@@ -33,5 +37,7 @@ public class HumidityAlarm {
33 37
     /**
34 38
      * 报警日期
35 39
      */
36
-    private String alarmDate;
40
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
41
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
42
+    private Date alarmDate;
37 43
 }

+ 1 - 1
src/main/java/com/chinaitop/depot/risk/model/RiskFollow.java

@@ -85,7 +85,7 @@ public class RiskFollow {
85 85
      */
86 86
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
87 87
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
88
-    private String solveTime;
88
+    private Date solveTime;
89 89
 
90 90
 
91 91