From af9cb02606e8f8d5d8bbad05ba1647dc7a91ffc3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 26 四月 2022 16:42:08 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 99e1e45..1ae2431 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
@@ -37,10 +37,8 @@
import java.io.File;
import java.sql.Wrapper;
import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.util.*;
/**
* @author chenjiantian
@@ -60,10 +58,14 @@
* @return 鏄惁鎴愬姛
*/
public boolean saveReportData(String deviceName, A5LightHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
- LightReportData lightReportData = new LightReportData();
+ LightReportData lightReportData = RedisUtils.getBean().get(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, LightReportData.class);
+ if (lightReportData == null) {
+ lightReportData = new LightReportData();
+ lightReportData.setCreateTime(LocalDateTime.now());
+ }
BeanUtils.copyProperties(heartBeatDataPackage, lightReportData);
lightReportData.setDeviceCode(deviceName);
-
+ lightReportData.setUpdateTime(LocalDateTime.now());
//鍗曠伅鏁版嵁淇濆瓨鍒扮紦瀛橀噷
RedisUtils.getBean().set(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, lightReportData);
@@ -93,7 +95,7 @@
CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize);
List<String> macList = stringCommonPage.getList();
if (CollUtil.isEmpty(macList)) {
- return new CommonPage();
+ return new CommonPage();
}
for (String macCode : macList) {
@@ -105,7 +107,7 @@
if (lightReportData != null) {
BeanUtils.copyProperties(lightReportData, lightReportDataBo);
}
-
+ lightReportDataBo.setDeviceCode(macCode);
Pole pole = SpringContextHolder.getBean(PoleService.class).getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, macCode));
if (pole != null) {
lightReportDataBo.setPoleName(pole.getPoleName());
--
Gitblit v1.9.3