1.修改 对象中 Date 未进行转换的问题

src/main/java/com/yeechart/dotMatrix/module/DotMatrix/controller/DotMatrixController.java

@@ -21,6 +21,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -117,7 +118,7 @@ public class DotMatrixController {
      * @return
      */
     @GetMapping("previewBitmap")
-    public ResponseEntity<byte[]> previewBitmap(String typeCode, String DEID, Boolean isDefault) {
+    public ResponseEntity<byte[]> previewBitmap(String typeCode, String DEID, Boolean isDefault, HttpServletRequest request) {
 
         if (isDefault == null || !isDefault) {
             if (StringUtils.isEmpty(DEID)) {
@@ -153,20 +154,25 @@ public class DotMatrixController {
         BufferedImage bufferedImage;
 
         BitmapDataVo bitmapDataVo;
-        if("test".equals(DEID)){
-                Ter020201Vo ter020201Vo = new Ter020201Vo();
+        if(DEID.contains("test")){
+            Ter020201Vo ter020201Vo = new Ter020201Vo();
+            if("test".equals(DEID)){
                 ter020201Vo.setTer020201InfoVo(Ter020201InfoVo.test3("测试使用"));
-                     Set<String> typeCodeList = new HashSet<>();
-                typeCodeList.add(typeCode);
-                ter020201Vo.setType(new Integer[]{0});
+            }else{
+                ter020201Vo.setTer020201InfoVo(Ter020201InfoVo.defaultInit("测试默认"));
+            }
+
+            Set<String> typeCodeList = new HashSet<>();
+            typeCodeList.add(typeCode);
+            ter020201Vo.setType(new Integer[]{0});
 
 
-                List<BitmapDataVo> bitmapDataVoList  = dotMatrixService.getSignageDotMatrix(ter020201Vo);
-                Map<String,BitmapDataVo> bitmapDataVoMap = bitmapDataVoList.stream().collect(Collectors.toMap(BitmapDataVo::getTypeCode, Function.identity()));
-                bitmapDataVo =bitmapDataVoMap.get(typeCode);
+            List<BitmapDataVo> bitmapDataVoList  = dotMatrixService.getSignageDotMatrix(ter020201Vo);
+            Map<String,BitmapDataVo> bitmapDataVoMap = bitmapDataVoList.stream().collect(Collectors.toMap(BitmapDataVo::getTypeCode, Function.identity()));
+            bitmapDataVo =bitmapDataVoMap.get(typeCode);
 
         }else{
-                bitmapDataVo =  signageFileUtil.getLastBitmapDataVo(DEID, typeCode, isDefault);
+            bitmapDataVo =  signageFileUtil.getLastBitmapDataVo(DEID, typeCode, isDefault);
         }
 
         if (bitmapDataVo == null) {

src/main/java/com/yeechart/dotMatrix/signage/bean/Ter020201DriverBean.java

@@ -1,6 +1,7 @@
 package com.yeechart.dotMatrix.signage.bean;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -58,12 +59,13 @@ public class Ter020201DriverBean {
     /**
      * 创建时间
      */
-    private Date createTime;
+    private String createTime;
 
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
 

src/main/java/com/yeechart/dotMatrix/signage/bean/Ter020201InfoVo.java

@@ -294,10 +294,10 @@ public class Ter020201InfoVo {
     private Integer offlineStatus;
 
 
-    public static Ter020201InfoVo defaultInit() {
+    public static Ter020201InfoVo defaultInit(String deid) {
         Ter020201InfoVo ter020201InfoVo = new Ter020201InfoVo();
         ter020201InfoVo.setProductId("020201");
-        ter020201InfoVo.setDeId("default");
+        ter020201InfoVo.setDeId(deid);
 
         ter020201InfoVo.setTerWorkCode("00000001");
         ter020201InfoVo.setTerName("蚁巢标识牌");
@@ -552,16 +552,16 @@ public class Ter020201InfoVo {
 
         TiClockBean tiClockBean = new TiClockBean();
 
-        tiClockBean.setPAlias("生产");
+        tiClockBean.setPAlias("生产别名");
         tiClockBean.setProduce(0);
 
-        tiClockBean.setMAlias("维修");
+        tiClockBean.setMAlias("维修别名");
         tiClockBean.setMaintain(0);
 
-        tiClockBean.setIAlias("巡检");
+        tiClockBean.setIAlias("巡检别名");
         tiClockBean.setInspect(0);
 
-        tiClockBean.setUAlias("保养");
+        tiClockBean.setUAlias("保养别名");
         tiClockBean.setUpkeep(0);
 
 

src/main/java/com/yeechart/dotMatrix/signage/bean/TiClockBean.java

@@ -1,6 +1,7 @@
 package com.yeechart.dotMatrix.signage.bean;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -67,11 +68,13 @@ public class TiClockBean {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
     public TiClockBean() {

src/main/java/com/yeechart/dotMatrix/signage/bean/TiOnusBean.java

@@ -1,6 +1,7 @@
 package com.yeechart.dotMatrix.signage.bean;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -76,11 +77,13 @@ public class TiOnusBean {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;