传感器——有效期类型由String改为Date

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/util/PoiTiUtils.java

@@ -25,6 +25,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -96,7 +97,7 @@ public class PoiTiUtils {
             map1.put("name", "传感器");
             map1.put("xinghao", i.getXinghao());
             map1.put("guanliCode", i.getXuliehao());
-            map1.put("youxiaoqi", i.getYouxiaoqi());
+            map1.put("youxiaoqi", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(i.getYouxiaoqi()));
             return map1;
         }).collect(Collectors.toList());
         maps.addAll(chuangaiqi);
@@ -243,7 +244,7 @@ public class PoiTiUtils {
 
             map.put("l" + i, shebei.getLingmindu());
 
-            map.put("y" + i, shebei.getYouxiaoqi());
+            map.put("y" + i, new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(shebei.getYouxiaoqi()));
         }
         return map;
     }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/entity/ItdmChuanganqi.java

@@ -66,6 +66,8 @@ public class ItdmChuanganqi implements Serializable {
     private java.lang.String lingmindu;
 	/**有效期*/
 	@Excel(name = "有效期", width = 15)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "有效期")
-    private java.lang.String youxiaoqi;
+    private java.util.Date youxiaoqi;
 }