From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
index 4f4ad0b..5f0f272 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java
@@ -38,6 +38,7 @@
import java.sql.Wrapper;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
/**
@@ -58,14 +59,22 @@
* @return 鏄惁鎴愬姛
*/
public boolean saveReportData(String deviceName, A5LightHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
- LightReportData lightReportData = RedisUtils.getBean().get(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, LightReportData.class);
+// LightReportData lightReportData = RedisUtils.getBean().get(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, LightReportData.class);
+
+
+ String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"));
+ LightReportData lightReportData = new LightReportData();
+
if (lightReportData == null) {
lightReportData = new LightReportData();
- lightReportData.setCreateTime(LocalDateTime.now());
+ lightReportData.setCreateTime(format);
}
+ //todo
+ lightReportData.setCreateTime(format);
BeanUtils.copyProperties(heartBeatDataPackage, lightReportData);
lightReportData.setDeviceCode(deviceName);
- lightReportData.setUpdateTime(LocalDateTime.now());
+
+ lightReportData.setUpdateTime(format);
//鍗曠伅鏁版嵁淇濆瓨鍒扮紦瀛橀噷
RedisUtils.getBean().set(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, lightReportData);
@@ -92,7 +101,7 @@
List<LightReportDataBo> lightReportDataBos = new ArrayList<>(pageSize);
- CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize,keyword, deviceCode);
+ CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize, keyword, deviceCode);
List<String> macList = stringCommonPage.getList();
if (CollUtil.isEmpty(macList)) {
return new CommonPage();
--
Gitblit v1.9.3