From 0d24ea21533d9135c8963a28d8d45bfd207b8ec6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Jul 2021 14:17:22 +0800
Subject: [PATCH] update

---
 screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 6e5d735..c0caeda 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -37,7 +37,7 @@
     public void insertHistoryHourly(Map<String, Object> data) {
         Map<String, Object> dataAdjust = new HashMap<>(data);
         String mac = data.remove("mac").toString();
-        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyy_MM_dd_HH_EN);
+        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
 
         Integer version = (Integer) data.remove("ver");
         Map<String, Object> result = new HashMap<>(data);

--
Gitblit v1.8.0