From 49875151be4b427935fcb3d60696e99ba9d2e1ad Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 01 Jul 2021 16:58:03 +0800
Subject: [PATCH] screen-manage 添加根据组织id和地区码获取设备接口
---
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