From a29a8d00dd9bbcde53814119ad4a081f3b4c6740 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 06 Sep 2021 13:24:28 +0800
Subject: [PATCH] screen-manage 插入设备的时候，判断组织是否含有型号并且添加默认报警值
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index 9084e65..9af501f 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -1,6 +1,7 @@
package com.moral.util;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
@@ -13,7 +14,7 @@
import java.time.ZonedDateTime;
import java.util.*;
-
+@Slf4j
public class DateUtils {
/**
* ������������(yyyy)
@@ -79,6 +80,11 @@
* ������������(yyyy-MM-dd HH)
* */
public static final String yyyy_MM_dd_HH_EN = "yyyy-MM-dd HH";
+
+ /*
+ * Date���toString������
+ * */
+ public static final String EEE_MMM_dd_HH_mm_ss_zzz_yyyy = "EEE MMM dd HH:mm:ss zzz yyyy";
/**
* DateFormat������
*/
@@ -86,6 +92,23 @@
/**
+ * @Description: Date���toString������������Date
+ * @Param: []
+ * @return: java.util.Date
+ * @Author: ���������
+ * @Date: 2021/8/25
+ */
+ public static Date dateStringToDate(String formatStr){
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat(EEE_MMM_dd_HH_mm_ss_zzz_yyyy, Locale.US);
+ return sdf.parse(formatStr);
+ } catch (ParseException e) {
+ log.error(e.getMessage());
+ return null;
+ }
+ }
+
+ /**
* ������DateFormat
*
* @param formatStr
--
Gitblit v1.8.0