提交 05a3e180 authored 作者: zhoushaopan's avatar zhoushaopan

feat(二维码模块): 修改了时区问题

修改了时区问题
上级 51d4afcf
package com.tykj.dev.misc.qrcode; package com.tykj.dev.misc.qrcode;
import com.alibaba.fastjson.JSONObject;
import com.tykj.dev.misc.exception.ApiException; import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.qrcode.vo.DeviceCodeVO; import com.tykj.dev.misc.qrcode.vo.DeviceCodeVO;
import com.tykj.dev.misc.qrcode.vo.TaskData; import com.tykj.dev.misc.qrcode.vo.TaskData;
...@@ -90,7 +91,8 @@ public class QrCodeBillUtil { ...@@ -90,7 +91,8 @@ public class QrCodeBillUtil {
} }
String json = GZIPUtils.uncompressToString(deviceDataUtil.getCompleteString()); String json = GZIPUtils.uncompressToString(deviceDataUtil.getCompleteString());
//解析 //解析
TaskData taskData = JacksonUtil.readValue(json, TaskData.class); TaskData taskData = JSONObject.parseObject(json, TaskData.class);
// TaskData taskData = JacksonUtil.readValue(json, TaskData.class);
return taskData; return taskData;
} }
......
...@@ -22,11 +22,11 @@ public class TaskData { ...@@ -22,11 +22,11 @@ public class TaskData {
*/ */
public Integer taskType; public Integer taskType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm",shape = JsonFormat.Shape.STRING,timezone ="GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
public Date taskCreateDate; public Date taskCreateDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm",shape = JsonFormat.Shape.STRING,timezone ="GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
public Date scanDate; public Date scanDate;
......
...@@ -21,7 +21,7 @@ public class DateUtil { ...@@ -21,7 +21,7 @@ public class DateUtil {
public static LocalDate getLocalDate(Date date){ public static LocalDate getLocalDate(Date date){
Instant instant = date.toInstant(); Instant instant = date.toInstant();
ZoneId zoneId = ZoneId.of("GMT+0"); ZoneId zoneId = ZoneId.of("GMT+8");
LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime(); LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
return localDateTime.toLocalDate(); return localDateTime.toLocalDate();
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论