From 75400d701b3d7d5f447be9567d6e1c248133b36a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 17:59:33 +0800
Subject: [PATCH] 日期格式调整
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java | 2 ++
server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java | 14 ++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java | 10 +++++++++-
3 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java
index c9be133..1a307f1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -3175,4 +3175,18 @@
}
return week;
}
+
+ /**
+ * 鏃堕棿杞箟甯︽椂鍖� 鍏ュ弬鏍煎紡 2022-09-13T00:53:03.000+00:00
+ * @param timeEscape
+ * @return
+ * @throws ParseException
+ */
+ public static String timeEscape(String timeEscape) throws ParseException {
+ SimpleDateFormat startDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX", Locale.US);
+ SimpleDateFormat startDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String time = startDateFormat1.format(startDateFormat.parse(timeEscape));
+ System.out.println(time);
+ return time;
+ }
}
\ No newline at end of file
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
index 9714634..682303c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
@@ -1,6 +1,7 @@
package com.doumee.dao.admin.response;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -45,6 +46,7 @@
private String srcType;
@ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String happenTime;
@ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
index aa7858e..aa135a7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -8,6 +8,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.DeviceEventQuery;
import com.doumee.dao.admin.response.DeviceEventDTO;
@@ -32,6 +33,8 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -369,7 +372,12 @@
}else if(Constants.formatIntegerNum(dto.getEventType()) == HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getKey()){
dto.setEventTypeName(HKConstants.EventTypes.DOOR_FACE_AUTH_FAIL.getName());
}
- newDeviceEventDTOS.add(dto);
+ try {
+ dto.setHappenTime(DateUtil.timeEscape(dto.getHappenTime()));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ newDeviceEventDTOS.add(dto);
}
return newDeviceEventDTOS;
}
--
Gitblit v1.9.3