From 2c52eaf28f9b8a666547e1307a76c3032598e57f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 16:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java | 67 +++++++++++++++++++++++++++++----
1 files changed, 59 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 45ab8c9..ad98355 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
@@ -1,13 +1,16 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.config.FileProperties;
@@ -16,7 +19,9 @@
import com.sandu.common.util.ResUtils;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightHeartbeatReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5LightDataEnum;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.domain.Pole;
@@ -32,7 +37,9 @@
import java.io.File;
import java.sql.Wrapper;
import java.time.LocalDate;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
/**
* @author chenjiantian
@@ -52,9 +59,24 @@
* @return 鏄惁鎴愬姛
*/
public boolean saveReportData(String deviceName, A5LightHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
+// 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(format);
+ }
+ //todo
+ lightReportData.setCreateTime(format);
BeanUtils.copyProperties(heartBeatDataPackage, lightReportData);
lightReportData.setDeviceCode(deviceName);
+
+ lightReportData.setUpdateTime(format);
+ //鍗曠伅鏁版嵁淇濆瓨鍒扮紦瀛橀噷
+ RedisUtils.getBean().set(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + deviceName, lightReportData);
return save(lightReportData);
}
@@ -75,14 +97,43 @@
* @param keyword 鍏抽敭璇�
* @param deviceCode 璁惧鐮�
*/
- public List<LightReportDataBo> listReportData(int pageNo, int pageSize, String keyword, String deviceCode) {
- PageHelper.startPage(pageNo, pageSize);
- //涓簄ull鐨勮瘽鏄秴绠�
- if (SecurityUtils.getClientId() == null) {
- return baseMapper.listReportData(keyword, deviceCode);
- } else {
- return baseMapper.listReportDataByUserid(keyword, deviceCode, SecurityUtils.getUserId());
+ public CommonPage listReportData(int pageNo, int pageSize, String keyword, String deviceCode) {
+
+ List<LightReportDataBo> lightReportDataBos = new ArrayList<>(pageSize);
+
+ CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize, keyword, deviceCode);
+ List<String> macList = stringCommonPage.getList();
+ if (CollUtil.isEmpty(macList)) {
+ return new CommonPage();
}
+
+ for (String macCode : macList) {
+ try {
+ LightReportData lightReportData
+ = JSON.parseObject(RedisUtils.getBean().get(A5LightDataEnum.LIGHT_HEART_BEAT.getCode() + macCode), LightReportData.class);
+
+ LightReportDataBo lightReportDataBo = new LightReportDataBo();
+ 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());
+ }
+ lightReportDataBos.add(lightReportDataBo);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ CommonPage commonPage = CommonPage.restPage(lightReportDataBos);
+ commonPage.setTotal(stringCommonPage.getTotal());
+ commonPage.setTotalPage(stringCommonPage.getTotalPage());
+ commonPage.setPageNum(pageNo);
+
+ return commonPage;
}
@SneakyThrows
--
Gitblit v1.9.3